diff --git a/.jshintrc b/.jshintrc
index 77f9e9f143d4c155ea03549df18202cef36decd4..d5da3e30828193581ecb113f423a69ab83e02bf6 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -26,6 +26,7 @@
"fakeServer": true,
"_": true,
"OC": true,
+ "OCA": true,
"t": true,
"n": true
}
diff --git a/3rdparty b/3rdparty
index ef80977061d4bc3a2d8ee0bf23a8287a3222b628..82c5785c5ded047fb10791151aed7086785b0468 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit ef80977061d4bc3a2d8ee0bf23a8287a3222b628
+Subproject commit 82c5785c5ded047fb10791151aed7086785b0468
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index 2d76b685018fec0f690b154672ae0f5c149774bd..bae3628402f73d4303b3625f8555b51a77d8cd84 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -17,8 +17,11 @@ $baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir=';
$permissions = $dirInfo->getPermissions();
+$sortAttribute = isset( $_GET['sort'] ) ? $_GET['sort'] : 'name';
+$sortDirection = isset( $_GET['sortdirection'] ) ? ($_GET['sortdirection'] === 'desc') : false;
+
// make filelist
-$files = \OCA\Files\Helper::getFiles($dir);
+$files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection);
$data['directory'] = $dir;
$data['files'] = \OCA\Files\Helper::formatFileInfos($files);
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index a5ce7b257da3db8de85ac94fc19f95b500b0d29c..9750173d1107f587f0329c6197398f9cdccd071b 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -88,7 +88,9 @@ foreach ($_FILES['files']['error'] as $error) {
UPLOAD_ERR_NO_TMP_DIR => $l->t('Missing a temporary folder'),
UPLOAD_ERR_CANT_WRITE => $l->t('Failed to write to disk'),
);
- OCP\JSON::error(array('data' => array_merge(array('message' => $errors[$error]), $storageStats)));
+ $errorMessage = $errors[$error];
+ \OC::$server->getLogger()->alert("Upload error: $error - $errorMessage", array('app' => 'files'));
+ OCP\JSON::error(array('data' => array_merge(array('message' => $errorMessage), $storageStats)));
exit();
}
}
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 15a29133789d33a82a3f687aba758d09884e1718..4b0db457ada50bb8812d216b6fd9438be8dee033 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -19,3 +19,13 @@ $templateManager->registerTemplate('text/html', 'core/templates/filetemplates/te
$templateManager->registerTemplate('application/vnd.oasis.opendocument.presentation', 'core/templates/filetemplates/template.odp');
$templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt');
$templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
+
+\OCA\Files\App::getNavigationManager()->add(
+ array(
+ "id" => 'files',
+ "appname" => 'files',
+ "script" => 'list.php',
+ "order" => 0,
+ "name" => $l->t('All files')
+ )
+);
diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
index 34800378537ead29daf6456563038a43dc3bbbe4..390d645e2a44bac66a9bb7483976d3cc1bb47e7f 100644
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@@ -4,8 +4,8 @@
<name>Files</name>
<description>File Management</description>
<licence>AGPL</licence>
- <author>Robin Appelman</author>
- <require>4.93</require>
+ <author>Robin Appelman, Vincent Petry</author>
+ <requiremin>4.93</requiremin>
<shipped>true</shipped>
<standalone/>
<default_enable/>
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
deleted file mode 100644
index f920f842166700a16c8c75ad059f28117998adbc..0000000000000000000000000000000000000000
--- a/apps/files/appinfo/update.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-// fix webdav properties,add namespace in front of the property, update for OC4.5
-$installedVersion=OCP\Config::getAppValue('files', 'installed_version');
-if (version_compare($installedVersion, '1.1.6', '<')) {
- $concat = OC_DB::getConnection()->getDatabasePlatform()->
- getConcatExpression( '\'{DAV:}\'', '`propertyname`' );
- $query = OC_DB::prepare('
- UPDATE `*PREFIX*properties`
- SET `propertyname` = ' . $concat . '
- WHERE `propertyname` NOT LIKE \'{%\'
- ');
- $query->execute();
-}
-
-//update from OC 3
-
-//try to remove remaining files.
-//Give a warning if not possible
-
-$filesToRemove = array(
- 'ajax',
- 'appinfo',
- 'css',
- 'js',
- 'l10n',
- 'templates',
- 'admin.php',
- 'download.php',
- 'index.php',
- 'settings.php'
-);
-
-foreach($filesToRemove as $file) {
- $filepath = OC::$SERVERROOT . '/files/' . $file;
- if(!file_exists($filepath)) {
- continue;
- }
- $success = OCP\Files::rmdirr($filepath);
- if($success === false) {
- //probably not sufficient privileges, give up and give a message.
- OCP\Util::writeLog('files', 'Could not clean /files/ directory.'
- .' Please remove everything except webdav.php from ' . OC::$SERVERROOT . '/files/', OCP\Util::ERROR);
- break;
- }
-}
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 533050691d5e75b94bce6bcf047eec6828dfa1ea..decfdbd2cda0136789b609c3ad057e49d9d409cd 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -3,10 +3,11 @@
See the COPYING-README file. */
/* FILE MENU */
-.actions { padding:5px; height:32px; width: 100%; }
+.actions { padding:5px; height:32px; display: inline-block; float: left; }
.actions input, .actions button, .actions .button { margin:0; float:left; }
.actions .button a { color: #555; }
.actions .button a:hover, .actions .button a:active { color: #333; }
+.actions.hidden { display: none; }
#new {
z-index: 1010;
@@ -75,6 +76,7 @@
top: 44px;
width: 100%;
}
+
/* make sure there's enough room for the file actions */
#body-user #filestable {
min-width: 688px; /* 768 (mobile break) - 80 (nav width) */
@@ -83,6 +85,45 @@
min-width: 688px; /* 768 (mobile break) - 80 (nav width) */
}
+#filestable tbody tr { background-color:#fff; height:51px; }
+
+.app-files #app-content {
+ position: relative;
+}
+
+/* fit app list view heights */
+.app-files #app-content>.viewcontainer {
+ height: 100%;
+}
+
+/**
+ * Override global #controls styles
+ * to be more flexible / relative
+ */
+#body-user .app-files #controls {
+ left: 310px; /* main nav bar + sidebar */
+ position: fixed;
+ padding-left: 0px;
+}
+
+/* this is mostly for file viewer apps, text editor, etc */
+#body-user .app-files.no-sidebar #controls {
+ left: 0px;
+ padding-left: 80px; /* main nav bar */
+}
+
+.app-files #app-navigation {
+ width: 230px;
+}
+
+.app-files #app-settings {
+ width: 229px; /* DUH */
+}
+
+.app-files #app-settings input {
+ width: 90%;
+}
+
#filestable tbody tr { background-color:#fff; height:40px; }
#filestable tbody tr:hover, tbody tr:active {
background-color: rgb(240,240,240);
@@ -115,11 +156,36 @@ tr:hover span.extension {
}
table tr.mouseOver td { background-color:#eee; }
-table th { height:24px; padding:0 8px; color:#999; }
-table th .name {
- position: absolute;
- left: 55px;
- top: 15px;
+table th { height:24px; padding:0 8px; }
+table th, table th a {
+ color: #999;
+}
+table.multiselect th a {
+ color: #000;
+}
+table th .columntitle {
+ display: inline-block;
+ padding: 15px;
+ width: 100%;
+ height: 50px;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ vertical-align: middle;
+}
+table th .columntitle.name {
+ padding-left: 5px;
+ margin-left: 50px;
+ max-width: 300px;
+}
+/* hover effect on sortable column */
+table th a.columntitle:hover {
+ background-color: #F0F0F0;
+}
+table th .sort-indicator {
+ width: 10px;
+ height: 8px;
+ margin-left: 10px;
+ display: inline-block;
}
table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; }
table td {
@@ -139,8 +205,11 @@ table th#headerName {
}
table th#headerSize, table td.filesize {
min-width: 48px;
- padding: 0 16px;
text-align: right;
+ padding: 0;
+}
+table table td.filesize {
+ padding: 0 16px;
}
table th#headerDate, table td.date {
-moz-box-sizing: border-box;
@@ -161,9 +230,7 @@ table.multiselect thead {
z-index: 10;
-moz-box-sizing: border-box;
box-sizing: border-box;
- left: 0;
- padding-left: 80px;
- width: 100%;
+ left: 310px; /* main nav bar + sidebar */
}
table.multiselect thead th {
@@ -197,10 +264,6 @@ table td.filename input.filename {
table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:3px 8px 8px 3px; }
table td.filename .nametext, .uploadtext, .modified { float:left; padding:14px 0; }
-#modified {
- position: absolute;
- top: 15px;
-}
.modified {
position: relative;
padding-left: 8px;
@@ -254,7 +317,7 @@ table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; }
/* Use label to have bigger clickable size for checkbox */
#fileList tr td.filename>input[type="checkbox"] + label,
-#select_all + label {
+.select-all + label {
height: 50px;
position: absolute;
width: 50px;
@@ -268,10 +331,10 @@ table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; }
#fileList tr td.filename>input[type="checkbox"] + label {
left: 0;
}
-#select_all + label {
+.select-all + label {
top: 0;
}
-#select_all {
+.select-all {
position: absolute;
top: 18px;
left: 18px;
@@ -306,6 +369,10 @@ table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; }
padding: 28px 14px 19px !important;
}
+#fileList .action.action-share-notification span, img, a {
+ cursor: default !important;
+}
+
a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
/* Actions for selected files */
@@ -319,6 +386,9 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
display: inline;
padding: 17px 5px;
}
+.selectedActions a.hidden {
+ display: none;
+}
.selectedActions a img {
position:relative;
top:5px;
@@ -394,7 +464,7 @@ table.dragshadow td.size {
}
.mask {
z-index: 50;
- position: fixed;
+ position: absolute;
top: 0;
left: 0;
right: 0;
diff --git a/apps/files/index.php b/apps/files/index.php
index a4e9a938507c36541cb7df9f0f600d577095074a..95ae7977eccf1ff125a5b56b430d468c6134a3b6 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -28,6 +28,7 @@ OCP\User::checkLoggedIn();
OCP\Util::addStyle('files', 'files');
OCP\Util::addStyle('files', 'upload');
OCP\Util::addStyle('files', 'mobile');
+OCP\Util::addscript('files', 'app');
OCP\Util::addscript('files', 'file-upload');
OCP\Util::addscript('files', 'jquery.iframe-transport');
OCP\Util::addscript('files', 'jquery.fileupload');
@@ -37,28 +38,23 @@ OCP\Util::addscript('files', 'breadcrumb');
OCP\Util::addscript('files', 'filelist');
OCP\App::setActiveNavigationEntry('files_index');
-// Load the files
-$dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
-$dir = \OC\Files\Filesystem::normalizePath($dir);
-$dirInfo = \OC\Files\Filesystem::getFileInfo($dir, false);
-// Redirect if directory does not exist
-if (!$dirInfo || !$dirInfo->getType() === 'dir') {
- header('Location: ' . OCP\Util::getScriptName() . '');
- exit();
-}
$isIE8 = false;
preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
-if (count($matches) > 0 && $matches[1] <= 8){
+if (count($matches) > 0 && $matches[1] <= 9) {
$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 = '/';
+// if IE8 and "?dir=path&view=someview" was specified, reformat the URL to use a hash like "#?dir=path&view=someview"
+if ($isIE8 && (isset($_GET['dir']) || isset($_GET['view']))) {
+ $hash = '#?';
+ $dir = isset($_GET['dir']) ? $_GET['dir'] : '/';
+ $view = isset($_GET['view']) ? $_GET['view'] : 'files';
+ $hash = '#?dir=' . \OCP\Util::encodePath($dir);
+ if ($view !== 'files') {
+ $hash .= '&view=' . urlencode($view);
}
- header('Location: ' . OCP\Util::linkTo('files', 'index.php') . '#?dir=' . \OCP\Util::encodePath($dir));
+ header('Location: ' . OCP\Util::linkTo('files', 'index.php') . $hash);
exit();
}
@@ -66,49 +62,67 @@ $user = OC_User::getUser();
$config = \OC::$server->getConfig();
-// needed for share init, permissions will be reloaded
-// anyway with ajax load
-$permissions = $dirInfo->getPermissions();
-
-// information about storage capacities
-$storageInfo=OC_Helper::getStorageInfo($dir, $dirInfo);
-$freeSpace=$storageInfo['free'];
-$uploadLimit=OCP\Util::uploadLimit();
-$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir, $freeSpace);
-$publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes');
+// mostly for the home storage's free space
+$dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
+$storageInfo=OC_Helper::getStorageInfo('/', $dirInfo);
// if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code)
$encryptionInitStatus = 2;
if (OC_App::isEnabled('files_encryption')) {
- $session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
- $encryptionInitStatus = $session->getInitialized();
+ $session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
+ $encryptionInitStatus = $session->getInitialized();
+}
+
+$nav = new OCP\Template('files', 'appnavigation', '');
+
+function sortNavigationItems($item1, $item2) {
+ return $item1['order'] - $item2['order'];
+}
+
+$navItems = \OCA\Files\App::getNavigationManager()->getAll();
+usort($navItems, 'sortNavigationItems');
+$nav->assign('navigationItems', $navItems);
+
+$contentItems = array();
+
+function renderScript($appName, $scriptName) {
+ $content = '';
+ $appPath = OC_App::getAppPath($appName);
+ $scriptPath = $appPath . '/' . $scriptName;
+ if (file_exists($scriptPath)) {
+ // TODO: sanitize path / script name ?
+ ob_start();
+ include $scriptPath;
+ $content = ob_get_contents();
+ @ob_end_clean();
+ }
+ return $content;
}
-$trashEnabled = \OCP\App::isEnabled('files_trashbin');
-$trashEmpty = true;
-if ($trashEnabled) {
- $trashEmpty = \OCA\Files_Trashbin\Trashbin::isEmpty($user);
+// render the container content for every navigation item
+foreach ($navItems as $item) {
+ $content = '';
+ if (isset($item['script'])) {
+ $content = renderScript($item['appname'], $item['script']);
+ }
+ $contentItem = array();
+ $contentItem['id'] = $item['id'];
+ $contentItem['content'] = $content;
+ $contentItems[] = $contentItem;
}
OCP\Util::addscript('files', 'fileactions');
OCP\Util::addscript('files', 'files');
+OCP\Util::addscript('files', 'navigation');
OCP\Util::addscript('files', 'keyboardshortcuts');
$tmpl = new OCP\Template('files', 'index', 'user');
-$tmpl->assign('dir', $dir);
-$tmpl->assign('permissions', $permissions);
-$tmpl->assign('trash', $trashEnabled);
-$tmpl->assign('trashEmpty', $trashEmpty);
-$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize); // minimium of freeSpace and uploadLimit
-$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
-$tmpl->assign('freeSpace', $freeSpace);
-$tmpl->assign('uploadLimit', $uploadLimit); // PHP upload limit
-$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
$tmpl->assign('isPublic', false);
-$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
$tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
$tmpl->assign("mailNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_mail_notification', 'yes'));
$tmpl->assign("allowShareWithLink", $config->getAppValue('core', 'shareapi_allow_links', 'yes'));
$tmpl->assign("encryptionInitStatus", $encryptionInitStatus);
-$tmpl->assign('disableSharing', false);
+$tmpl->assign('appNavigation', $nav);
+$tmpl->assign('appContents', $contentItems);
+$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
$tmpl->printPage();
diff --git a/apps/files/js/app.js b/apps/files/js/app.js
new file mode 100644
index 0000000000000000000000000000000000000000..71802948a5ca70d9eaf9fb1aca8bcd07acc15830
--- /dev/null
+++ b/apps/files/js/app.js
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2014
+ *
+ * @author Vincent Petry
+ * @copyright 2014 Vincent Petry <pvince81@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+/* global dragOptions, folderDropOptions */
+(function() {
+
+ if (!OCA.Files) {
+ OCA.Files = {};
+ }
+
+ var App = {
+ navigation: null,
+
+ initialize: function() {
+ this.navigation = new OCA.Files.Navigation($('#app-navigation'));
+
+ var fileActions = new OCA.Files.FileActions();
+ // default actions
+ fileActions.registerDefaultActions();
+ // legacy actions
+ fileActions.merge(window.FileActions);
+ // regular actions
+ fileActions.merge(OCA.Files.fileActions);
+
+ this.files = OCA.Files.Files;
+
+ // TODO: ideally these should be in a separate class / app (the embedded "all files" app)
+ this.fileList = new OCA.Files.FileList(
+ $('#app-content-files'), {
+ scrollContainer: $('#app-content'),
+ dragOptions: dragOptions,
+ folderDropOptions: folderDropOptions,
+ fileActions: fileActions,
+ allowLegacyActions: true
+ }
+ );
+ this.files.initialize();
+
+ // for backward compatibility, the global FileList will
+ // refer to the one of the "files" view
+ window.FileList = this.fileList;
+
+ this._setupEvents();
+ // trigger URL change event handlers
+ this._onPopState(OC.Util.History.parseUrlQuery());
+ },
+
+ /**
+ * Returns the container of the currently visible app.
+ *
+ * @return app container
+ */
+ getCurrentAppContainer: function() {
+ return this.navigation.getActiveContainer();
+ },
+
+ /**
+ * Sets the currently active view
+ * @param viewId view id
+ */
+ setActiveView: function(viewId, options) {
+ this.navigation.setActiveItem(viewId, options);
+ },
+
+ /**
+ * Returns the view id of the currently active view
+ * @return view id
+ */
+ getActiveView: function() {
+ return this.navigation.getActiveItem();
+ },
+
+ /**
+ * Setup events based on URL changes
+ */
+ _setupEvents: function() {
+ OC.Util.History.addOnPopStateHandler(_.bind(this._onPopState, this));
+
+ // detect when app changed their current directory
+ $('#app-content').delegate('>div', 'changeDirectory', _.bind(this._onDirectoryChanged, this));
+ $('#app-content').delegate('>div', 'changeViewerMode', _.bind(this._onChangeViewerMode, this));
+
+ $('#app-navigation').on('itemChanged', _.bind(this._onNavigationChanged, this));
+ },
+
+ /**
+ * Event handler for when the current navigation item has changed
+ */
+ _onNavigationChanged: function(e) {
+ var params;
+ if (e && e.itemId) {
+ params = {
+ view: e.itemId,
+ dir: '/'
+ };
+ this._changeUrl(params.view, params.dir);
+ this.navigation.getActiveContainer().trigger(new $.Event('urlChanged', params));
+ }
+ },
+
+ /**
+ * Event handler for when an app notified that its directory changed
+ */
+ _onDirectoryChanged: function(e) {
+ if (e.dir) {
+ this._changeUrl(this.navigation.getActiveItem(), e.dir);
+ }
+ },
+
+ /**
+ * Event handler for when an app notifies that it needs space
+ * for viewer mode.
+ */
+ _onChangeViewerMode: function(e) {
+ var state = !!e.viewerModeEnabled;
+ $('#app-navigation').toggleClass('hidden', state);
+ $('.app-files').toggleClass('viewer-mode no-sidebar', state);
+ },
+
+ /**
+ * Event handler for when the URL changed
+ */
+ _onPopState: function(params) {
+ params = _.extend({
+ dir: '/',
+ view: 'files'
+ }, params);
+ var lastId = this.navigation.getActiveItem();
+ if (!this.navigation.itemExists(params.view)) {
+ params.view = 'files';
+ }
+ this.navigation.setActiveItem(params.view, {silent: true});
+ if (lastId !== this.navigation.getActiveItem()) {
+ this.navigation.getActiveContainer().trigger(new $.Event('show'));
+ }
+ this.navigation.getActiveContainer().trigger(new $.Event('urlChanged', params));
+ },
+
+ /**
+ * Change the URL to point to the given dir and view
+ */
+ _changeUrl: function(view, dir) {
+ var params = {dir: dir};
+ if (view !== 'files') {
+ params.view = view;
+ }
+ OC.Util.History.pushState(params);
+ }
+ };
+ OCA.Files.App = App;
+})();
+
+$(document).ready(function() {
+ // wait for other apps/extensions to register their event handlers and file actions
+ // in the "ready" clause
+ _.defer(function() {
+ OCA.Files.App.initialize();
+ });
+});
+
diff --git a/apps/files/js/breadcrumb.js b/apps/files/js/breadcrumb.js
index 5bc2fac13695d29940872c4dfa6e76931035e923..c017d710d6decad7830193b7a3d4bccc53bc4c02 100644
--- a/apps/files/js/breadcrumb.js
+++ b/apps/files/js/breadcrumb.js
@@ -159,7 +159,11 @@
this.totalWidth = 64;
// FIXME: this class should not know about global elements
if ( $('#navigation').length ) {
- this.totalWidth += $('#navigation').get(0).offsetWidth;
+ this.totalWidth += $('#navigation').outerWidth();
+ }
+
+ if ( $('#app-navigation').length && !$('#app-navigation').hasClass('hidden')) {
+ this.totalWidth += $('#app-navigation').outerWidth();
}
this.hiddenBreadcrumbs = 0;
@@ -167,8 +171,8 @@
this.totalWidth += $(this.breadcrumbs[i]).get(0).offsetWidth;
}
- $.each($('#controls .actions>div'), function(index, action) {
- self.totalWidth += $(action).get(0).offsetWidth;
+ $.each($('#controls .actions'), function(index, action) {
+ self.totalWidth += $(action).outerWidth();
});
},
@@ -236,6 +240,6 @@
}
};
- window.BreadCrumb = BreadCrumb;
+ OCA.Files.BreadCrumb = BreadCrumb;
})();
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 963fc6478287fa5f26ef2d426c2fbfbcefcbdf36..6b0ca793681089edd304deae6ae05d531546b15e 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -18,7 +18,7 @@
* - TODO music upload button
*/
-/* global OC, t, n */
+/* global Files, FileList, jQuery, oc_requesttoken, humanFileSize, getUniqueName */
/**
* Function that will allow us to know if Ajax uploads are supported
@@ -65,7 +65,7 @@ OC.Upload = {
*/
cancelUploads:function() {
this.log('canceling uploads');
- jQuery.each(this._uploads,function(i, jqXHR) {
+ jQuery.each(this._uploads, function(i, jqXHR) {
jqXHR.abort();
});
this._uploads = [];
@@ -83,7 +83,7 @@ OC.Upload = {
isProcessing:function() {
var count = 0;
- jQuery.each(this._uploads,function(i, data) {
+ jQuery.each(this._uploads, function(i, data) {
if (data.state() === 'pending') {
count++;
}
@@ -205,14 +205,16 @@ OC.Upload = {
*/
add: function(e, data) {
OC.Upload.log('add', e, data);
- var that = $(this);
- var freeSpace;
+ var that = $(this), freeSpace;
- // 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
+ // 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 ) {
@@ -244,14 +246,15 @@ OC.Upload = {
// in case folder drag and drop is not supported file will point to a directory
// http://stackoverflow.com/a/20448357
- if (!file.type && file.size%4096 === 0 && file.size <= 102400) {
+ if ( ! file.type && file.size%4096 === 0 && file.size <= 102400) {
try {
- reader = new FileReader();
- reader.readAsBinaryString(f);
+ var reader = new FileReader();
+ reader.readAsBinaryString(file);
} catch (NS_ERROR_FILE_ACCESS_DENIED) {
//file is a directory
data.textStatus = 'dirorzero';
- data.errorThrown = t('files', 'Unable to upload {filename} as it is a directory or has 0 bytes',
+ data.errorThrown = t('files',
+ 'Unable to upload {filename} as it is a directory or has 0 bytes',
{filename: file.name}
);
}
@@ -263,7 +266,8 @@ OC.Upload = {
// check PHP upload limit
if (selection.totalBytes > $('#upload_limit').val()) {
data.textStatus = 'sizeexceedlimit';
- data.errorThrown = t('files', 'Total file size {size1} exceeds upload limit {size2}', {
+ data.errorThrown = t('files',
+ 'Total file size {size1} exceeds upload limit {size2}', {
'size1': humanFileSize(selection.totalBytes),
'size2': humanFileSize($('#upload_limit').val())
});
@@ -273,7 +277,8 @@ OC.Upload = {
freeSpace = $('#free_space').val();
if (freeSpace >= 0 && selection.totalBytes > freeSpace) {
data.textStatus = 'notenoughspace';
- data.errorThrown = t('files', 'Not enough free space, you are uploading {size1} but only {size2} is left', {
+ data.errorThrown = t('files',
+ 'Not enough free space, you are uploading {size1} but only {size2} is left', {
'size1': humanFileSize(selection.totalBytes),
'size2': humanFileSize($('#free_space').val())
});
@@ -341,7 +346,7 @@ OC.Upload = {
// noone set update parameters, we set the minimum
data.formData = {
requesttoken: oc_requesttoken,
- dir: $('#dir').val(),
+ dir: FileList.getCurrentDirectory(),
file_directory: fileDirectory
};
}
@@ -384,31 +389,29 @@ OC.Upload = {
//fetch response from iframe
response = data.result[0].body.innerText;
}
- var result=$.parseJSON(response);
+ var result = $.parseJSON(response);
delete data.jqXHR;
+ var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+
if (result.status === 'error' && result.data && result.data.message){
data.textStatus = 'servererror';
data.errorThrown = result.data.message;
- var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
fu._trigger('fail', e, data);
} else 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[0].data.message; // error message has been translated on server
- var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
fu._trigger('fail', e, data);
}
},
@@ -440,7 +443,7 @@ OC.Upload = {
fileupload.on('fileuploadstart', function(e, data) {
OC.Upload.log('progress handle fileuploadstart', e, data);
$('#uploadprogresswrapper input.stop').show();
- $('#uploadprogressbar').progressbar({value:0});
+ $('#uploadprogressbar').progressbar({value: 0});
$('#uploadprogressbar').fadeIn();
});
fileupload.on('fileuploadprogress', function(e, data) {
@@ -457,7 +460,6 @@ OC.Upload = {
$('#uploadprogresswrapper input.stop').fadeOut();
$('#uploadprogressbar').fadeOut();
- Files.updateStorageStatistics();
});
fileupload.on('fileuploadfail', function(e, data) {
OC.Upload.log('progress handle fileuploadfail', e, data);
@@ -468,8 +470,6 @@ OC.Upload = {
}
});
- } else {
- console.log('skipping file progress because your browser is broken');
}
}
@@ -509,7 +509,7 @@ OC.Upload = {
$('#new li').each(function(i,element) {
if ($(element).children('p').length === 0) {
$(element).children('form').remove();
- $(element).append('<p>'+$(element).data('text')+'</p>');
+ $(element).append('<p>' + $(element).data('text') + '</p>');
}
});
});
@@ -527,16 +527,16 @@ OC.Upload = {
$('#new .error').tipsy('hide');
- $('#new li').each(function(i,element) {
+ $('#new li').each(function(i, element) {
if ($(element).children('p').length === 0) {
$(element).children('form').remove();
- $(element).append('<p>'+$(element).data('text')+'</p>');
+ $(element).append('<p>' + $(element).data('text') + '</p>');
}
});
- var type=$(this).data('type');
- var text=$(this).children('p').text();
- $(this).data('text',text);
+ var type = $(this).data('type');
+ var text = $(this).children('p').text();
+ $(this).data('text', text);
$(this).children('p').remove();
// add input field
@@ -553,7 +553,7 @@ OC.Upload = {
var filename = input.val();
if (type === 'web' && filename.length === 0) {
throw t('files', 'URL cannot be empty');
- } else if (type !== 'web' && !Files.isFileNameValid(filename)) {
+ } else if (type !== 'web' && ! Files.isFileNameValid(filename)) {
// Files.isFileNameValid(filename) throws an exception itself
} else if (FileList.inList(filename)) {
throw t('files', '{new_name} already exists', {new_name: filename});
@@ -592,7 +592,7 @@ OC.Upload = {
if (FileList.lastAction) {
FileList.lastAction();
}
- var name = getUniqueName(newname);
+ var name = FileList.getUniqueName(newname);
if (newname !== name) {
FileList.checkName(name, newname, true);
var hidden = true;
@@ -603,7 +603,10 @@ OC.Upload = {
case 'file':
$.post(
OC.filePath('files', 'ajax', 'newfile.php'),
- {dir:$('#dir').val(), filename:name},
+ {
+ dir: FileList.getCurrentDirectory(),
+ filename: name
+ },
function(result) {
if (result.status === 'success') {
FileList.add(result.data, {hidden: hidden, animate: true});
@@ -616,7 +619,10 @@ OC.Upload = {
case 'folder':
$.post(
OC.filePath('files','ajax','newfolder.php'),
- {dir:$('#dir').val(), foldername:name},
+ {
+ dir: FileList.getCurrentDirectory(),
+ foldername: name
+ },
function(result) {
if (result.status === 'success') {
FileList.add(result.data, {hidden: hidden, animate: true});
@@ -627,39 +633,46 @@ OC.Upload = {
);
break;
case 'web':
- if (name.substr(0,8) !== 'https://' && name.substr(0,7) !== 'http://') {
+ if (name.substr(0, 8) !== 'https://' && name.substr(0, 7) !== 'http://') {
name = 'http://' + name;
}
- var localName=name;
- if (localName.substr(localName.length-1,1)==='/') {//strip /
- localName=localName.substr(0,localName.length-1);
+ var localName = name;
+ if (localName.substr(localName.length-1, 1) === '/') {//strip /
+ localName = localName.substr(0, localName.length-1);
}
- if (localName.indexOf('/')) {//use last part of url
- localName=localName.split('/').pop();
+ if (localName.indexOf('/')) { //use last part of url
+ localName = localName.split('/').pop();
} else { //or the domain
- localName=(localName.match(/:\/\/(.[^\/]+)/)[1]).replace('www.','');
+ localName = (localName.match(/:\/\/(.[^\/]+)/)[1]).replace('www.', '');
}
- localName = getUniqueName(localName);
+ localName = FileList.getUniqueName(localName);
//IE < 10 does not fire the necessary events for the progress bar.
if ($('html.lte9').length === 0) {
- $('#uploadprogressbar').progressbar({value:0});
+ $('#uploadprogressbar').progressbar({value: 0});
$('#uploadprogressbar').fadeIn();
}
- var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
- eventSource.listen('progress',function(progress) {
+ var eventSource = new OC.EventSource(
+ OC.filePath('files', 'ajax', 'newfile.php'),
+ {
+ dir: FileList.getCurrentDirectory(),
+ source: name,
+ filename: localName
+ }
+ );
+ eventSource.listen('progress', function(progress) {
//IE < 10 does not fire the necessary events for the progress bar.
if ($('html.lte9').length === 0) {
$('#uploadprogressbar').progressbar('value',progress);
}
});
- eventSource.listen('success',function(data) {
+ eventSource.listen('success', function(data) {
var file = data;
$('#uploadprogressbar').fadeOut();
FileList.add(file, {hidden: hidden, animate: true});
});
- eventSource.listen('error',function(error) {
+ eventSource.listen('error', function(error) {
$('#uploadprogressbar').fadeOut();
var message = (error && error.message) || t('core', 'Error fetching URL');
OC.Notification.show(message);
@@ -670,12 +683,12 @@ OC.Upload = {
});
break;
}
- var li=form.parent();
+ 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>');
+ li.append('<p>' + li.data('text') + '</p>');
$('#new>a').click();
} catch (error) {
input.attr('title', error);
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index ecdfa72a477eb00d7b8f0b07a892ec8b6e6d35b0..3df62f37518c68dd1f9d73202e7299d4f8ebc7e8 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -8,242 +8,314 @@
*
*/
-/* global OC, FileList, Files */
/* global trashBinApp */
-var FileActions = {
- actions: {},
- defaults: {},
- icons: {},
- currentFile: null,
- register: function (mime, name, permissions, icon, action, displayName) {
- if (!FileActions.actions[mime]) {
- FileActions.actions[mime] = {};
- }
- if (!FileActions.actions[mime][name]) {
- FileActions.actions[mime][name] = {};
- }
- if (!displayName) {
- displayName = t('files', name);
- }
- FileActions.actions[mime][name]['action'] = action;
- FileActions.actions[mime][name]['permissions'] = permissions;
- FileActions.actions[mime][name]['displayName'] = displayName;
- FileActions.icons[name] = icon;
- },
- setDefault: function (mime, name) {
- FileActions.defaults[mime] = name;
- },
- get: function (mime, type, permissions) {
- var actions = this.getActions(mime, type, permissions);
- var filteredActions = {};
- $.each(actions, function (name, action) {
- filteredActions[name] = action.action;
- });
- return filteredActions;
- },
- getActions: function (mime, type, permissions) {
- var actions = {};
- if (FileActions.actions.all) {
- actions = $.extend(actions, FileActions.actions.all);
- }
- if (type) {//type is 'dir' or 'file'
- if (FileActions.actions[type]) {
- actions = $.extend(actions, FileActions.actions[type]);
+(function() {
+
+ /**
+ * Construct a new FileActions instance
+ */
+ var FileActions = function() {
+ this.initialize();
+ }
+ FileActions.prototype = {
+ actions: {},
+ defaults: {},
+ icons: {},
+ currentFile: null,
+ initialize: function() {
+ this.clear();
+ },
+ /**
+ * Merges the actions from the given fileActions into
+ * this instance.
+ *
+ * @param fileActions instance of OCA.Files.FileActions
+ */
+ merge: function(fileActions) {
+ var self = this;
+ // merge first level to avoid unintended overwriting
+ _.each(fileActions.actions, function(sourceMimeData, mime) {
+ var targetMimeData = self.actions[mime];
+ if (!targetMimeData) {
+ targetMimeData = {};
+ }
+ self.actions[mime] = _.extend(targetMimeData, sourceMimeData);
+ });
+
+ this.defaults = _.extend(this.defaults, fileActions.defaults);
+ this.icons = _.extend(this.icons, fileActions.icons);
+ },
+ register: function (mime, name, permissions, icon, action, displayName) {
+ if (!this.actions[mime]) {
+ this.actions[mime] = {};
}
- }
- if (mime) {
- var mimePart = mime.substr(0, mime.indexOf('/'));
- if (FileActions.actions[mimePart]) {
- actions = $.extend(actions, FileActions.actions[mimePart]);
+ if (!this.actions[mime][name]) {
+ this.actions[mime][name] = {};
}
- if (FileActions.actions[mime]) {
- actions = $.extend(actions, FileActions.actions[mime]);
+ if (!displayName) {
+ displayName = t('files', name);
}
- }
- var filteredActions = {};
- $.each(actions, function (name, action) {
- if (action.permissions & permissions) {
- filteredActions[name] = action;
+ this.actions[mime][name]['action'] = action;
+ this.actions[mime][name]['permissions'] = permissions;
+ this.actions[mime][name]['displayName'] = displayName;
+ this.icons[name] = icon;
+ },
+ clear: function() {
+ this.actions = {};
+ this.defaults = {};
+ this.icons = {};
+ this.currentFile = null;
+ },
+ setDefault: function (mime, name) {
+ this.defaults[mime] = name;
+ },
+ get: function (mime, type, permissions) {
+ var actions = this.getActions(mime, type, permissions);
+ var filteredActions = {};
+ $.each(actions, function (name, action) {
+ filteredActions[name] = action.action;
+ });
+ return filteredActions;
+ },
+ getActions: function (mime, type, permissions) {
+ var actions = {};
+ if (this.actions.all) {
+ actions = $.extend(actions, this.actions.all);
}
- });
- return filteredActions;
- },
- getDefault: function (mime, type, permissions) {
- var mimePart;
- if (mime) {
- mimePart = mime.substr(0, mime.indexOf('/'));
- }
- var name = false;
- if (mime && FileActions.defaults[mime]) {
- name = FileActions.defaults[mime];
- } else if (mime && FileActions.defaults[mimePart]) {
- name = FileActions.defaults[mimePart];
- } else if (type && FileActions.defaults[type]) {
- name = FileActions.defaults[type];
- } else {
- name = FileActions.defaults.all;
- }
- var actions = this.get(mime, type, permissions);
- return actions[name];
- },
- /**
- * Display file actions for the given element
- * @param parent "td" element of the file for which to display actions
- * @param triggerEvent if true, triggers the fileActionsReady on the file
- * list afterwards (false by default)
- */
- display: function (parent, triggerEvent) {
- FileActions.currentFile = parent;
- var actions = FileActions.getActions(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
- var file = FileActions.getCurrentFile();
- var nameLinks;
- if (FileList.findFileEl(file).data('renaming')) {
- return;
- }
+ if (type) {//type is 'dir' or 'file'
+ if (this.actions[type]) {
+ actions = $.extend(actions, this.actions[type]);
+ }
+ }
+ if (mime) {
+ var mimePart = mime.substr(0, mime.indexOf('/'));
+ if (this.actions[mimePart]) {
+ actions = $.extend(actions, this.actions[mimePart]);
+ }
+ if (this.actions[mime]) {
+ actions = $.extend(actions, this.actions[mime]);
+ }
+ }
+ var filteredActions = {};
+ $.each(actions, function (name, action) {
+ if (action.permissions & permissions) {
+ filteredActions[name] = action;
+ }
+ });
+ return filteredActions;
+ },
+ getDefault: function (mime, type, permissions) {
+ var mimePart;
+ if (mime) {
+ mimePart = mime.substr(0, mime.indexOf('/'));
+ }
+ var name = false;
+ if (mime && this.defaults[mime]) {
+ name = this.defaults[mime];
+ } else if (mime && this.defaults[mimePart]) {
+ name = this.defaults[mimePart];
+ } else if (type && this.defaults[type]) {
+ name = this.defaults[type];
+ } else {
+ name = this.defaults.all;
+ }
+ var actions = this.get(mime, type, permissions);
+ return actions[name];
+ },
+ /**
+ * Display file actions for the given element
+ * @param parent "td" element of the file for which to display actions
+ * @param triggerEvent if true, triggers the fileActionsReady on the file
+ * list afterwards (false by default)
+ * @param fileList OCA.Files.FileList instance on which the action is
+ * done, defaults to OCA.Files.App.fileList
+ */
+ display: function (parent, triggerEvent, fileList) {
+ if (!fileList) {
+ console.warn('FileActions.display() MUST be called with a OCA.Files.FileList instance');
+ }
+ this.currentFile = parent;
+ var self = this;
+ var actions = this.getActions(this.getCurrentMimeType(), this.getCurrentType(), this.getCurrentPermissions());
+ var file = this.getCurrentFile();
+ var nameLinks;
+ if (parent.closest('tr').data('renaming')) {
+ return;
+ }
+
+ // recreate fileactions
+ nameLinks = parent.children('a.name');
+ nameLinks.find('.fileactions, .nametext .action').remove();
+ nameLinks.append('<span class="fileactions" />');
+ var defaultAction = this.getDefault(this.getCurrentMimeType(), this.getCurrentType(), this.getCurrentPermissions());
+
+ var actionHandler = function (event) {
+ event.stopPropagation();
+ event.preventDefault();
- // recreate fileactions
- nameLinks = parent.children('a.name');
- nameLinks.find('.fileactions, .nametext .action').remove();
- nameLinks.append('<span class="fileactions" />');
- var defaultAction = FileActions.getDefault(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
+ self.currentFile = event.data.elem;
+ // also set on global object for legacy apps
+ window.FileActions.currentFile = self.currentFile;
- var actionHandler = function (event) {
- event.stopPropagation();
- event.preventDefault();
+ var file = self.getCurrentFile();
+ var $tr = $(this).closest('tr');
- FileActions.currentFile = event.data.elem;
- var file = FileActions.getCurrentFile();
+ event.data.actionFunc(file, {
+ $file: $tr,
+ fileList: fileList || OCA.Files.App.fileList,
+ fileActions: self,
+ dir: $tr.attr('data-path') || fileList.getCurrentDirectory()
+ });
+ };
- event.data.actionFunc(file);
- };
+ var addAction = function (name, action, displayName) {
- var addAction = function (name, action, displayName) {
+ if ((name === 'Download' || action !== defaultAction) && name !== 'Delete') {
- if ((name === 'Download' || action !== defaultAction) && name !== 'Delete') {
+ var img = self.icons[name],
+ actionText = displayName,
+ actionContainer = 'a.name>span.fileactions';
- var img = FileActions.icons[name],
- actionText = displayName,
- actionContainer = 'a.name>span.fileactions';
+ if (name === 'Rename') {
+ // rename has only an icon which appears behind
+ // the file name
+ actionText = '';
+ actionContainer = 'a.name span.nametext';
+ }
+ if (img.call) {
+ img = img(file);
+ }
+ var html = '<a href="#" class="action action-' + name.toLowerCase() + '" data-action="' + name + '">';
+ if (img) {
+ html += '<img class ="svg" src="' + img + '" />';
+ }
+ html += '<span> ' + actionText + '</span></a>';
- if (name === 'Rename') {
- // rename has only an icon which appears behind
- // the file name
- actionText = '';
- actionContainer = 'a.name span.nametext';
+ var element = $(html);
+ element.data('action', name);
+ element.on('click', {a: null, elem: parent, actionFunc: actions[name].action}, actionHandler);
+ parent.find(actionContainer).append(element);
}
+
+ };
+
+ $.each(actions, function (name, action) {
+ if (name !== 'Share') {
+ displayName = action.displayName;
+ ah = action.action;
+
+ addAction(name, ah, displayName);
+ }
+ });
+ if(actions.Share){
+ displayName = t('files', 'Share');
+ addAction('Share', actions.Share, displayName);
+ }
+
+ // remove the existing delete action
+ parent.parent().children().last().find('.action.delete').remove();
+ if (actions['Delete']) {
+ var img = self.icons['Delete'];
+ var html;
if (img.call) {
img = img(file);
}
- var html = '<a href="#" class="action action-' + name.toLowerCase() + '" data-action="' + name + '">';
- if (img) {
- html += '<img class ="svg" src="' + img + '" />';
+ if (typeof trashBinApp !== 'undefined' && trashBinApp) {
+ html = '<a href="#" original-title="' + t('files', 'Delete permanently') + '" class="action delete delete-icon" />';
+ } else {
+ html = '<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete delete-icon" />';
}
- html += '<span> ' + actionText + '</span></a>';
-
var element = $(html);
- element.data('action', name);
- element.on('click', {a: null, elem: parent, actionFunc: actions[name].action}, actionHandler);
- parent.find(actionContainer).append(element);
+ element.data('action', actions['Delete']);
+ element.on('click', {a: null, elem: parent, actionFunc: actions['Delete'].action}, actionHandler);
+ parent.parent().children().last().append(element);
}
- };
+ if (triggerEvent){
+ fileList.$fileList.trigger(jQuery.Event("fileActionsReady", {fileList: fileList}));
+ }
+ },
+ getCurrentFile: function () {
+ return this.currentFile.parent().attr('data-file');
+ },
+ getCurrentMimeType: function () {
+ return this.currentFile.parent().attr('data-mime');
+ },
+ getCurrentType: function () {
+ return this.currentFile.parent().attr('data-type');
+ },
+ getCurrentPermissions: function () {
+ return this.currentFile.parent().data('permissions');
+ },
- $.each(actions, function (name, action) {
- if (name !== 'Share') {
- displayName = action.displayName;
- ah = action.action;
+ /**
+ * Register the actions that are used by default for the files app.
+ */
+ registerDefaultActions: function() {
+ this.register('all', 'Delete', OC.PERMISSION_DELETE, function () {
+ return OC.imagePath('core', 'actions/delete');
+ }, function (filename, context) {
+ context.fileList.do_delete(filename);
+ $('.tipsy').remove();
+ });
- addAction(name, ah, displayName);
- }
- });
- if(actions.Share){
- displayName = t('files', 'Share');
- addAction('Share', actions.Share, displayName);
- }
+ // t('files', 'Rename')
+ this.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
+ return OC.imagePath('core', 'actions/rename');
+ }, function (filename, context) {
+ context.fileList.rename(filename);
+ });
- // remove the existing delete action
- parent.parent().children().last().find('.action.delete').remove();
- if (actions['Delete']) {
- var img = FileActions.icons['Delete'];
- var html;
- if (img.call) {
- img = img(file);
- }
- if (typeof trashBinApp !== 'undefined' && trashBinApp) {
- html = '<a href="#" original-title="' + t('files', 'Delete permanently') + '" class="action delete delete-icon" />';
+ this.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
+ var dir = context.fileList.getCurrentDirectory();
+ if (dir !== '/') {
+ dir = dir + '/';
+ }
+ context.fileList.changeDirectory(dir + filename);
+ });
+
+ this.setDefault('dir', 'Open');
+ var downloadScope;
+ if ($('#allowZipDownload').val() == 1) {
+ downloadScope = 'all';
} else {
- html = '<a href="#" class="action delete delete-icon" />';
+ downloadScope = 'file';
}
- var element = $(html);
- element.data('action', actions['Delete']);
- element.on('click', {a: null, elem: parent, actionFunc: actions['Delete'].action}, actionHandler);
- parent.parent().children().last().append(element);
- }
- if (triggerEvent){
- $('#fileList').trigger(jQuery.Event("fileActionsReady"));
+ this.register(downloadScope, 'Download', OC.PERMISSION_READ, function () {
+ return OC.imagePath('core', 'actions/download');
+ }, function (filename, context) {
+ var dir = context.dir || context.fileList.getCurrentDirectory();
+ var url = context.fileList.getDownloadUrl(filename, dir);
+ if (url) {
+ OC.redirect(url);
+ }
+ });
}
- },
- getCurrentFile: function () {
- return FileActions.currentFile.parent().attr('data-file');
- },
- getCurrentMimeType: function () {
- return FileActions.currentFile.parent().attr('data-mime');
- },
- getCurrentType: function () {
- return FileActions.currentFile.parent().attr('data-type');
- },
- getCurrentPermissions: function () {
- return FileActions.currentFile.parent().data('permissions');
- }
-};
-
-$(document).ready(function () {
- var downloadScope;
- if ($('#allowZipDownload').val() == 1) {
- downloadScope = 'all';
- } else {
- downloadScope = 'file';
- }
+ };
- if (typeof disableDownloadActions == 'undefined' || !disableDownloadActions) {
- FileActions.register(downloadScope, 'Download', OC.PERMISSION_READ, function () {
- return OC.imagePath('core', 'actions/download');
- }, function (filename) {
- var url = Files.getDownloadUrl(filename);
- if (url) {
- OC.redirect(url);
- }
- });
- }
- $('#fileList tr').each(function () {
- FileActions.display($(this).children('td.filename'));
- });
-
- $('#fileList').trigger(jQuery.Event("fileActionsReady"));
-
-});
-
-FileActions.register('all', 'Delete', OC.PERMISSION_DELETE, function () {
- return OC.imagePath('core', 'actions/delete');
-}, function (filename) {
- FileList.do_delete(filename);
- $('.tipsy').remove();
-});
-
-// t('files', 'Rename')
-FileActions.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
- return OC.imagePath('core', 'actions/rename');
-}, function (filename) {
- FileList.rename(filename);
-});
-
-FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
- var dir = $('#dir').val() || '/';
- if (dir !== '/') {
- dir = dir + '/';
- }
- FileList.changeDirectory(dir + filename);
-});
+ OCA.Files.FileActions = FileActions;
+
+ // global file actions to be used by all lists
+ OCA.Files.fileActions = new OCA.Files.FileActions();
+ OCA.Files.legacyFileActions = new OCA.Files.FileActions();
+
+ // for backward compatibility
+ //
+ // legacy apps are expecting a stateful global FileActions object to register
+ // their actions on. Since legacy apps are very likely to break with other
+ // FileList views than the main one ("All files"), actions registered
+ // through window.FileActions will be limited to the main file list.
+ window.FileActions = OCA.Files.legacyFileActions;
+ window.FileActions.register = function (mime, name, permissions, icon, action, displayName) {
+ console.warn('FileActions.register() is deprecated, please use OCA.Files.fileActions.register() instead', arguments);
+ OCA.Files.FileActions.prototype.register.call(
+ window.FileActions, mime, name, permissions, icon, action, displayName
+ );
+ };
+ window.FileActions.setDefault = function (mime, name) {
+ console.warn('FileActions.setDefault() is deprecated, please use OCA.Files.fileActions.setDefault() instead', mime, name);
+ OCA.Files.FileActions.prototype.setDefault.call(window.FileActions, mime, name);
+ };
+})();
-FileActions.setDefault('dir', 'Open');
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 8896a8e23a87d53674f6e7b7c8f6b07baedcca85..1b2a62137e5ec6d3a17dd468d7040dc01edfb076 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -8,1540 +8,1789 @@
*
*/
-/* global OC, t, n, FileList, FileActions, Files, FileSummary, BreadCrumb */
-/* global dragOptions, folderDropOptions */
-window.FileList = {
- appName: t('files', 'Files'),
- isEmpty: true,
- useUndo:true,
- $el: $('#filestable'),
- $fileList: $('#fileList'),
- breadcrumb: null,
-
+(function() {
/**
- * Instance of FileSummary
+ * The FileList class manages a file list view.
+ * A file list view consists of a controls bar and
+ * a file list table.
*/
- fileSummary: null,
- initialized: false,
+ var FileList = function($el, options) {
+ this.initialize($el, options);
+ };
+ FileList.prototype = {
+ SORT_INDICATOR_ASC_CLASS: 'icon-triangle-s',
+ SORT_INDICATOR_DESC_CLASS: 'icon-triangle-n',
+
+ id: 'files',
+ appName: t('files', 'Files'),
+ isEmpty: true,
+ useUndo:true,
+
+ /**
+ * Top-level container with controls and file list
+ */
+ $el: null,
+
+ /**
+ * Files table
+ */
+ $table: null,
+
+ /**
+ * List of rows (table tbody)
+ */
+ $fileList: null,
+
+ breadcrumb: null,
+
+ /**
+ * Instance of FileSummary
+ */
+ fileSummary: null,
+ initialized: false,
+
+ // number of files per page
+ pageSize: 20,
+
+ /**
+ * Array of files in the current folder.
+ * The entries are of file data.
+ */
+ files: [],
+
+ /**
+ * File actions handler, defaults to OCA.Files.FileActions
+ */
+ fileActions: null,
+
+ /**
+ * Map of file id to file data
+ */
+ _selectedFiles: {},
+
+ /**
+ * Summary of selected files.
+ * Instance of FileSummary.
+ */
+ _selectionSummary: null,
+
+ /**
+ * Sort attribute
+ */
+ _sort: 'name',
+
+ /**
+ * Sort direction: 'asc' or 'desc'
+ */
+ _sortDirection: 'asc',
+
+ /**
+ * Sort comparator function for the current sort
+ */
+ _sortComparator: null,
+
+ /**
+ * Current directory
+ */
+ _currentDirectory: null,
+
+ _dragOptions: null,
+ _folderDropOptions: null,
+
+ /**
+ * Initialize the file list and its components
+ *
+ * @param $el container element with existing markup for the #controls
+ * and a table
+ * @param options map of options, see other parameters
+ * @param scrollContainer scrollable container, defaults to $(window)
+ * @param dragOptions drag options, disabled by default
+ * @param folderDropOptions folder drop options, disabled by default
+ */
+ initialize: function($el, options) {
+ var self = this;
+ options = options || {};
+ if (this.initialized) {
+ return;
+ }
- // number of files per page
- pageSize: 20,
+ if (options.dragOptions) {
+ this._dragOptions = options.dragOptions;
+ }
+ if (options.folderDropOptions) {
+ this._folderDropOptions = options.folderDropOptions;
+ }
- /**
- * Array of files in the current folder.
- * The entries are of file data.
- */
- files: [],
+ this.$el = $el;
+ this.$container = options.scrollContainer || $(window);
+ this.$table = $el.find('table:first');
+ this.$fileList = $el.find('#fileList');
+ this._initFileActions(options.fileActions);
+ this.files = [];
+ this._selectedFiles = {};
+ this._selectionSummary = new OCA.Files.FileSummary();
- /**
- * Map of file id to file data
- */
- _selectedFiles: {},
+ this.fileSummary = this._createSummary();
- /**
- * Summary of selected files.
- * Instance of FileSummary.
- */
- _selectionSummary: null,
+ this.setSort('name', 'asc');
- /**
- * Compare two file info objects, sorting by
- * folders first, then by name.
- */
- _fileInfoCompare: function(fileInfo1, fileInfo2) {
- if (fileInfo1.type === 'dir' && fileInfo2.type !== 'dir') {
- return -1;
- }
- if (fileInfo1.type !== 'dir' && fileInfo2.type === 'dir') {
- return 1;
- }
- return fileInfo1.name.localeCompare(fileInfo2.name);
- },
-
- /**
- * Initialize the file list and its components
- */
- initialize: function() {
- var self = this;
- if (this.initialized) {
- return;
- }
+ var breadcrumbOptions = {
+ onClick: _.bind(this._onClickBreadCrumb, this),
+ getCrumbUrl: function(part) {
+ return self.linkTo(part.dir);
+ }
+ };
+ // if dropping on folders is allowed, then also allow on breadcrumbs
+ if (this._folderDropOptions) {
+ breadcrumbOptions.onDrop = _.bind(this._onDropOnBreadCrumb, this);
+ }
+ this.breadcrumb = new OCA.Files.BreadCrumb(breadcrumbOptions);
- // TODO: FileList should not know about global elements
- this.$el = $('#filestable');
- this.$fileList = $('#fileList');
- this.files = [];
- this._selectedFiles = {};
- this._selectionSummary = new FileSummary();
+ this.$el.find('#controls').prepend(this.breadcrumb.$el);
- this.fileSummary = this._createSummary();
+ this.$el.find('thead th .columntitle').click(_.bind(this._onClickHeader, this));
- this.breadcrumb = new BreadCrumb({
- onClick: this._onClickBreadCrumb,
- onDrop: _.bind(this._onDropOnBreadCrumb, this),
- getCrumbUrl: function(part, index) {
- return self.linkTo(part.dir);
- }
- });
+ $(window).resize(function() {
+ // TODO: debounce this ?
+ var width = $(this).width();
+ self.breadcrumb.resize(width, false);
+ });
- $('#controls').prepend(this.breadcrumb.$el);
+ this.$fileList.on('click','td.filename>a.name', _.bind(this._onClickFile, this));
+ this.$fileList.on('change', 'td.filename>input:checkbox', _.bind(this._onClickFileCheckbox, this));
+ this.$el.on('urlChanged', _.bind(this._onUrlChanged, this));
+ this.$el.find('.select-all').click(_.bind(this._onClickSelectAll, this));
+ this.$el.find('.download').click(_.bind(this._onClickDownloadSelected, this));
+ this.$el.find('.delete-selected').click(_.bind(this._onClickDeleteSelected, this));
- $(window).resize(function() {
- // TODO: debounce this ?
- var width = $(this).width();
- FileList.breadcrumb.resize(width, false);
- });
+ this.setupUploadEvents();
- this.$fileList.on('click','td.filename>a.name', _.bind(this._onClickFile, this));
- this.$fileList.on('change', 'td.filename>input:checkbox', _.bind(this._onClickFileCheckbox, this));
- this.$el.find('#select_all').click(_.bind(this._onClickSelectAll, this));
- this.$el.find('.download').click(_.bind(this._onClickDownloadSelected, this));
- this.$el.find('.delete-selected').click(_.bind(this._onClickDeleteSelected, this));
- },
+ this.$container.on('scroll', _.bind(this._onScroll, this));
+ },
- /**
- * Selected/deselects the given file element and updated
- * the internal selection cache.
- *
- * @param $tr single file row element
- * @param state true to select, false to deselect
- */
- _selectFileEl: function($tr, state) {
- var $checkbox = $tr.find('td.filename>input:checkbox');
- var oldData = !!this._selectedFiles[$tr.data('id')];
- var data;
- $checkbox.prop('checked', state);
- $tr.toggleClass('selected', state);
- // already selected ?
- if (state === oldData) {
- return;
- }
- data = this.elementToFile($tr);
- if (state) {
- this._selectedFiles[$tr.data('id')] = data;
- this._selectionSummary.add(data);
- }
- else {
- delete this._selectedFiles[$tr.data('id')];
- this._selectionSummary.remove(data);
- }
- this.$el.find('#select_all').prop('checked', this._selectionSummary.getTotal() === this.files.length);
- },
+ _initFileActions: function(fileActions) {
+ this.fileActions = fileActions;
+ if (!this.fileActions) {
+ this.fileActions = new OCA.Files.FileActions();
+ this.fileActions.registerDefaultActions();
+ }
+ },
+
+ /**
+ * Event handler for when the URL changed
+ */
+ _onUrlChanged: function(e) {
+ if (e && e.dir) {
+ this.changeDirectory(e.dir, false, true);
+ }
+ },
+
+ /**
+ * Selected/deselects the given file element and updated
+ * the internal selection cache.
+ *
+ * @param $tr single file row element
+ * @param state true to select, false to deselect
+ */
+ _selectFileEl: function($tr, state) {
+ var $checkbox = $tr.find('td.filename>input:checkbox');
+ var oldData = !!this._selectedFiles[$tr.data('id')];
+ var data;
+ $checkbox.prop('checked', state);
+ $tr.toggleClass('selected', state);
+ // already selected ?
+ if (state === oldData) {
+ return;
+ }
+ data = this.elementToFile($tr);
+ if (state) {
+ this._selectedFiles[$tr.data('id')] = data;
+ this._selectionSummary.add(data);
+ }
+ else {
+ delete this._selectedFiles[$tr.data('id')];
+ this._selectionSummary.remove(data);
+ }
+ this.$el.find('.select-all').prop('checked', this._selectionSummary.getTotal() === this.files.length);
+ },
+
+ /**
+ * Event handler for when clicking on files to select them
+ */
+ _onClickFile: function(event) {
+ var $tr = $(event.target).closest('tr');
+ if (event.ctrlKey || event.shiftKey) {
+ event.preventDefault();
+ if (event.shiftKey) {
+ var $lastTr = $(this._lastChecked);
+ var lastIndex = $lastTr.index();
+ var currentIndex = $tr.index();
+ var $rows = this.$fileList.children('tr');
+
+ // last clicked checkbox below current one ?
+ if (lastIndex > currentIndex) {
+ var aux = lastIndex;
+ lastIndex = currentIndex;
+ currentIndex = aux;
+ }
- /**
- * Event handler for when clicking on files to select them
- */
- _onClickFile: function(event) {
- var $tr = $(event.target).closest('tr');
- if (event.ctrlKey || event.shiftKey) {
- event.preventDefault();
- if (event.shiftKey) {
- var $lastTr = $(this._lastChecked);
- var lastIndex = $lastTr.index();
- var currentIndex = $tr.index();
- var $rows = this.$fileList.children('tr');
-
- // last clicked checkbox below current one ?
- if (lastIndex > currentIndex) {
- var aux = lastIndex;
- lastIndex = currentIndex;
- currentIndex = aux;
+ // auto-select everything in-between
+ for (var i = lastIndex + 1; i < currentIndex; i++) {
+ this._selectFileEl($rows.eq(i), true);
+ }
}
-
- // auto-select everything in-between
- for (var i = lastIndex + 1; i < currentIndex; i++) {
- this._selectFileEl($rows.eq(i), true);
+ else {
+ this._lastChecked = $tr;
+ }
+ var $checkbox = $tr.find('td.filename>input:checkbox');
+ this._selectFileEl($tr, !$checkbox.prop('checked'));
+ this.updateSelectionSummary();
+ } else {
+ var filename = $tr.attr('data-file');
+ var renaming = $tr.data('renaming');
+ if (!renaming) {
+ this.fileActions.currentFile = $tr.find('td');
+ var mime = this.fileActions.getCurrentMimeType();
+ var type = this.fileActions.getCurrentType();
+ var permissions = this.fileActions.getCurrentPermissions();
+ var action = this.fileActions.getDefault(mime,type, permissions);
+ if (action) {
+ event.preventDefault();
+ // also set on global object for legacy apps
+ window.FileActions.currentFile = this.fileActions.currentFile;
+ action(filename, {
+ $file: $tr,
+ fileList: this,
+ fileActions: this.fileActions,
+ dir: $tr.attr('data-path') || this.getCurrentDirectory()
+ });
+ }
}
}
- else {
- this._lastChecked = $tr;
+ },
+
+ /**
+ * Event handler for when clicking on a file's checkbox
+ */
+ _onClickFileCheckbox: function(e) {
+ var $tr = $(e.target).closest('tr');
+ this._selectFileEl($tr, !$tr.hasClass('selected'));
+ this._lastChecked = $tr;
+ this.updateSelectionSummary();
+ },
+
+ /**
+ * Event handler for when selecting/deselecting all files
+ */
+ _onClickSelectAll: function(e) {
+ var checked = $(e.target).prop('checked');
+ this.$fileList.find('td.filename>input:checkbox').prop('checked', checked)
+ .closest('tr').toggleClass('selected', checked);
+ this._selectedFiles = {};
+ this._selectionSummary.clear();
+ if (checked) {
+ for (var i = 0; i < this.files.length; i++) {
+ var fileData = this.files[i];
+ this._selectedFiles[fileData.id] = fileData;
+ this._selectionSummary.add(fileData);
+ }
}
- var $checkbox = $tr.find('td.filename>input:checkbox');
- this._selectFileEl($tr, !$checkbox.prop('checked'));
this.updateSelectionSummary();
- } else {
- var filename = $tr.attr('data-file');
- var renaming = $tr.data('renaming');
- if (!renaming) {
- FileActions.currentFile = $tr.find('td');
- var mime=FileActions.getCurrentMimeType();
- var type=FileActions.getCurrentType();
- var permissions = FileActions.getCurrentPermissions();
- var action=FileActions.getDefault(mime,type, permissions);
- if (action) {
- event.preventDefault();
- action(filename);
+ },
+
+ /**
+ * Event handler for when clicking on "Download" for the selected files
+ */
+ _onClickDownloadSelected: function(event) {
+ var files;
+ var dir = this.getCurrentDirectory();
+ if (this.isAllSelected()) {
+ files = OC.basename(dir);
+ dir = OC.dirname(dir) || '/';
+ }
+ else {
+ files = _.pluck(this.getSelectedFiles(), 'name');
+ }
+ OC.Notification.show(t('files','Your download is being prepared. This might take some time if the files are big.'));
+ OC.redirect(this.getDownloadUrl(files, dir));
+ return false;
+ },
+
+ /**
+ * Event handler for when clicking on "Delete" for the selected files
+ */
+ _onClickDeleteSelected: function(event) {
+ var files = null;
+ if (!this.isAllSelected()) {
+ files = _.pluck(this.getSelectedFiles(), 'name');
+ }
+ this.do_delete(files);
+ event.preventDefault();
+ return false;
+ },
+
+ /**
+ * Event handler when clicking on a table header
+ */
+ _onClickHeader: function(e) {
+ var $target = $(e.target);
+ var sort;
+ if (!$target.is('a')) {
+ $target = $target.closest('a');
+ }
+ sort = $target.attr('data-sort');
+ if (sort) {
+ if (this._sort === sort) {
+ this.setSort(sort, (this._sortDirection === 'desc')?'asc':'desc');
}
+ else {
+ this.setSort(sort, 'asc');
+ }
+ this.reload();
+ }
+ },
+
+ /**
+ * Event handler when clicking on a bread crumb
+ */
+ _onClickBreadCrumb: function(e) {
+ var $el = $(e.target).closest('.crumb'),
+ $targetDir = $el.data('dir');
+
+ if ($targetDir !== undefined) {
+ e.preventDefault();
+ this.changeDirectory($targetDir);
+ }
+ },
+
+ /**
+ * Event handler for when scrolling the list container.
+ * This appends/renders the next page of entries when reaching the bottom.
+ */
+ _onScroll: function(e) {
+ if (this.$container.scrollTop() + this.$container.height() > this.$el.height() - 100) {
+ this._nextPage(true);
+ }
+ },
+
+ /**
+ * Event handler when dropping on a breadcrumb
+ */
+ _onDropOnBreadCrumb: function( event, ui ) {
+ var $target = $(event.target);
+ if (!$target.is('.crumb')) {
+ $target = $target.closest('.crumb');
+ }
+ var targetPath = $(event.target).data('dir');
+ var dir = this.getCurrentDirectory();
+ while (dir.substr(0,1) === '/') {//remove extra leading /'s
+ dir = dir.substr(1);
+ }
+ dir = '/' + dir;
+ if (dir.substr(-1,1) !== '/') {
+ dir = dir + '/';
+ }
+ // do nothing if dragged on current dir
+ if (targetPath === dir || targetPath + '/' === dir) {
+ return;
}
- }
- },
-
- /**
- * Event handler for when clicking on a file's checkbox
- */
- _onClickFileCheckbox: function(e) {
- var $tr = $(e.target).closest('tr');
- this._selectFileEl($tr, !$tr.hasClass('selected'));
- this._lastChecked = $tr;
- this.updateSelectionSummary();
- },
- /**
- * Event handler for when selecting/deselecting all files
- */
- _onClickSelectAll: function(e) {
- var checked = $(e.target).prop('checked');
- this.$fileList.find('td.filename>input:checkbox').prop('checked', checked)
- .closest('tr').toggleClass('selected', checked);
- this._selectedFiles = {};
- this._selectionSummary.clear();
- if (checked) {
- for (var i = 0; i < this.files.length; i++) {
- var fileData = this.files[i];
- this._selectedFiles[fileData.id] = fileData;
- this._selectionSummary.add(fileData);
+ var files = this.getSelectedFiles();
+ if (files.length === 0) {
+ // single one selected without checkbox?
+ files = _.map(ui.helper.find('tr'), this.elementToFile);
}
- }
- this.updateSelectionSummary();
- },
- /**
- * Event handler for when clicking on "Download" for the selected files
- */
- _onClickDownloadSelected: function(event) {
- var files;
- var dir = this.getCurrentDirectory();
- if (this.isAllSelected()) {
- files = OC.basename(dir);
- dir = OC.dirname(dir) || '/';
- }
- else {
- files = _.pluck(this.getSelectedFiles(), 'name');
- }
- OC.Notification.show(t('files','Your download is being prepared. This might take some time if the files are big.'));
- OC.redirect(Files.getDownloadUrl(files, dir));
- return false;
- },
+ this.move(_.pluck(files, 'name'), targetPath);
+ },
- /**
- * Event handler for when clicking on "Delete" for the selected files
- */
- _onClickDeleteSelected: function(event) {
- var files = null;
- if (!FileList.isAllSelected()) {
- files = _.pluck(this.getSelectedFiles(), 'name');
- }
- this.do_delete(files);
- event.preventDefault();
- return false;
- },
+ /**
+ * Sets a new page title
+ */
+ setPageTitle: function(title){
+ if (title) {
+ title += ' - ';
+ } else {
+ title = '';
+ }
+ title += this.appName;
+ // Sets the page title with the " - ownCloud" suffix as in templates
+ window.document.title = title + ' - ' + oc_defaults.title;
- /**
- * Event handler when clicking on a bread crumb
- */
- _onClickBreadCrumb: function(e) {
- var $el = $(e.target).closest('.crumb'),
- $targetDir = $el.data('dir');
+ return true;
+ },
+ /**
+ * Returns the tr element for a given file name
+ * @param fileName file name
+ */
+ findFileEl: function(fileName){
+ // use filterAttr to avoid escaping issues
+ return this.$fileList.find('tr').filterAttr('data-file', fileName);
+ },
+
+ /**
+ * Returns the file data from a given file element.
+ * @param $el file tr element
+ * @return file data
+ */
+ elementToFile: function($el){
+ $el = $($el);
+ return {
+ id: parseInt($el.attr('data-id'), 10),
+ name: $el.attr('data-file'),
+ mimetype: $el.attr('data-mime'),
+ type: $el.attr('data-type'),
+ size: parseInt($el.attr('data-size'), 10),
+ etag: $el.attr('data-etag')
+ };
+ },
+
+ /**
+ * Appends the next page of files into the table
+ * @param animate true to animate the new elements
+ */
+ _nextPage: function(animate) {
+ var index = this.$fileList.children().length,
+ count = this.pageSize,
+ tr,
+ fileData,
+ newTrs = [],
+ isAllSelected = this.isAllSelected();
+
+ if (index >= this.files.length) {
+ return;
+ }
- if ($targetDir !== undefined) {
- e.preventDefault();
- FileList.changeDirectory($targetDir);
- }
- },
+ while (count > 0 && index < this.files.length) {
+ fileData = this.files[index];
+ tr = this._renderRow(fileData, {updateSummary: false, silent: true});
+ this.$fileList.append(tr);
+ if (isAllSelected || this._selectedFiles[fileData.id]) {
+ tr.addClass('selected');
+ tr.find('input:checkbox').prop('checked', true);
+ }
+ if (animate) {
+ tr.addClass('appear transparent');
+ newTrs.push(tr);
+ }
+ index++;
+ count--;
+ }
- _onScroll: function(e) {
- if ($(window).scrollTop() + $(window).height() > $(document).height() - 500) {
- this._nextPage(true);
- }
- },
+ if (animate) {
+ // defer, for animation
+ window.setTimeout(function() {
+ for (var i = 0; i < newTrs.length; i++ ) {
+ newTrs[i].removeClass('transparent');
+ }
+ }, 0);
+ }
+ },
- /**
- * Event handler when dropping on a breadcrumb
- */
- _onDropOnBreadCrumb: function( event, ui ) {
- var $target = $(event.target);
- if (!$target.is('.crumb')) {
- $target = $target.closest('.crumb');
- }
- var targetPath = $(event.target).data('dir');
- var dir = this.getCurrentDirectory();
- while (dir.substr(0,1) === '/') {//remove extra leading /'s
- dir = dir.substr(1);
- }
- dir = '/' + dir;
- if (dir.substr(-1,1) !== '/') {
- dir = dir + '/';
- }
- // do nothing if dragged on current dir
- if (targetPath === dir || targetPath + '/' === dir) {
- return;
- }
+ /**
+ * Sets the files to be displayed in the list.
+ * This operation will re-render the list and update the summary.
+ * @param filesArray array of file data (map)
+ */
+ setFiles: function(filesArray) {
+ // detach to make adding multiple rows faster
+ this.files = filesArray;
- var files = this.getSelectedFiles();
- if (files.length === 0) {
- // single one selected without checkbox?
- files = _.map(ui.helper.find('tr'), FileList.elementToFile);
- }
+ this.$fileList.detach();
+ this.$fileList.empty();
- FileList.move(_.pluck(files, 'name'), targetPath);
- },
+ // clear "Select all" checkbox
+ this.$el.find('.select-all').prop('checked', false);
- /**
- * Sets a new page title
- */
- setPageTitle: function(title){
- if (title) {
- title += ' - ';
- } else {
- title = '';
- }
- title += FileList.appName;
- // Sets the page title with the " - ownCloud" suffix as in templates
- window.document.title = title + ' - ' + oc_defaults.title;
+ this.isEmpty = this.files.length === 0;
+ this._nextPage();
- return true;
- },
- /**
- * Returns the tr element for a given file name
- * @param fileName file name
- */
- findFileEl: function(fileName){
- // use filterAttr to avoid escaping issues
- return this.$fileList.find('tr').filterAttr('data-file', fileName);
- },
+ this.$el.find('thead').after(this.$fileList);
- /**
- * Returns the file data from a given file element.
- * @param $el file tr element
- * @return file data
- */
- elementToFile: function($el){
- $el = $($el);
- return {
- id: parseInt($el.attr('data-id'), 10),
- name: $el.attr('data-file'),
- mimetype: $el.attr('data-mime'),
- type: $el.attr('data-type'),
- size: parseInt($el.attr('data-size'), 10),
- etag: $el.attr('data-etag')
- };
- },
+ this.updateEmptyContent();
+ this.$fileList.trigger($.Event('fileActionsReady', {fileList: this}));
- /**
- * Appends the next page of files into the table
- * @param animate true to animate the new elements
- */
- _nextPage: function(animate) {
- var index = this.$fileList.children().length,
- count = this.pageSize,
- tr,
- fileData,
- newTrs = [],
- isAllSelected = this.isAllSelected();
-
- if (index >= this.files.length) {
- return;
- }
+ this.fileSummary.calculate(filesArray);
- while (count > 0 && index < this.files.length) {
- fileData = this.files[index];
- tr = this._renderRow(fileData, {updateSummary: false});
- this.$fileList.append(tr);
- if (isAllSelected || this._selectedFiles[fileData.id]) {
- tr.addClass('selected');
- tr.find('input:checkbox').prop('checked', true);
- }
- if (animate) {
- tr.addClass('appear transparent');
- newTrs.push(tr);
+ this.updateSelectionSummary();
+ $(window).scrollTop(0);
+
+ this.$fileList.trigger(jQuery.Event("updated"));
+ },
+ /**
+ * Creates a new table row element using the given file data.
+ * @param fileData map of file attributes
+ * @param options map of attribute "loading" whether the entry is currently loading
+ * @return new tr element (not appended to the table)
+ */
+ _createRow: function(fileData, options) {
+ var td, simpleSize, basename, extension, sizeColor,
+ icon = OC.Util.replaceSVGIcon(fileData.icon),
+ name = fileData.name,
+ type = fileData.type || 'file',
+ mtime = parseInt(fileData.mtime, 10) || new Date().getTime(),
+ mime = fileData.mimetype,
+ path = fileData.path,
+ linkUrl;
+ options = options || {};
+
+ if (type === 'dir') {
+ mime = mime || 'httpd/unix-directory';
}
- index++;
- count--;
- }
-
- if (animate) {
- // defer, for animation
- window.setTimeout(function() {
- for (var i = 0; i < newTrs.length; i++ ) {
- newTrs[i].removeClass('transparent');
- }
- }, 0);
- }
- },
-
- /**
- * Sets the files to be displayed in the list.
- * This operation will re-render the list and update the summary.
- * @param filesArray array of file data (map)
- */
- setFiles: function(filesArray) {
- // detach to make adding multiple rows faster
- this.files = filesArray;
- this.$fileList.detach();
- this.$fileList.empty();
+ //containing tr
+ var tr = $('<tr></tr>').attr({
+ "data-id" : fileData.id,
+ "data-type": type,
+ "data-size": fileData.size,
+ "data-file": name,
+ "data-mime": mime,
+ "data-mtime": mtime,
+ "data-etag": fileData.etag,
+ "data-permissions": fileData.permissions || this.getDirectoryPermissions()
+ });
- // clear "Select all" checkbox
- this.$el.find('#select_all').prop('checked', false);
+ if (!_.isUndefined(path)) {
+ tr.attr('data-path', path);
+ }
+ else {
+ path = this.getCurrentDirectory();
+ }
- this.isEmpty = this.files.length === 0;
- this._nextPage();
+ if (type === 'dir') {
+ // use default folder icon
+ icon = icon || OC.imagePath('core', 'filetypes/folder');
+ }
+ else {
+ icon = icon || OC.imagePath('core', 'filetypes/file');
+ }
- this.$el.find('thead').after(this.$fileList);
+ // filename td
+ td = $('<td></td>').attr({
+ "class": "filename",
+ "style": 'background-image:url(' + icon + '); background-size: 32px;'
+ });
- this.updateEmptyContent();
- this.$fileList.trigger(jQuery.Event("fileActionsReady"));
- // "Files" might not be loaded in extending apps
- if (window.Files) {
- Files.setupDragAndDrop();
- }
+ // linkUrl
+ if (type === 'dir') {
+ linkUrl = this.linkTo(path + '/' + name);
+ }
+ else {
+ linkUrl = this.getDownloadUrl(name, path);
+ }
+ td.append('<input id="select-' + this.id + '-' + fileData.id +
+ '" type="checkbox" /><label for="select-' + this.id + '-' + fileData.id + '"></label>');
+ var linkElem = $('<a></a>').attr({
+ "class": "name",
+ "href": linkUrl
+ });
- this.fileSummary.calculate(filesArray);
+ // from here work on the display name
+ name = fileData.displayName || name;
- FileList.updateSelectionSummary();
- $(window).scrollTop(0);
+ // split extension from filename for non dirs
+ if (type !== 'dir' && name.indexOf('.') !== -1) {
+ basename = name.substr(0, name.lastIndexOf('.'));
+ extension = name.substr(name.lastIndexOf('.'));
+ } else {
+ basename = name;
+ extension = false;
+ }
+ var nameSpan=$('<span></span>').addClass('nametext').text(basename);
+ linkElem.append(nameSpan);
+ if (extension) {
+ nameSpan.append($('<span></span>').addClass('extension').text(extension));
+ }
+ // dirs can show the number of uploaded files
+ if (type === 'dir') {
+ linkElem.append($('<span></span>').attr({
+ 'class': 'uploadtext',
+ 'currentUploads': 0
+ }));
+ }
+ td.append(linkElem);
+ tr.append(td);
- this.$fileList.trigger(jQuery.Event("updated"));
- },
- /**
- * Creates a new table row element using the given file data.
- * @param fileData map of file attributes
- * @param options map of attribute "loading" whether the entry is currently loading
- * @return new tr element (not appended to the table)
- */
- _createRow: function(fileData, options) {
- var td, simpleSize, basename, extension, sizeColor,
- icon = OC.Util.replaceSVGIcon(fileData.icon),
- name = fileData.name,
- type = fileData.type || 'file',
- mtime = parseInt(fileData.mtime, 10) || new Date().getTime(),
- mime = fileData.mimetype,
- linkUrl;
- options = options || {};
-
- if (type === 'dir') {
- mime = mime || 'httpd/unix-directory';
- }
+ // size column
+ if (typeof(fileData.size) !== 'undefined' && fileData.size >= 0) {
+ simpleSize = humanFileSize(parseInt(fileData.size, 10));
+ sizeColor = Math.round(160-Math.pow((fileData.size/(1024*1024)),2));
+ } else {
+ simpleSize = t('files', 'Pending');
+ }
- // user should always be able to rename a share mount point
- var allowRename = 0;
- if (fileData.isShareMountPoint) {
- allowRename = OC.PERMISSION_UPDATE;
- }
+ td = $('<td></td>').attr({
+ "class": "filesize",
+ "style": 'color:rgb(' + sizeColor + ',' + sizeColor + ',' + sizeColor + ')'
+ }).text(simpleSize);
+ tr.append(td);
+
+ // date column
+ var modifiedColor = Math.round((Math.round((new Date()).getTime() / 1000) - mtime)/60/60/24*5);
+ td = $('<td></td>').attr({ "class": "date" });
+ td.append($('<span></span>').attr({
+ "class": "modified",
+ "title": formatDate(mtime),
+ "style": 'color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')'
+ }).text( relative_modified_date(mtime / 1000) ));
+ tr.find('.filesize').text(simpleSize);
+ tr.append(td);
+ return tr;
+ },
+
+ /**
+ * Adds an entry to the files array and also into the DOM
+ * in a sorted manner.
+ *
+ * @param fileData map of file attributes
+ * @param options map of attributes:
+ * - "updateSummary": true to update the summary after adding (default), false otherwise
+ * - "silent": true to prevent firing events like "fileActionsReady"
+ * @return new tr element (not appended to the table)
+ */
+ add: function(fileData, options) {
+ var index = -1;
+ var $tr;
+ var $rows;
+ var $insertionPoint;
+ options = options || {};
+
+ // there are three situations to cover:
+ // 1) insertion point is visible on the current page
+ // 2) insertion point is on a not visible page (visible after scrolling)
+ // 3) insertion point is at the end of the list
+
+ $rows = this.$fileList.children();
+ index = this._findInsertionIndex(fileData);
+ if (index > this.files.length) {
+ index = this.files.length;
+ }
+ else {
+ $insertionPoint = $rows.eq(index);
+ }
- //containing tr
- var tr = $('<tr></tr>').attr({
- "data-id" : fileData.id,
- "data-type": type,
- "data-size": fileData.size,
- "data-file": name,
- "data-mime": mime,
- "data-mtime": mtime,
- "data-etag": fileData.etag,
- "data-permissions": fileData.permissions | allowRename || this.getDirectoryPermissions()
- });
-
- if (type === 'dir') {
- // use default folder icon
- icon = icon || OC.imagePath('core', 'filetypes/folder');
- }
- else {
- icon = icon || OC.imagePath('core', 'filetypes/file');
- }
+ // is the insertion point visible ?
+ if ($insertionPoint.length) {
+ // only render if it will really be inserted
+ $tr = this._renderRow(fileData, options);
+ $insertionPoint.before($tr);
+ }
+ else {
+ // if insertion point is after the last visible
+ // entry, append
+ if (index === $rows.length) {
+ $tr = this._renderRow(fileData, options);
+ this.$fileList.append($tr);
+ }
+ }
- // filename td
- td = $('<td></td>').attr({
- "class": "filename",
- "style": 'background-image:url(' + icon + '); background-size: 32px;'
- });
+ this.isEmpty = false;
+ this.files.splice(index, 0, fileData);
- // linkUrl
- if (type === 'dir') {
- linkUrl = FileList.linkTo(FileList.getCurrentDirectory() + '/' + name);
- }
- else {
- linkUrl = Files.getDownloadUrl(name, FileList.getCurrentDirectory());
- }
- td.append('<input id="select-' + fileData.id + '" type="checkbox" /><label for="select-' + fileData.id + '"></label>');
- var linkElem = $('<a></a>').attr({
- "class": "name",
- "href": linkUrl
- });
-
- // from here work on the display name
- name = fileData.displayName || name;
-
- // split extension from filename for non dirs
- if (type !== 'dir' && name.indexOf('.') !== -1) {
- basename = name.substr(0, name.lastIndexOf('.'));
- extension = name.substr(name.lastIndexOf('.'));
- } else {
- basename = name;
- extension = false;
- }
- var nameSpan=$('<span></span>').addClass('nametext').text(basename);
- linkElem.append(nameSpan);
- if (extension) {
- nameSpan.append($('<span></span>').addClass('extension').text(extension));
- }
- // dirs can show the number of uploaded files
- if (type === 'dir') {
- linkElem.append($('<span></span>').attr({
- 'class': 'uploadtext',
- 'currentUploads': 0
- }));
- }
- td.append(linkElem);
- tr.append(td);
-
- // size column
- if (typeof(fileData.size) !== 'undefined' && fileData.size >= 0) {
- simpleSize = humanFileSize(parseInt(fileData.size, 10));
- sizeColor = Math.round(160-Math.pow((fileData.size/(1024*1024)),2));
- } else {
- simpleSize = t('files', 'Pending');
- }
+ if ($tr && options.animate) {
+ $tr.addClass('appear transparent');
+ window.setTimeout(function() {
+ $tr.removeClass('transparent');
+ });
+ }
- td = $('<td></td>').attr({
- "class": "filesize",
- "style": 'color:rgb(' + sizeColor + ',' + sizeColor + ',' + sizeColor + ')'
- }).text(simpleSize);
- tr.append(td);
-
- // date column
- var modifiedColor = Math.round((Math.round((new Date()).getTime() / 1000) - mtime)/60/60/24*5);
- td = $('<td></td>').attr({ "class": "date" });
- td.append($('<span></span>').attr({
- "class": "modified",
- "title": formatDate(mtime),
- "style": 'color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')'
- }).text( relative_modified_date(mtime / 1000) ));
- tr.find('.filesize').text(simpleSize);
- tr.append(td);
- return tr;
- },
+ // defaults to true if not defined
+ if (typeof(options.updateSummary) === 'undefined' || !!options.updateSummary) {
+ this.fileSummary.add(fileData, true);
+ this.updateEmptyContent();
+ }
- /**
- * Adds an entry to the files array and also into the DOM
- * in a sorted manner.
- *
- * @param fileData map of file attributes
- * @param options map of attributes:
- * - "updateSummary" true to update the summary after adding (default), false otherwise
- * @return new tr element (not appended to the table)
- */
- add: function(fileData, options) {
- var index = -1;
- var $tr;
- var $rows;
- var $insertionPoint;
- options = options || {};
-
- // there are three situations to cover:
- // 1) insertion point is visible on the current page
- // 2) insertion point is on a not visible page (visible after scrolling)
- // 3) insertion point is at the end of the list
-
- $rows = this.$fileList.children();
- index = this._findInsertionIndex(fileData);
- if (index > this.files.length) {
- index = this.files.length;
- }
- else {
- $insertionPoint = $rows.eq(index);
- }
+ return $tr;
+ },
+
+ /**
+ * Creates a new row element based on the given attributes
+ * and returns it.
+ *
+ * @param fileData map of file attributes
+ * @param options map of attributes:
+ * - "index" optional index at which to insert the element
+ * - "updateSummary" true to update the summary after adding (default), false otherwise
+ * @return new tr element (not appended to the table)
+ */
+ _renderRow: function(fileData, options) {
+ options = options || {};
+ var type = fileData.type || 'file',
+ mime = fileData.mimetype,
+ path = fileData.path || this.getCurrentDirectory(),
+ permissions = parseInt(fileData.permissions, 10) || 0;
+
+ if (fileData.isShareMountPoint) {
+ permissions = permissions | OC.PERMISSION_UPDATE;
+ }
- // is the insertion point visible ?
- if ($insertionPoint.length) {
- // only render if it will really be inserted
- $tr = this._renderRow(fileData, options);
- $insertionPoint.before($tr);
- }
- else {
- // if insertion point is after the last visible
- // entry, append
- if (index === $rows.length) {
- $tr = this._renderRow(fileData, options);
- this.$fileList.append($tr);
+ if (type === 'dir') {
+ mime = mime || 'httpd/unix-directory';
+ }
+ var tr = this._createRow(
+ fileData,
+ options
+ );
+ var filenameTd = tr.find('td.filename');
+
+ // TODO: move dragging to FileActions ?
+ // enable drag only for deletable files
+ if (this._dragOptions && permissions & OC.PERMISSION_DELETE) {
+ filenameTd.draggable(this._dragOptions);
+ }
+ // allow dropping on folders
+ if (this._folderDropOptions && fileData.type === 'dir') {
+ filenameTd.droppable(this._folderDropOptions);
}
- }
- this.isEmpty = false;
- this.files.splice(index, 0, fileData);
+ if (options.hidden) {
+ tr.addClass('hidden');
+ }
- if ($tr && options.animate) {
- $tr.addClass('appear transparent');
- window.setTimeout(function() {
- $tr.removeClass('transparent');
- });
- }
+ // display actions
+ this.fileActions.display(filenameTd, !options.silent, this);
+
+ if (fileData.isPreviewAvailable) {
+ // lazy load / newly inserted td ?
+ if (!fileData.icon) {
+ this.lazyLoadPreview({
+ path: path + '/' + fileData.name,
+ mime: mime,
+ etag: fileData.etag,
+ callback: function(url) {
+ filenameTd.css('background-image', 'url(' + url + ')');
+ }
+ });
+ }
+ else {
+ // set the preview URL directly
+ var urlSpec = {
+ file: path + '/' + fileData.name,
+ c: fileData.etag
+ };
+ var previewUrl = this.generatePreviewUrl(urlSpec);
+ previewUrl = previewUrl.replace('(', '%28').replace(')', '%29');
+ filenameTd.css('background-image', 'url(' + previewUrl + ')');
+ }
+ }
+ return tr;
+ },
+ /**
+ * Returns the current directory
+ * @return current directory
+ */
+ getCurrentDirectory: function(){
+ return this._currentDirectory || this.$el.find('#dir').val() || '/';
+ },
+ /**
+ * Returns the directory permissions
+ * @return permission value as integer
+ */
+ getDirectoryPermissions: function() {
+ return parseInt(this.$el.find('#permissions').val(), 10);
+ },
+ /**
+ * @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)
+ * @param {boolean} force set to true to force changing directory
+ */
+ changeDirectory: function(targetDir, changeUrl, force) {
+ var currentDir = this.getCurrentDirectory();
+ targetDir = targetDir || '/';
+ if (!force && currentDir === targetDir) {
+ return;
+ }
+ this._setCurrentDir(targetDir, changeUrl);
+ this.reload();
+ },
+ linkTo: function(dir) {
+ return OC.linkTo('files', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
+ },
+
+ /**
+ * Sets the current directory name and updates the breadcrumb.
+ * @param targetDir directory to display
+ * @param changeUrl true to also update the URL, false otherwise (default)
+ */
+ _setCurrentDir: function(targetDir, changeUrl) {
+ var previousDir = this.getCurrentDirectory(),
+ baseDir = OC.basename(targetDir);
+
+ if (baseDir !== '') {
+ this.setPageTitle(baseDir);
+ }
+ else {
+ this.setPageTitle();
+ }
- // defaults to true if not defined
- if (typeof(options.updateSummary) === 'undefined' || !!options.updateSummary) {
- this.fileSummary.add(fileData, true);
- this.updateEmptyContent();
- }
+ this._currentDirectory = targetDir;
- return $tr;
- },
+ // legacy stuff
+ this.$el.find('#dir').val(targetDir);
- /**
- * Creates a new row element based on the given attributes
- * and returns it.
- *
- * @param fileData map of file attributes
- * @param options map of attributes:
- * - "index" optional index at which to insert the element
- * - "updateSummary" true to update the summary after adding (default), false otherwise
- * @return new tr element (not appended to the table)
- */
- _renderRow: function(fileData, options) {
- options = options || {};
- var type = fileData.type || 'file',
- mime = fileData.mimetype,
- permissions = parseInt(fileData.permissions, 10) || 0;
-
- if (fileData.isShareMountPoint) {
- permissions = permissions | OC.PERMISSION_UPDATE;
- }
+ if (changeUrl !== false) {
+ this.$el.trigger(jQuery.Event('changeDirectory', {
+ dir: targetDir,
+ previousDir: previousDir
+ }));
+ }
+ this.breadcrumb.setDirectory(this.getCurrentDirectory());
+ },
+ /**
+ * Sets the current sorting and refreshes the list
+ *
+ * @param sort sort attribute name
+ * @param direction sort direction, one of "asc" or "desc"
+ */
+ setSort: function(sort, direction) {
+ var comparator = FileList.Comparators[sort] || FileList.Comparators.name;
+ this._sort = sort;
+ this._sortDirection = (direction === 'desc')?'desc':'asc';
+ this._sortComparator = comparator;
+ if (direction === 'desc') {
+ this._sortComparator = function(fileInfo1, fileInfo2) {
+ return -comparator(fileInfo1, fileInfo2);
+ };
+ }
+ this.$el.find('thead th .sort-indicator')
+ .removeClass(this.SORT_INDICATOR_ASC_CLASS + ' ' + this.SORT_INDICATOR_DESC_CLASS);
+ this.$el.find('thead th.column-' + sort + ' .sort-indicator')
+ .addClass(direction === 'desc' ? this.SORT_INDICATOR_DESC_CLASS : this.SORT_INDICATOR_ASC_CLASS);
+ },
+ /**
+ * @brief Reloads the file list using ajax call
+ */
+ reload: function() {
+ var self = this;
+ this._selectedFiles = {};
+ this._selectionSummary.clear();
+ this.$el.find('.select-all').prop('checked', false);
+ this.showMask();
+ if (this._reloadCall) {
+ this._reloadCall.abort();
+ }
+ this._reloadCall = $.ajax({
+ url: this.getAjaxUrl('list'),
+ data: {
+ dir : this.getCurrentDirectory(),
+ sort: this._sort,
+ sortdirection: this._sortDirection
+ },
+ error: function(result) {
+ self.reloadCallback(result);
+ },
+ success: function(result) {
+ self.reloadCallback(result);
+ }
+ });
+ },
+ reloadCallback: function(result) {
+ delete this._reloadCall;
+ this.hideMask();
+
+ if (!result || result.status === 'error') {
+ OC.Notification.show(result.data.message);
+ return;
+ }
- if (type === 'dir') {
- mime = mime || 'httpd/unix-directory';
- }
- var tr = this._createRow(
- fileData,
- options
- );
- var filenameTd = tr.find('td.filename');
-
- // TODO: move dragging to FileActions ?
- // enable drag only for deletable files
- if (permissions & OC.PERMISSION_DELETE) {
- filenameTd.draggable(dragOptions);
- }
- // allow dropping on folders
- if (fileData.type === 'dir') {
- filenameTd.droppable(folderDropOptions);
- }
+ if (result.status === 404) {
+ // go back home
+ this.changeDirectory('/');
+ return;
+ }
+ // aborted ?
+ if (result.status === 0){
+ return;
+ }
- if (options.hidden) {
- tr.addClass('hidden');
- }
+ // TODO: should rather return upload file size through
+ // the files list ajax call
+ this.updateStorageStatistics(true);
- // display actions
- FileActions.display(filenameTd, false);
+ if (result.data.permissions) {
+ this.setDirectoryPermissions(result.data.permissions);
+ }
- if (fileData.isPreviewAvailable) {
- // lazy load / newly inserted td ?
- if (!fileData.icon) {
- Files.lazyLoadPreview(getPathForPreview(fileData.name), mime, function(url) {
- filenameTd.css('background-image', 'url(' + url + ')');
- }, null, null, fileData.etag);
+ this.setFiles(result.data.files);
+ },
+
+ updateStorageStatistics: function(force) {
+ OCA.Files.Files.updateStorageStatistics(this.getCurrentDirectory(), force);
+ },
+
+ getAjaxUrl: function(action, params) {
+ return OCA.Files.Files.getAjaxUrl(action, params);
+ },
+
+ getDownloadUrl: function(files, dir) {
+ return OCA.Files.Files.getDownloadUrl(files, dir || this.getCurrentDirectory());
+ },
+
+ /**
+ * Generates a preview URL based on the URL space.
+ * @param urlSpec map with {x: width, y: height, file: file path}
+ * @return preview URL
+ */
+ generatePreviewUrl: function(urlSpec) {
+ urlSpec = urlSpec || {};
+ if (!urlSpec.x) {
+ urlSpec.x = this.$table.data('preview-x') || 36;
}
- else {
- // set the preview URL directly
- var urlSpec = {
- file: FileList.getCurrentDirectory() + '/' + fileData.name,
- c: fileData.etag
- };
- var previewUrl = Files.generatePreviewUrl(urlSpec);
- previewUrl = previewUrl.replace('(', '%28').replace(')', '%29');
- filenameTd.css('background-image', 'url(' + previewUrl + ')');
+ if (!urlSpec.y) {
+ urlSpec.y = this.$table.data('preview-y') || 36;
}
- }
- return tr;
- },
- /**
- * Returns the current directory
- * @return current directory
- */
- getCurrentDirectory: function(){
- return $('#dir').val() || '/';
- },
- /**
- * Returns the directory permissions
- * @return permission value as integer
- */
- getDirectoryPermissions: function() {
- return parseInt($('#permissions').val(), 10);
- },
- /**
- * @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)
- * @param {boolean} force set to true to force changing directory
- */
- changeDirectory: function(targetDir, changeUrl, force) {
- var $dir = $('#dir'),
- currentDir = $dir.val() || '/';
- targetDir = targetDir || '/';
- if (!force && currentDir === targetDir) {
- return;
- }
- FileList._setCurrentDir(targetDir, changeUrl);
- $('#fileList').trigger(
- jQuery.Event('changeDirectory', {
- dir: targetDir,
- previousDir: currentDir
- }
- ));
- this._selectedFiles = {};
- this._selectionSummary.clear();
- this.reload();
- },
- linkTo: function(dir) {
- return OC.linkTo('files', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
- },
-
- /**
- * Sets the current directory name and updates the breadcrumb.
- * @param targetDir directory to display
- * @param changeUrl true to also update the URL, false otherwise (default)
- */
- _setCurrentDir: function(targetDir, changeUrl) {
- var url,
- baseDir = OC.basename(targetDir);
+ urlSpec.y *= window.devicePixelRatio;
+ urlSpec.x *= window.devicePixelRatio;
+ urlSpec.forceIcon = 0;
+ return OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
+ },
+
+ /**
+ * Lazy load a file's preview.
+ *
+ * @param path path of the file
+ * @param mime mime type
+ * @param callback callback function to call when the image was loaded
+ * @param etag file etag (for caching)
+ */
+ lazyLoadPreview : function(options) {
+ var self = this;
+ var path = options.path;
+ var mime = options.mime;
+ var ready = options.callback;
+ var etag = options.etag;
+
+ // get mime icon url
+ OCA.Files.Files.getMimeIcon(mime, function(iconURL) {
+ var previewURL,
+ urlSpec = {};
+ ready(iconURL); // set mimeicon URL
+
+ urlSpec.file = OCA.Files.Files.fixPath(path);
+
+ if (etag){
+ // use etag as cache buster
+ urlSpec.c = etag;
+ }
+ else {
+ console.warn('OCA.Files.FileList.lazyLoadPreview(): missing etag argument');
+ }
- if (baseDir !== '') {
- FileList.setPageTitle(baseDir);
- }
- else {
- FileList.setPageTitle();
- }
+ previewURL = self.generatePreviewUrl(urlSpec);
+ previewURL = previewURL.replace('(', '%28');
+ previewURL = previewURL.replace(')', '%29');
+
+ // preload image to prevent delay
+ // this will make the browser cache the image
+ var img = new Image();
+ img.onload = function(){
+ // if loading the preview image failed (no preview for the mimetype) then img.width will < 5
+ if (img.width > 5) {
+ ready(previewURL);
+ }
+ };
+ img.src = previewURL;
+ });
+ },
- $('#dir').val(targetDir);
- if (changeUrl !== false) {
- if (window.history.pushState && changeUrl !== false) {
- url = FileList.linkTo(targetDir);
- window.history.pushState({dir: targetDir}, '', url);
+ setDirectoryPermissions: function(permissions) {
+ var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
+ this.$el.find('#permissions').val(permissions);
+ this.$el.find('.creatable').toggleClass('hidden', !isCreatable);
+ this.$el.find('.notCreatable').toggleClass('hidden', isCreatable);
+ },
+ /**
+ * Shows/hides action buttons
+ *
+ * @param show true for enabling, false for disabling
+ */
+ showActions: function(show){
+ this.$el.find('.actions,#file_action_panel').toggleClass('hidden', !show);
+ if (show){
+ // make sure to display according to permissions
+ var permissions = this.getDirectoryPermissions();
+ var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
+ this.$el.find('.creatable').toggleClass('hidden', !isCreatable);
+ this.$el.find('.notCreatable').toggleClass('hidden', isCreatable);
+ // remove old style breadcrumbs (some apps might create them)
+ this.$el.find('#controls .crumb').remove();
+ // refresh breadcrumbs in case it was replaced by an app
+ this.breadcrumb.render();
}
- // use URL hash for IE8
else{
- window.location.hash = '?dir='+ encodeURIComponent(targetDir).replace(/%2F/g, '/');
+ this.$el.find('.creatable, .notCreatable').addClass('hidden');
+ }
+ },
+ /**
+ * Enables/disables viewer mode.
+ * In viewer mode, apps can embed themselves under the controls bar.
+ * In viewer mode, the actions of the file list will be hidden.
+ * @param show true for enabling, false for disabling
+ */
+ setViewerMode: function(show){
+ this.showActions(!show);
+ this.$el.find('#filestable').toggleClass('hidden', show);
+ this.$el.trigger(new $.Event('changeViewerMode', {viewerModeEnabled: show}));
+ },
+ /**
+ * Removes a file entry from the list
+ * @param name name of the file to remove
+ * @param options optional options as map:
+ * "updateSummary": true to update the summary (default), false otherwise
+ * @return deleted element
+ */
+ remove: function(name, options){
+ options = options || {};
+ var fileEl = this.findFileEl(name);
+ var index = fileEl.index();
+ if (!fileEl.length) {
+ return null;
+ }
+ if (this._selectedFiles[fileEl.data('id')]) {
+ // remove from selection first
+ this._selectFileEl(fileEl, false);
+ this.updateSelectionSummary();
+ }
+ if (this._dragOptions && (fileEl.data('permissions') & OC.PERMISSION_DELETE)) {
+ // file is only draggable when delete permissions are set
+ fileEl.find('td.filename').draggable('destroy');
+ }
+ this.files.splice(index, 1);
+ fileEl.remove();
+ // TODO: improve performance on batch update
+ this.isEmpty = !this.files.length;
+ if (typeof(options.updateSummary) === 'undefined' || !!options.updateSummary) {
+ this.updateEmptyContent();
+ this.fileSummary.remove({type: fileEl.attr('data-type'), size: fileEl.attr('data-size')}, true);
}
- }
- this.breadcrumb.setDirectory(this.getCurrentDirectory());
- },
- /**
- * @brief Reloads the file list using ajax call
- */
- reload: function() {
- FileList.showMask();
- if (FileList._reloadCall) {
- FileList._reloadCall.abort();
- }
- FileList._reloadCall = $.ajax({
- url: Files.getAjaxUrl('list'),
- data: {
- dir : $('#dir').val()
- },
- error: function(result) {
- FileList.reloadCallback(result);
- },
- success: function(result) {
- FileList.reloadCallback(result);
- }
- });
- },
- reloadCallback: function(result) {
- delete this._reloadCall;
- this.hideMask();
-
- if (!result || result.status === 'error') {
- OC.Notification.show(result.data.message);
- return;
- }
- if (result.status === 404) {
- // go back home
- this.changeDirectory('/');
- return;
- }
- // aborted ?
- if (result.status === 0){
- return;
- }
+ var lastIndex = this.$fileList.children().length;
+ // if there are less elements visible than one page
+ // but there are still pending elements in the array,
+ // then directly append the next page
+ if (lastIndex < this.files.length && lastIndex < this.pageSize) {
+ this._nextPage(true);
+ }
- // TODO: should rather return upload file size through
- // the files list ajax call
- Files.updateStorageStatistics(true);
+ return fileEl;
+ },
+ /**
+ * Finds the index of the row before which the given
+ * fileData should be inserted, considering the current
+ * sorting
+ */
+ _findInsertionIndex: function(fileData) {
+ var index = 0;
+ while (index < this.files.length && this._sortComparator(fileData, this.files[index]) > 0) {
+ index++;
+ }
+ return index;
+ },
+ /**
+ * Moves a file to a given target folder.
+ *
+ * @param fileNames array of file names to move
+ * @param targetPath absolute target path
+ */
+ move: function(fileNames, targetPath) {
+ var self = this;
+ var dir = this.getCurrentDirectory();
+ var target = OC.basename(targetPath);
+ if (!_.isArray(fileNames)) {
+ fileNames = [fileNames];
+ }
+ _.each(fileNames, function(fileName) {
+ var $tr = self.findFileEl(fileName);
+ var $td = $tr.children('td.filename');
+ var oldBackgroundImage = $td.css('background-image');
+ $td.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
+ // TODO: improve performance by sending all file names in a single call
+ $.post(
+ OC.filePath('files', 'ajax', 'move.php'),
+ {
+ dir: dir,
+ file: fileName,
+ target: targetPath
+ },
+ function(result) {
+ if (result) {
+ if (result.status === 'success') {
+ // if still viewing the same directory
+ if (self.getCurrentDirectory() === dir) {
+ // recalculate folder size
+ var oldFile = self.findFileEl(target);
+ var newFile = self.findFileEl(fileName);
+ var oldSize = oldFile.data('size');
+ var newSize = oldSize + newFile.data('size');
+ oldFile.data('size', newSize);
+ oldFile.find('td.filesize').text(OC.Util.humanFileSize(newSize));
+
+ // TODO: also update entry in FileList.files
+
+ self.remove(fileName);
+ }
+ } else {
+ OC.Notification.hide();
+ if (result.status === 'error' && result.data.message) {
+ OC.Notification.show(result.data.message);
+ }
+ else {
+ OC.Notification.show(t('files', 'Error moving file.'));
+ }
+ // hide notification after 10 sec
+ setTimeout(function() {
+ OC.Notification.hide();
+ }, 10000);
+ }
+ } else {
+ OC.dialogs.alert(t('files', 'Error moving file'), t('files', 'Error'));
+ }
+ $td.css('background-image', oldBackgroundImage);
+ }
+ );
+ });
- if (result.data.permissions) {
- this.setDirectoryPermissions(result.data.permissions);
- }
+ },
+
+ /**
+ * Triggers file rename input field for the given file name.
+ * If the user enters a new name, the file will be renamed.
+ *
+ * @param oldname file name of the file to rename
+ */
+ rename: function(oldname) {
+ var self = this;
+ var tr, td, input, form;
+ tr = this.findFileEl(oldname);
+ var oldFileInfo = this.files[tr.index()];
+ tr.data('renaming',true);
+ td = tr.children('td.filename');
+ input = $('<input type="text" class="filename"/>').val(oldname);
+ form = $('<form></form>');
+ form.append(input);
+ td.children('a.name').hide();
+ td.append(form);
+ input.focus();
+ //preselect input
+ var len = input.val().lastIndexOf('.');
+ if ( len === -1 ||
+ tr.data('type') === 'dir' ) {
+ len = input.val().length;
+ }
+ input.selectRange(0, len);
+ var checkInput = function () {
+ var filename = input.val();
+ if (filename !== oldname) {
+ // Files.isFileNameValid(filename) throws an exception itself
+ OCA.Files.Files.isFileNameValid(filename);
+ if (self.inList(filename)) {
+ throw t('files', '{new_name} already exists', {new_name: filename});
+ }
+ }
+ return true;
+ };
- this.setFiles(result.data.files);
- },
- setDirectoryPermissions: function(permissions) {
- var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
- $('#permissions').val(permissions);
- $('.creatable').toggleClass('hidden', !isCreatable);
- $('.notCreatable').toggleClass('hidden', isCreatable);
- },
- /**
- * Shows/hides action buttons
- *
- * @param show true for enabling, false for disabling
- */
- showActions: function(show){
- $('.actions,#file_action_panel').toggleClass('hidden', !show);
- if (show){
- // make sure to display according to permissions
- var permissions = this.getDirectoryPermissions();
- var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
- $('.creatable').toggleClass('hidden', !isCreatable);
- $('.notCreatable').toggleClass('hidden', isCreatable);
- // remove old style breadcrumbs (some apps might create them)
- $('#controls .crumb').remove();
- // refresh breadcrumbs in case it was replaced by an app
- this.breadcrumb.render();
- }
- else{
- $('.creatable, .notCreatable').addClass('hidden');
- }
- },
- /**
- * Enables/disables viewer mode.
- * In viewer mode, apps can embed themselves under the controls bar.
- * In viewer mode, the actions of the file list will be hidden.
- * @param show true for enabling, false for disabling
- */
- setViewerMode: function(show){
- this.showActions(!show);
- $('#filestable').toggleClass('hidden', show);
- },
- /**
- * Removes a file entry from the list
- * @param name name of the file to remove
- * @param options optional options as map:
- * "updateSummary": true to update the summary (default), false otherwise
- * @return deleted element
- */
- remove: function(name, options){
- options = options || {};
- var fileEl = FileList.findFileEl(name);
- var index = fileEl.index();
- if (!fileEl.length) {
- return null;
- }
- if (this._selectedFiles[fileEl.data('id')]) {
- // remove from selection first
- this._selectFileEl(fileEl, false);
- this.updateSelectionSummary();
- }
- if (fileEl.data('permissions') & OC.PERMISSION_DELETE) {
- // file is only draggable when delete permissions are set
- fileEl.find('td.filename').draggable('destroy');
- }
- this.files.splice(index, 1);
- fileEl.remove();
- // TODO: improve performance on batch update
- FileList.isEmpty = !this.files.length;
- if (typeof(options.updateSummary) === 'undefined' || !!options.updateSummary) {
- FileList.updateEmptyContent();
- this.fileSummary.remove({type: fileEl.attr('data-type'), size: fileEl.attr('data-size')}, true);
- }
+ form.submit(function(event) {
+ event.stopPropagation();
+ event.preventDefault();
+ try {
+ var newName = input.val();
+ input.tipsy('hide');
+ form.remove();
+
+ if (newName !== oldname) {
+ checkInput();
+ // mark as loading (temp element)
+ td.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
+ tr.attr('data-file', newName);
+ var basename = newName;
+ if (newName.indexOf('.') > 0 && tr.data('type') !== 'dir') {
+ basename = newName.substr(0, newName.lastIndexOf('.'));
+ }
+ td.find('a.name span.nametext').text(basename);
+ td.children('a.name').show();
+ tr.find('.fileactions, .action').addClass('hidden');
+
+ $.ajax({
+ url: OC.filePath('files','ajax','rename.php'),
+ data: {
+ dir : self.getCurrentDirectory(),
+ newname: newName,
+ file: oldname
+ },
+ success: function(result) {
+ var fileInfo;
+ if (!result || result.status === 'error') {
+ OC.dialogs.alert(result.data.message, t('core', 'Could not rename file'));
+ fileInfo = oldFileInfo;
+ }
+ else {
+ fileInfo = result.data;
+ }
+ // reinsert row
+ self.files.splice(tr.index(), 1);
+ tr.remove();
+ self.add(fileInfo, {updateSummary: false, silent: true});
+ self.$fileList.trigger($.Event('fileActionsReady', {fileList: self}));
+ }
+ });
+ } else {
+ // add back the old file info when cancelled
+ self.files.splice(tr.index(), 1);
+ tr.remove();
+ self.add(oldFileInfo, {updateSummary: false, silent: true});
+ self.$fileList.trigger($.Event('fileActionsReady', {fileList: self}));
+ }
+ } catch (error) {
+ input.attr('title', error);
+ input.tipsy({gravity: 'w', trigger: 'manual'});
+ input.tipsy('show');
+ input.addClass('error');
+ }
+ return false;
+ });
+ input.keyup(function(event) {
+ // verify filename on typing
+ try {
+ checkInput();
+ input.tipsy('hide');
+ input.removeClass('error');
+ } catch (error) {
+ input.attr('title', error);
+ input.tipsy({gravity: 'w', trigger: 'manual'});
+ input.tipsy('show');
+ input.addClass('error');
+ }
+ if (event.keyCode === 27) {
+ input.tipsy('hide');
+ tr.data('renaming',false);
+ form.remove();
+ td.children('a.name').show();
+ }
+ });
+ input.click(function(event) {
+ event.stopPropagation();
+ event.preventDefault();
+ });
+ input.blur(function() {
+ form.trigger('submit');
+ });
+ },
+ inList:function(file) {
+ return this.findFileEl(file).length;
+ },
+ /**
+ * Delete the given files from the given dir
+ * @param files file names list (without path)
+ * @param dir directory in which to delete the files, defaults to the current
+ * directory
+ */
+ do_delete:function(files, dir) {
+ var self = this;
+ var params;
+ if (files && files.substr) {
+ files=[files];
+ }
+ if (files) {
+ for (var i=0; i<files.length; i++) {
+ var deleteAction = this.findFileEl(files[i]).children("td.date").children(".action.delete");
+ deleteAction.removeClass('delete-icon').addClass('progress-icon');
+ }
+ }
+ // Finish any existing actions
+ if (this.lastAction) {
+ this.lastAction();
+ }
- var lastIndex = this.$fileList.children().length;
- // if there are less elements visible than one page
- // but there are still pending elements in the array,
- // then directly append the next page
- if (lastIndex < this.files.length && lastIndex < this.pageSize) {
- this._nextPage(true);
- }
+ params = {
+ dir: dir || this.getCurrentDirectory()
+ };
+ if (files) {
+ params.files = JSON.stringify(files);
+ }
+ else {
+ // no files passed, delete all in current dir
+ params.allfiles = true;
+ // show spinner for all files
+ this.$fileList.find('tr>td.date .action.delete').removeClass('delete-icon').addClass('progress-icon');
+ }
- return fileEl;
- },
- /**
- * Finds the index of the row before which the given
- * fileData should be inserted, considering the current
- * sorting
- */
- _findInsertionIndex: function(fileData) {
- var index = 0;
- while (index < this.files.length && this._fileInfoCompare(fileData, this.files[index]) > 0) {
- index++;
- }
- return index;
- },
- /**
- * Moves a file to a given target folder.
- *
- * @param fileNames array of file names to move
- * @param targetPath absolute target path
- */
- move: function(fileNames, targetPath) {
- var self = this;
- var dir = this.getCurrentDirectory();
- var target = OC.basename(targetPath);
- if (!_.isArray(fileNames)) {
- fileNames = [fileNames];
- }
- _.each(fileNames, function(fileName) {
- var $tr = self.findFileEl(fileName);
- var $td = $tr.children('td.filename');
- var oldBackgroundImage = $td.css('background-image');
- $td.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
- // TODO: improve performance by sending all file names in a single call
- $.post(
- OC.filePath('files', 'ajax', 'move.php'),
- {
- dir: dir,
- file: fileName,
- target: targetPath
- },
- function(result) {
- if (result) {
+ $.post(OC.filePath('files', 'ajax', 'delete.php'),
+ params,
+ function(result) {
if (result.status === 'success') {
- // if still viewing the same directory
- if (self.getCurrentDirectory() === dir) {
- // recalculate folder size
- var oldFile = self.findFileEl(target);
- var newFile = self.findFileEl(fileName);
- var oldSize = oldFile.data('size');
- var newSize = oldSize + newFile.data('size');
- oldFile.data('size', newSize);
- oldFile.find('td.filesize').text(OC.Util.humanFileSize(newSize));
-
- // TODO: also update entry in FileList.files
-
- self.remove(fileName);
+ if (params.allfiles) {
+ self.setFiles([]);
+ }
+ else {
+ $.each(files,function(index,file) {
+ var fileEl = self.remove(file, {updateSummary: false});
+ // FIXME: not sure why we need this after the
+ // element isn't even in the DOM any more
+ fileEl.find('input[type="checkbox"]').prop('checked', false);
+ fileEl.removeClass('selected');
+ self.fileSummary.remove({type: fileEl.attr('data-type'), size: fileEl.attr('data-size')});
+ });
}
+ // TODO: this info should be returned by the ajax call!
+ self.updateEmptyContent();
+ self.fileSummary.update();
+ self.updateSelectionSummary();
+ self.updateStorageStatistics();
} else {
- OC.Notification.hide();
if (result.status === 'error' && result.data.message) {
OC.Notification.show(result.data.message);
}
else {
- OC.Notification.show(t('files', 'Error moving file.'));
+ OC.Notification.show(t('files', 'Error deleting file.'));
}
// hide notification after 10 sec
setTimeout(function() {
OC.Notification.hide();
}, 10000);
- }
- } else {
- OC.dialogs.alert(t('files', 'Error moving file'), t('files', 'Error'));
- }
- $td.css('background-image', oldBackgroundImage);
- });
- });
-
- },
-
- /**
- * Triggers file rename input field for the given file name.
- * If the user enters a new name, the file will be renamed.
- *
- * @param oldname file name of the file to rename
- */
- rename: function(oldname) {
- var tr, td, input, form;
- tr = FileList.findFileEl(oldname);
- var oldFileInfo = this.files[tr.index()];
- tr.data('renaming',true);
- td = tr.children('td.filename');
- input = $('<input type="text" class="filename"/>').val(oldname);
- form = $('<form></form>');
- form.append(input);
- td.children('a.name').hide();
- td.append(form);
- input.focus();
- //preselect input
- var len = input.val().lastIndexOf('.');
- if ( len === -1 ||
- tr.data('type') === 'dir' ) {
- len = input.val().length;
- }
- input.selectRange(0, len);
- var checkInput = function () {
- var filename = input.val();
- if (filename !== oldname) {
- // Files.isFileNameValid(filename) throws an exception itself
- Files.isFileNameValid(filename);
- if (FileList.inList(filename)) {
- throw t('files', '{new_name} already exists', {new_name: filename});
- }
- }
- return true;
- };
-
- form.submit(function(event) {
- event.stopPropagation();
- event.preventDefault();
- try {
- var newName = input.val();
- if (newName !== oldname) {
- checkInput();
- // mark as loading
- td.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
- $.ajax({
- url: OC.filePath('files','ajax','rename.php'),
- data: {
- dir : $('#dir').val(),
- newname: newName,
- file: oldname
- },
- success: function(result) {
- var fileInfo;
- if (!result || result.status === 'error') {
- OC.dialogs.alert(result.data.message, t('core', 'Could not rename file'));
- fileInfo = oldFileInfo;
+ if (params.allfiles) {
+ // reload the page as we don't know what files were deleted
+ // and which ones remain
+ self.reload();
}
else {
- fileInfo = result.data;
+ $.each(files,function(index,file) {
+ var deleteAction = self.findFileEl(file).find('.action.delete');
+ deleteAction.removeClass('progress-icon').addClass('delete-icon');
+ });
}
- // reinsert row
- FileList.files.splice(tr.index(), 1);
- tr.remove();
- FileList.add(fileInfo);
}
});
- }
- input.tipsy('hide');
- tr.data('renaming',false);
- tr.attr('data-file', newName);
- var path = td.children('a.name').attr('href');
- // FIXME this will fail if the path contains the filename.
- td.children('a.name').attr('href', path.replace(encodeURIComponent(oldname), encodeURIComponent(newName)));
- var basename = newName;
- if (newName.indexOf('.') > 0 && tr.data('type') !== 'dir') {
- basename = newName.substr(0, newName.lastIndexOf('.'));
- }
- td.find('a.name span.nametext').text(basename);
- if (newName.indexOf('.') > 0 && tr.data('type') !== 'dir') {
- if ( ! td.find('a.name span.extension').exists() ) {
- td.find('a.name span.nametext').append('<span class="extension"></span>');
- }
- td.find('a.name span.extension').text(newName.substr(newName.lastIndexOf('.')));
- }
- form.remove();
- FileActions.display( tr.find('td.filename'), true);
- td.children('a.name').show();
- } catch (error) {
- input.attr('title', error);
- input.tipsy({gravity: 'w', trigger: 'manual'});
- input.tipsy('show');
- input.addClass('error');
- }
- return false;
- });
- input.keyup(function(event) {
- // verify filename on typing
- try {
- checkInput();
- input.tipsy('hide');
- input.removeClass('error');
- } catch (error) {
- input.attr('title', error);
- input.tipsy({gravity: 'w', trigger: 'manual'});
- input.tipsy('show');
- input.addClass('error');
- }
- if (event.keyCode === 27) {
- input.tipsy('hide');
- tr.data('renaming',false);
- form.remove();
- td.children('a.name').show();
- }
- });
- input.click(function(event) {
- event.stopPropagation();
- event.preventDefault();
- });
- input.blur(function() {
- form.trigger('submit');
- });
- },
- inList:function(file) {
- return FileList.findFileEl(file).length;
- },
- /**
- * Delete the given files from the given dir
- * @param files file names list (without path)
- * @param dir directory in which to delete the files, defaults to the current
- * directory
- */
- do_delete:function(files, dir) {
- var params;
- if (files && files.substr) {
- files=[files];
- }
- if (files) {
- for (var i=0; i<files.length; i++) {
- var deleteAction = FileList.findFileEl(files[i]).children("td.date").children(".action.delete");
- deleteAction.removeClass('delete-icon').addClass('progress-icon');
+ },
+ /**
+ * Creates the file summary section
+ */
+ _createSummary: function() {
+ var $tr = $('<tr class="summary"></tr>');
+ this.$el.find('tfoot').append($tr);
+
+ return new OCA.Files.FileSummary($tr);
+ },
+ updateEmptyContent: function() {
+ var permissions = this.getDirectoryPermissions();
+ var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
+ this.$el.find('#emptycontent').toggleClass('hidden', !isCreatable || !this.isEmpty);
+ this.$el.find('#filestable thead th').toggleClass('hidden', this.isEmpty);
+ },
+ /**
+ * Shows the loading mask.
+ *
+ * @see #hideMask
+ */
+ showMask: function() {
+ // in case one was shown before
+ var $mask = this.$el.find('.mask');
+ if ($mask.exists()) {
+ return;
}
- }
- // Finish any existing actions
- if (FileList.lastAction) {
- FileList.lastAction();
- }
- params = {
- dir: dir || FileList.getCurrentDirectory()
- };
- if (files) {
- params.files = JSON.stringify(files);
- }
- else {
- // no files passed, delete all in current dir
- params.allfiles = true;
- // show spinner for all files
- this.$fileList.find('tr>td.date .action.delete').removeClass('delete-icon').addClass('progress-icon');
- }
-
- $.post(OC.filePath('files', 'ajax', 'delete.php'),
- params,
- function(result) {
- if (result.status === 'success') {
- if (params.allfiles) {
- FileList.setFiles([]);
- }
- else {
- $.each(files,function(index,file) {
- var fileEl = FileList.remove(file, {updateSummary: false});
- // FIXME: not sure why we need this after the
- // element isn't even in the DOM any more
- fileEl.find('input[type="checkbox"]').prop('checked', false);
- fileEl.removeClass('selected');
- FileList.fileSummary.remove({type: fileEl.attr('data-type'), size: fileEl.attr('data-size')});
- });
- }
- // TODO: this info should be returned by the ajax call!
- checkTrashStatus();
- FileList.updateEmptyContent();
- FileList.fileSummary.update();
- FileList.updateSelectionSummary();
- Files.updateStorageStatistics();
- } else {
- if (result.status === 'error' && result.data.message) {
- OC.Notification.show(result.data.message);
- }
- else {
- OC.Notification.show(t('files', 'Error deleting file.'));
- }
- // hide notification after 10 sec
- setTimeout(function() {
- OC.Notification.hide();
- }, 10000);
- if (params.allfiles) {
- // reload the page as we don't know what files were deleted
- // and which ones remain
- FileList.reload();
- }
- else {
- $.each(files,function(index,file) {
- var deleteAction = FileList.findFileEl(file).find('.action.delete');
- deleteAction.removeClass('progress-icon').addClass('delete-icon');
- });
- }
- }
+ this.$table.addClass('hidden');
+
+ $mask = $('<div class="mask transparent"></div>');
+
+ $mask.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
+ $mask.css('background-repeat', 'no-repeat');
+ this.$el.append($mask);
+
+ $mask.removeClass('transparent');
+ },
+ /**
+ * Hide the loading mask.
+ * @see #showMask
+ */
+ hideMask: function() {
+ this.$el.find('.mask').remove();
+ this.$table.removeClass('hidden');
+ },
+ scrollTo:function(file) {
+ //scroll to and highlight preselected file
+ var $scrollToRow = this.findFileEl(file);
+ if ($scrollToRow.exists()) {
+ $scrollToRow.addClass('searchresult');
+ $(window).scrollTop($scrollToRow.position().top);
+ //remove highlight when hovered over
+ $scrollToRow.one('hover', function() {
+ $scrollToRow.removeClass('searchresult');
});
- },
- /**
- * Creates the file summary section
- */
- _createSummary: function() {
- var $tr = $('<tr class="summary"></tr>');
- this.$el.find('tfoot').append($tr);
-
- return new FileSummary($tr);
- },
- updateEmptyContent: function() {
- var permissions = $('#permissions').val();
- var isCreatable = (permissions & OC.PERMISSION_CREATE) !== 0;
- $('#emptycontent').toggleClass('hidden', !isCreatable || !FileList.isEmpty);
- $('#filestable thead th').toggleClass('hidden', FileList.isEmpty);
- },
- /**
- * Shows the loading mask.
- *
- * @see #hideMask
- */
- showMask: function() {
- // in case one was shown before
- var $mask = $('#content .mask');
- if ($mask.exists()) {
- return;
- }
-
- this.$el.addClass('hidden');
-
- $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);
-
- $mask.removeClass('transparent');
- },
- /**
- * Hide the loading mask.
- * @see #showMask
- */
- hideMask: function() {
- $('#content .mask').remove();
- this.$el.removeClass('hidden');
- },
- scrollTo:function(file) {
- //scroll to and highlight preselected file
- var $scrollToRow = FileList.findFileEl(file);
- if ($scrollToRow.exists()) {
- $scrollToRow.addClass('searchresult');
- $(window).scrollTop($scrollToRow.position().top);
- //remove highlight when hovered over
- $scrollToRow.one('hover', function() {
- $scrollToRow.removeClass('searchresult');
+ }
+ },
+ filter:function(query) {
+ this.$fileList.find('tr').each(function(i,e) {
+ if ($(e).data('file').toString().toLowerCase().indexOf(query.toLowerCase()) !== -1) {
+ $(e).addClass("searchresult");
+ } else {
+ $(e).removeClass("searchresult");
+ }
});
- }
- },
- filter:function(query) {
- $('#fileList tr').each(function(i,e) {
- if ($(e).data('file').toString().toLowerCase().indexOf(query.toLowerCase()) !== -1) {
- $(e).addClass("searchresult");
- } else {
+ //do not use scrollto to prevent removing searchresult css class
+ var first = this.$fileList.find('tr.searchresult').first();
+ if (first.exists()) {
+ $(window).scrollTop(first.position().top);
+ }
+ },
+ unfilter:function() {
+ this.$fileList.find('tr.searchresult').each(function(i,e) {
$(e).removeClass("searchresult");
+ });
+ },
+ /**
+ * Update UI based on the current selection
+ */
+ updateSelectionSummary: function() {
+ var summary = this._selectionSummary.summary;
+ var canDelete;
+ if (summary.totalFiles === 0 && summary.totalDirs === 0) {
+ this.$el.find('#headerName a.name>span:first').text(t('files','Name'));
+ this.$el.find('#headerSize a>span:first').text(t('files','Size'));
+ this.$el.find('#modified a>span:first').text(t('files','Modified'));
+ this.$el.find('table').removeClass('multiselect');
+ this.$el.find('.selectedActions').addClass('hidden');
}
- });
- //do not use scrollto to prevent removing searchresult css class
- var first = $('#fileList tr.searchresult').first();
- if (first.exists()) {
- $(window).scrollTop(first.position().top);
- }
- },
- unfilter:function() {
- $('#fileList tr.searchresult').each(function(i,e) {
- $(e).removeClass("searchresult");
- });
- },
- /**
- * Update UI based on the current selection
- */
- updateSelectionSummary: function() {
- var summary = this._selectionSummary.summary;
- if (summary.totalFiles === 0 && summary.totalDirs === 0) {
- $('#headerName span.name').text(t('files','Name'));
- $('#headerSize').text(t('files','Size'));
- $('#modified').text(t('files','Modified'));
- $('table').removeClass('multiselect');
- $('.selectedActions').addClass('hidden');
- }
- else {
- $('.selectedActions').removeClass('hidden');
- $('#headerSize').text(OC.Util.humanFileSize(summary.totalSize));
- var selection = '';
- if (summary.totalDirs > 0) {
- selection += n('files', '%n folder', '%n folders', summary.totalDirs);
+ else {
+ canDelete = (this.getDirectoryPermissions() & OC.PERMISSION_DELETE);
+ this.$el.find('.selectedActions').removeClass('hidden');
+ this.$el.find('#headerSize a>span:first').text(OC.Util.humanFileSize(summary.totalSize));
+ var selection = '';
+ if (summary.totalDirs > 0) {
+ selection += n('files', '%n folder', '%n folders', summary.totalDirs);
+ if (summary.totalFiles > 0) {
+ selection += ' & ';
+ }
+ }
if (summary.totalFiles > 0) {
- selection += ' & ';
+ selection += n('files', '%n file', '%n files', summary.totalFiles);
}
+ this.$el.find('#headerName a.name>span:first').text(selection);
+ this.$el.find('#modified a>span:first').text('');
+ this.$el.find('table').addClass('multiselect');
+ this.$el.find('.delete-selected').toggleClass('hidden', !canDelete);
}
- if (summary.totalFiles > 0) {
- selection += n('files', '%n file', '%n files', summary.totalFiles);
+ },
+
+ /**
+ * Returns whether all files are selected
+ * @return true if all files are selected, false otherwise
+ */
+ isAllSelected: function() {
+ return this.$el.find('.select-all').prop('checked');
+ },
+
+ /**
+ * Returns the file info of the selected files
+ *
+ * @return array of file names
+ */
+ getSelectedFiles: function() {
+ return _.values(this._selectedFiles);
+ },
+
+ getUniqueName: function(name) {
+ if (this.findFileEl(name).exists()) {
+ var numMatch;
+ var parts=name.split('.');
+ var extension = "";
+ if (parts.length > 1) {
+ extension=parts.pop();
+ }
+ var base=parts.join('.');
+ numMatch=base.match(/\((\d+)\)/);
+ var num=2;
+ if (numMatch && numMatch.length>0) {
+ num=parseInt(numMatch[numMatch.length-1])+1;
+ base=base.split('(');
+ base.pop();
+ base=$.trim(base.join('('));
+ }
+ name=base+' ('+num+')';
+ if (extension) {
+ name = name+'.'+extension;
+ }
+ // FIXME: ugly recursion
+ return this.getUniqueName(name);
}
- $('#headerName span.name').text(selection);
- $('#modified').text('');
- $('table').addClass('multiselect');
- }
- },
+ return name;
+ },
- /**
- * Returns whether all files are selected
- * @return true if all files are selected, false otherwise
- */
- isAllSelected: function() {
- return this.$el.find('#select_all').prop('checked');
- },
+ /**
+ * Setup file upload events related to the file-upload plugin
+ */
+ setupUploadEvents: function() {
+ var self = this;
- /**
- * Returns the file info of the selected files
- *
- * @return array of file names
- */
- getSelectedFiles: function() {
- return _.values(this._selectedFiles);
- }
-};
+ // handle upload events
+ var fileUploadStart = this.$el.find('#file_upload_start');
-$(document).ready(function() {
- FileList.initialize();
+ fileUploadStart.on('fileuploaddrop', function(e, data) {
+ OC.Upload.log('filelist handle fileuploaddrop', e, data);
+
+ var dropTarget = $(e.originalEvent.target);
+ // check if dropped inside this container and not another one
+ if (dropTarget.length && !self.$el.is(dropTarget) && !self.$el.has(dropTarget).length) {
+ return false;
+ }
- // handle upload events
- var fileUploadStart = $('#file_upload_start');
+ // find the closest tr or crumb to use as target
+ dropTarget = dropTarget.closest('tr, .crumb');
- fileUploadStart.on('fileuploaddrop', function(e, data) {
- OC.Upload.log('filelist handle fileuploaddrop', e, data);
+ // if dropping on tr or crumb, drag&drop upload to folder
+ if (dropTarget && (dropTarget.data('type') === 'dir' ||
+ dropTarget.hasClass('crumb'))) {
- var dropTarget = $(e.originalEvent.target).closest('tr, .crumb');
- if (dropTarget && (dropTarget.data('type') === 'dir' || dropTarget.hasClass('crumb'))) { // drag&drop upload to folder
+ // remember as context
+ data.context = dropTarget;
- // remember as context
- data.context = dropTarget;
+ var dir = dropTarget.data('file');
+ // if from file list, need to prepend parent dir
+ if (dir) {
+ var parentDir = self.getCurrentDirectory();
+ if (parentDir[parentDir.length - 1] !== '/') {
+ parentDir += '/';
+ }
+ dir = parentDir + dir;
+ }
+ else{
+ // read full path from crumb
+ dir = dropTarget.data('dir') || '/';
+ }
- var dir = dropTarget.data('file');
- // if from file list, need to prepend parent dir
- if (dir) {
- var parentDir = $('#dir').val() || '/';
- if (parentDir[parentDir.length - 1] !== '/') {
- parentDir += '/';
+ // update folder in form
+ data.formData = function() {
+ return [
+ {name: 'dir', value: dir},
+ {name: 'requesttoken', value: oc_requesttoken},
+ {name: 'file_directory', value: data.files[0].relativePath}
+ ];
+ };
+ } else {
+ // we are dropping somewhere inside the file list, which will
+ // upload the file to the current directory
+
+ // cancel uploads to current dir if no permission
+ var isCreatable = (self.getDirectoryPermissions() & OC.PERMISSION_CREATE) !== 0;
+ if (!isCreatable) {
+ return false;
+ }
}
- dir = parentDir + dir;
- }
- else{
- // read full path from crumb
- dir = dropTarget.data('dir') || '/';
- }
+ });
+ fileUploadStart.on('fileuploadadd', function(e, data) {
+ OC.Upload.log('filelist handle fileuploadadd', e, data);
- // update folder in form
- data.formData = function(form) {
- return [
- {name: 'dir', value: dir},
- {name: 'requesttoken', value: oc_requesttoken},
- {name: 'file_directory', value: data.files[0].relativePath}
- ];
- };
- } else {
- // cancel uploads to current dir if no permission
- var isCreatable = (FileList.getDirectoryPermissions() & OC.PERMISSION_CREATE) !== 0;
- if (!isCreatable) {
- return false;
- }
- }
- });
- fileUploadStart.on('fileuploadadd', function(e, data) {
- OC.Upload.log('filelist handle fileuploadadd', e, data);
+ //finish delete if we are uploading a deleted file
+ if (self.deleteFiles && self.deleteFiles.indexOf(data.files[0].name)!==-1) {
+ self.finishDelete(null, true); //delete file before continuing
+ }
- //finish delete if we are uploading a deleted file
- if (FileList.deleteFiles && FileList.deleteFiles.indexOf(data.files[0].name)!==-1) {
- FileList.finishDelete(null, true); //delete file before continuing
- }
+ // add ui visualization to existing folder
+ if (data.context && data.context.data('type') === 'dir') {
+ // add to existing folder
+
+ // update upload counter ui
+ var uploadText = data.context.find('.uploadtext');
+ var currentUploads = parseInt(uploadText.attr('currentUploads'), 10);
+ currentUploads += 1;
+ uploadText.attr('currentUploads', currentUploads);
+
+ var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads);
+ if (currentUploads === 1) {
+ var img = OC.imagePath('core', 'loading.gif');
+ data.context.find('td.filename').attr('style','background-image:url('+img+')');
+ uploadText.text(translatedText);
+ uploadText.show();
+ } else {
+ uploadText.text(translatedText);
+ }
+ }
- // 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'), 10);
- currentUploads += 1;
- uploadText.attr('currentUploads', currentUploads);
-
- var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads);
- if (currentUploads === 1) {
- var img = OC.imagePath('core', 'loading.gif');
- data.context.find('td.filename').attr('style','background-image:url('+img+')');
- uploadText.text(translatedText);
- uploadText.show();
- } else {
- uploadText.text(translatedText);
- }
- }
+ });
+ /*
+ * when file upload done successfully add row to filelist
+ * update counter when uploading to sub folder
+ */
+ fileUploadStart.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);
+
+ if (typeof result[0] !== 'undefined' && result[0].status === 'success') {
+ var file = result[0];
+ var size = 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'), 10);
+ currentUploads -= 1;
+ uploadText.attr('currentUploads', currentUploads);
+ var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads);
+ if (currentUploads === 0) {
+ var img = OC.imagePath('core', 'filetypes/folder');
+ data.context.find('td.filename').attr('style','background-image:url('+img+')');
+ uploadText.text(translatedText);
+ uploadText.hide();
+ } else {
+ uploadText.text(translatedText);
+ }
- });
- /*
- * when file upload done successfully add row to filelist
- * update counter when uploading to sub folder
- */
- fileUploadStart.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);
+ // update folder size
+ size = parseInt(data.context.data('size'), 10);
+ size += parseInt(file.size, 10);
+ data.context.attr('data-size', size);
+ data.context.find('td.filesize').text(humanFileSize(size));
+ } else {
+ // only append new file if uploaded into the current folder
+ if (file.directory !== '/' && file.directory !== self.getCurrentDirectory()) {
+
+ var fileDirectory = file.directory.replace('/','').replace(/\/$/, "").split('/');
+
+ if (fileDirectory.length === 1) {
+ fileDirectory = fileDirectory[0];
+
+ // Get the directory
+ var fd = self.findFileEl(fileDirectory);
+ if (fd.length === 0) {
+ var dir = {
+ name: fileDirectory,
+ type: 'dir',
+ mimetype: 'httpd/unix-directory',
+ permissions: file.permissions,
+ size: 0,
+ id: file.parentId
+ };
+ self.add(dir, {insert: true});
+ }
+ } else {
+ fileDirectory = fileDirectory[0];
+ }
- if (typeof result[0] !== 'undefined' && result[0].status === 'success') {
- var file = result[0];
- var size = 0;
+ fileDirectory = self.findFileEl(fileDirectory);
- if (data.context && data.context.data('type') === 'dir') {
+ // update folder size
+ size = parseInt(fileDirectory.attr('data-size'), 10);
+ size += parseInt(file.size, 10);
+ fileDirectory.attr('data-size', size);
+ fileDirectory.find('td.filesize').text(humanFileSize(size));
- // update upload counter ui
- var uploadText = data.context.find('.uploadtext');
- var currentUploads = parseInt(uploadText.attr('currentUploads'), 10);
- currentUploads -= 1;
- uploadText.attr('currentUploads', currentUploads);
- var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads);
- if (currentUploads === 0) {
- var img = OC.imagePath('core', 'filetypes/folder');
- data.context.find('td.filename').attr('style','background-image:url('+img+')');
- uploadText.text(translatedText);
- uploadText.hide();
- } else {
- uploadText.text(translatedText);
- }
+ return;
+ }
- // update folder size
- size = parseInt(data.context.data('size'), 10);
- size += parseInt(file.size, 10);
- data.context.attr('data-size', size);
- data.context.find('td.filesize').text(humanFileSize(size));
- } else {
- // only append new file if uploaded into the current folder
- if (file.directory !== '/' && file.directory !== FileList.getCurrentDirectory()) {
-
- var fileDirectory = file.directory.replace('/','').replace(/\/$/, "").split('/');
-
- if (fileDirectory.length === 1) {
- fileDirectory = fileDirectory[0];
-
- // Get the directory
- var fd = FileList.findFileEl(fileDirectory);
- if (fd.length === 0) {
- var dir = {
- name: fileDirectory,
- type: 'dir',
- mimetype: 'httpd/unix-directory',
- permissions: file.permissions,
- size: 0,
- id: file.parentId
- };
- FileList.add(dir, {insert: true});
+ // add as stand-alone row to filelist
+ size = t('files', 'Pending');
+ if (data.files[0].size>=0) {
+ size=data.files[0].size;
}
- } else {
- fileDirectory = fileDirectory[0];
- }
-
- fileDirectory = FileList.findFileEl(fileDirectory);
+ //should the file exist in the list remove it
+ self.remove(file.name);
- // update folder size
- size = parseInt(fileDirectory.attr('data-size'), 10);
- size += parseInt(file.size, 10);
- fileDirectory.attr('data-size', size);
- fileDirectory.find('td.filesize').text(humanFileSize(size));
+ // create new file context
+ data.context = self.add(file, {animate: true});
+ }
+ }
+ });
+ fileUploadStart.on('fileuploadstop', function(e, data) {
+ OC.Upload.log('filelist handle fileuploadstop', e, data);
- return;
+ //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');
+ uploadText.parents('td.filename').attr('style','background-image:url('+img+')');
+ uploadText.fadeOut();
+ uploadText.attr('currentUploads', 0);
}
+ self.updateStorageStatistics();
+ });
+ fileUploadStart.on('fileuploadfail', function(e, data) {
+ OC.Upload.log('filelist handle fileuploadfail', e, data);
- // add as stand-alone row to filelist
- size = t('files', 'Pending');
- if (data.files[0].size>=0) {
- size=data.files[0].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');
+ uploadText.parents('td.filename').attr('style','background-image:url('+img+')');
+ uploadText.fadeOut();
+ uploadText.attr('currentUploads', 0);
}
- //should the file exist in the list remove it
- FileList.remove(file.name);
+ self.updateStorageStatistics();
+ });
- // create new file context
- data.context = FileList.add(file, {animate: true});
- }
}
- });
- fileUploadStart.on('fileuploadstop', function(e, data) {
- OC.Upload.log('filelist handle fileuploadstop', e, data);
-
- //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');
- uploadText.parents('td.filename').attr('style','background-image:url('+img+')');
- uploadText.fadeOut();
- uploadText.attr('currentUploads', 0);
- }
- });
- fileUploadStart.on('fileuploadfail', function(e, data) {
- 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 .uploadtext');
- var img = OC.imagePath('core', 'filetypes/folder');
- uploadText.parents('td.filename').attr('style','background-image:url('+img+')');
- uploadText.fadeOut();
- uploadText.attr('currentUploads', 0);
- }
- });
+ };
- $('#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'));
- });
- });
- $('#notification:first-child').on('click', '.suggest', function() {
- var file = $('#notification > span').attr('data-oldName');
- FileList.findFileEl(file).removeClass('hidden');
- OC.Notification.hide();
- });
- $('#notification:first-child').on('click', '.cancel', function() {
- if ($('#notification > span').attr('data-isNewFile')) {
- FileList.deleteCanceled = false;
- FileList.deleteFiles = [$('#notification > span').attr('data-oldName')];
+ /**
+ * Sort comparators.
+ */
+ FileList.Comparators = {
+ /**
+ * Compares two file infos by name, making directories appear
+ * first.
+ *
+ * @param fileInfo1 file info
+ * @param fileInfo2 file info
+ * @return -1 if the first file must appear before the second one,
+ * 0 if they are identify, 1 otherwise.
+ */
+ name: function(fileInfo1, fileInfo2) {
+ if (fileInfo1.type === 'dir' && fileInfo2.type !== 'dir') {
+ return -1;
+ }
+ if (fileInfo1.type !== 'dir' && fileInfo2.type === 'dir') {
+ return 1;
+ }
+ return fileInfo1.name.localeCompare(fileInfo2.name);
+ },
+ /**
+ * Compares two file infos by size.
+ *
+ * @param fileInfo1 file info
+ * @param fileInfo2 file info
+ * @return -1 if the first file must appear before the second one,
+ * 0 if they are identify, 1 otherwise.
+ */
+ size: function(fileInfo1, fileInfo2) {
+ return fileInfo1.size - fileInfo2.size;
+ },
+ /**
+ * Compares two file infos by timestamp.
+ *
+ * @param fileInfo1 file info
+ * @param fileInfo2 file info
+ * @return -1 if the first file must appear before the second one,
+ * 0 if they are identify, 1 otherwise.
+ */
+ mtime: function(fileInfo1, fileInfo2) {
+ return fileInfo1.mtime - fileInfo2.mtime;
}
- });
- FileList.useUndo=(window.onbeforeunload)?true:false;
+ };
+
+ OCA.Files.FileList = FileList;
+})();
+
+$(document).ready(function() {
+ // FIXME: unused ?
+ OCA.Files.FileList.useUndo = (window.onbeforeunload)?true:false;
$(window).bind('beforeunload', function () {
- if (FileList.lastAction) {
- FileList.lastAction();
+ if (OCA.Files.FileList.lastAction) {
+ OCA.Files.FileList.lastAction();
}
});
$(window).unload(function () {
$(window).trigger('beforeunload');
});
- function decodeQuery(query) {
- return query.replace(/\+/g, ' ');
- }
-
- function parseHashQuery() {
- var hash = window.location.hash,
- pos = hash.indexOf('?');
- if (pos >= 0) {
- return hash.substr(pos + 1);
- }
- return '';
- }
-
- function parseCurrentDirFromUrl() {
- var query = parseHashQuery(),
- params;
- // try and parse from URL hash first
- if (query) {
- params = OC.parseQueryString(decodeQuery(query));
- }
- // else read from query attributes
- if (!params) {
- params = OC.parseQueryString(decodeQuery(location.search));
- }
- return (params && params.dir) || '/';
- }
-
- // disable ajax/history API for public app (TODO: until it gets ported)
- // 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);
- }
- };
-
- $(window).scroll(function(e) {FileList._onScroll(e);});
-
- var dir = parseCurrentDirFromUrl();
- // trigger ajax load, deferred to let sub-apps do their overrides first
- setTimeout(function() {
- FileList.changeDirectory(dir, false, true);
- }, 0);
});
-
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 6d167851e64465249f0a3e23a1299e3da22c1cb4..4549de57f3f320c267bd299fd766b972a2bff76f 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -8,257 +8,300 @@
*
*/
-/* global OC, t, FileList */
/* global getURLParameter */
-var Files = {
- // file space size sync
- _updateStorageStatistics: function() {
- Files._updateStorageStatisticsTimeout = null;
- var currentDir = FileList.getCurrentDirectory(),
- state = Files.updateStorageStatistics;
- if (state.dir){
- if (state.dir === currentDir) {
+/**
+ * Utility class for file related operations
+ */
+(function() {
+ var Files = {
+ // file space size sync
+ _updateStorageStatistics: function(currentDir) {
+ var state = Files.updateStorageStatistics;
+ if (state.dir){
+ if (state.dir === currentDir) {
+ return;
+ }
+ // cancel previous call, as it was for another dir
+ state.call.abort();
+ }
+ state.dir = currentDir;
+ state.call = $.getJSON(OC.filePath('files','ajax','getstoragestats.php') + '?dir=' + encodeURIComponent(currentDir),function(response) {
+ state.dir = null;
+ state.call = null;
+ Files.updateMaxUploadFilesize(response);
+ });
+ },
+ /**
+ * Update storage statistics such as free space, max upload,
+ * etc based on the given directory.
+ *
+ * Note this function is debounced to avoid making too
+ * many ajax calls in a row.
+ *
+ * @param dir directory
+ * @param force whether to force retrieving
+ */
+ updateStorageStatistics: function(dir, force) {
+ if (!OC.currentUser) {
return;
}
- // cancel previous call, as it was for another dir
- state.call.abort();
- }
- state.dir = currentDir;
- state.call = $.getJSON(OC.filePath('files','ajax','getstoragestats.php') + '?dir=' + encodeURIComponent(currentDir),function(response) {
- state.dir = null;
- state.call = null;
- Files.updateMaxUploadFilesize(response);
- });
- },
- updateStorageStatistics: function(force) {
- if (!OC.currentUser) {
- return;
- }
- // debounce to prevent calling too often
- if (Files._updateStorageStatisticsTimeout) {
- clearTimeout(Files._updateStorageStatisticsTimeout);
- }
- if (force) {
- Files._updateStorageStatistics();
- }
- else {
- Files._updateStorageStatisticsTimeout = setTimeout(Files._updateStorageStatistics, 250);
- }
- },
-
- updateMaxUploadFilesize:function(response) {
- if (response === undefined) {
- return;
- }
- if (response.data !== undefined && response.data.uploadMaxFilesize !== undefined) {
- $('#max_upload').val(response.data.uploadMaxFilesize);
- $('#free_space').val(response.data.freeSpace);
- $('#upload.button').attr('original-title', response.data.maxHumanFilesize);
- $('#usedSpacePercent').val(response.data.usedSpacePercent);
- Files.displayStorageWarnings();
- }
- if (response[0] === undefined) {
- return;
- }
- if (response[0].uploadMaxFilesize !== undefined) {
- $('#max_upload').val(response[0].uploadMaxFilesize);
- $('#upload.button').attr('original-title', response[0].maxHumanFilesize);
- $('#usedSpacePercent').val(response[0].usedSpacePercent);
- Files.displayStorageWarnings();
- }
-
- },
-
- /**
- * Fix path name by removing double slash at the beginning, if any
- */
- fixPath: function(fileName) {
- if (fileName.substr(0, 2) == '//') {
- return fileName.substr(1);
- }
- return fileName;
- },
-
- /**
- * Checks whether the given file name is valid.
- * @param name file name to check
- * @return true if the file name is valid.
- * Throws a string exception with an error message if
- * the file name is not valid
- */
- isFileNameValid: function (name) {
- var trimmedName = name.trim();
- if (trimmedName === '.' || trimmedName === '..')
- {
- throw t('files', '"{name}" is an invalid file name.', {name: name});
- } else if (trimmedName.length === 0) {
- throw t('files', 'File name cannot be empty.');
- }
- // check for invalid characters
- var invalidCharacters =
- ['\\', '/', '<', '>', ':', '"', '|', '?', '*', '\n'];
- for (var i = 0; i < invalidCharacters.length; i++) {
- if (trimmedName.indexOf(invalidCharacters[i]) !== -1) {
- throw t('files', "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.");
+ if (force) {
+ Files._updateStorageStatistics(dir);
}
- }
- return true;
- },
- displayStorageWarnings: function() {
- if (!OC.Notification.isHidden()) {
- return;
- }
-
- var usedSpacePercent = $('#usedSpacePercent').val();
- if (usedSpacePercent > 98) {
- OC.Notification.show(t('files', 'Your storage is full, files can not be updated or synced anymore!'));
- return;
- }
- if (usedSpacePercent > 90) {
- OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%)',
- {usedSpacePercent: usedSpacePercent}));
- }
- },
-
- displayEncryptionWarning: function() {
-
- if (!OC.Notification.isHidden()) {
- return;
- }
+ else {
+ Files._updateStorageStatisticsDebounced(dir);
+ }
+ },
- var encryptedFiles = $('#encryptedFiles').val();
- var initStatus = $('#encryptionInitStatus').val();
- if (initStatus === '0') { // enc not initialized, but should be
- OC.Notification.show(t('files', 'Encryption App is enabled but your keys are not initialized, please log-out and log-in again'));
- return;
- }
- if (initStatus === '1') { // encryption tried to init but failed
- OC.Notification.show(t('files', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.'));
- return;
- }
- if (encryptedFiles === '1') {
- OC.Notification.show(t('files', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.'));
- return;
- }
- },
+ updateMaxUploadFilesize:function(response) {
+ if (response === undefined) {
+ return;
+ }
+ if (response.data !== undefined && response.data.uploadMaxFilesize !== undefined) {
+ $('#max_upload').val(response.data.uploadMaxFilesize);
+ $('#free_space').val(response.data.freeSpace);
+ $('#upload.button').attr('original-title', response.data.maxHumanFilesize);
+ $('#usedSpacePercent').val(response.data.usedSpacePercent);
+ Files.displayStorageWarnings();
+ }
+ if (response[0] === undefined) {
+ return;
+ }
+ if (response[0].uploadMaxFilesize !== undefined) {
+ $('#max_upload').val(response[0].uploadMaxFilesize);
+ $('#upload.button').attr('original-title', response[0].maxHumanFilesize);
+ $('#usedSpacePercent').val(response[0].usedSpacePercent);
+ Files.displayStorageWarnings();
+ }
- // TODO: move to FileList class
- 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);
+ /**
+ * Fix path name by removing double slash at the beginning, if any
+ */
+ fixPath: function(fileName) {
+ if (fileName.substr(0, 2) == '//') {
+ return fileName.substr(1);
}
- });
-
- $fileList.find('tr[data-type="dir"] td.filename').each(function(i,e) {
- if ($(e).parent().data('permissions') & OC.PERMISSION_CREATE) {
- $(e).droppable(folderDropOptions);
+ return fileName;
+ },
+
+ /**
+ * Checks whether the given file name is valid.
+ * @param name file name to check
+ * @return true if the file name is valid.
+ * Throws a string exception with an error message if
+ * the file name is not valid
+ */
+ isFileNameValid: function (name) {
+ var trimmedName = name.trim();
+ if (trimmedName === '.' || trimmedName === '..')
+ {
+ throw t('files', '"{name}" is an invalid file name.', {name: name});
+ } else if (trimmedName.length === 0) {
+ throw t('files', 'File name cannot be empty.');
+ }
+ // check for invalid characters
+ var invalidCharacters =
+ ['\\', '/', '<', '>', ':', '"', '|', '?', '*', '\n'];
+ for (var i = 0; i < invalidCharacters.length; i++) {
+ if (trimmedName.indexOf(invalidCharacters[i]) !== -1) {
+ throw t('files', "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.");
+ }
+ }
+ return true;
+ },
+ displayStorageWarnings: function() {
+ if (!OC.Notification.isHidden()) {
+ return;
}
- });
- },
-
- /**
- * Returns the download URL of the given file(s)
- * @param filename string or array of file names to download
- * @param dir optional directory in which the file name is, defaults to the current directory
- */
- getDownloadUrl: function(filename, dir) {
- if ($.isArray(filename)) {
- filename = JSON.stringify(filename);
- }
- var params = {
- dir: dir || FileList.getCurrentDirectory(),
- files: filename
- };
- return this.getAjaxUrl('download', params);
- },
- /**
- * Returns the ajax URL for a given action
- * @param action action string
- * @param params optional params map
- */
- getAjaxUrl: function(action, params) {
- var q = '';
- if (params) {
- q = '?' + OC.buildQueryString(params);
- }
- return OC.filePath('files', 'ajax', action + '.php') + q;
- }
-};
-$(document).ready(function() {
- // FIXME: workaround for trashbin app
- if (window.trashBinApp) {
- return;
- }
- Files.displayEncryptionWarning();
- Files.bindKeyboardShortcuts(document, jQuery);
+ var usedSpacePercent = $('#usedSpacePercent').val();
+ if (usedSpacePercent > 98) {
+ OC.Notification.show(t('files', 'Your storage is full, files can not be updated or synced anymore!'));
+ return;
+ }
+ if (usedSpacePercent > 90) {
+ OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%)',
+ {usedSpacePercent: usedSpacePercent}));
+ }
+ },
- Files.setupDragAndDrop();
+ displayEncryptionWarning: function() {
- $('#file_action_panel').attr('activeAction', false);
+ if (!OC.Notification.isHidden()) {
+ return;
+ }
- // Triggers invisible file input
- $('#upload a').on('click', function() {
- $(this).parent().children('#file_upload_start').trigger('click');
- return false;
- });
+ var encryptedFiles = $('#encryptedFiles').val();
+ var initStatus = $('#encryptionInitStatus').val();
+ if (initStatus === '0') { // enc not initialized, but should be
+ OC.Notification.show(t('files', 'Encryption App is enabled but your keys are not initialized, please log-out and log-in again'));
+ return;
+ }
+ if (initStatus === '1') { // encryption tried to init but failed
+ OC.Notification.show(t('files', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.'));
+ return;
+ }
+ if (encryptedFiles === '1') {
+ OC.Notification.show(t('files', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.'));
+ return;
+ }
+ },
+
+ /**
+ * Returns the download URL of the given file(s)
+ * @param filename string or array of file names to download
+ * @param dir optional directory in which the file name is, defaults to the current directory
+ */
+ getDownloadUrl: function(filename, dir) {
+ if ($.isArray(filename)) {
+ filename = JSON.stringify(filename);
+ }
+ var params = {
+ dir: dir,
+ files: filename
+ };
+ return this.getAjaxUrl('download', params);
+ },
+
+ /**
+ * Returns the ajax URL for a given action
+ * @param action action string
+ * @param params optional params map
+ */
+ getAjaxUrl: function(action, params) {
+ var q = '';
+ if (params) {
+ q = '?' + OC.buildQueryString(params);
+ }
+ return OC.filePath('files', 'ajax', action + '.php') + q;
+ },
+
+ getMimeIcon: function(mime, ready) {
+ if (Files.getMimeIcon.cache[mime]) {
+ ready(Files.getMimeIcon.cache[mime]);
+ } else {
+ $.get( OC.filePath('files','ajax','mimeicon.php'), {mime: mime}, function(path) {
+ if(OC.Util.hasSVGSupport()){
+ path = path.substr(0, path.length-4) + '.svg';
+ }
+ Files.getMimeIcon.cache[mime]=path;
+ ready(Files.getMimeIcon.cache[mime]);
+ });
+ }
+ },
+
+ /**
+ * Generates a preview URL based on the URL space.
+ * @param urlSpec map with {x: width, y: height, file: file path}
+ * @return preview URL
+ * @deprecated used OCA.Files.FileList.generatePreviewUrl instead
+ */
+ generatePreviewUrl: function(urlSpec) {
+ console.warn('DEPRECATED: please use generatePreviewUrl() from an OCA.Files.FileList instance');
+ return OCA.Files.App.fileList.generatePreviewUrl(urlSpec);
+ },
+
+ /**
+ * Lazy load preview
+ * @deprecated used OCA.Files.FileList.lazyLoadPreview instead
+ */
+ lazyLoadPreview : function(path, mime, ready, width, height, etag) {
+ console.warn('DEPRECATED: please use lazyLoadPreview() from an OCA.Files.FileList instance');
+ return OCA.Files.App.fileList.lazyLoadPreview({
+ path: path,
+ mime: mime,
+ callback: ready,
+ width: width,
+ height: height,
+ etag: etag
+ });
+ },
+
+ /**
+ * Initialize the files view
+ */
+ initialize: function() {
+ Files.getMimeIcon.cache = {};
+ Files.displayEncryptionWarning();
+ Files.bindKeyboardShortcuts(document, $);
+
+ // TODO: move file list related code (upload) to OCA.Files.FileList
+ $('#file_action_panel').attr('activeAction', false);
+
+ // Triggers invisible file input
+ $('#upload a').on('click', function() {
+ $(this).parent().children('#file_upload_start').trigger('click');
+ return false;
+ });
- // Trigger cancelling of file upload
- $('#uploadprogresswrapper .stop').on('click', function() {
- OC.Upload.cancelUploads();
- FileList.updateSelectionSummary();
- });
+ // Trigger cancelling of file upload
+ $('#uploadprogresswrapper .stop').on('click', function() {
+ OC.Upload.cancelUploads();
+ });
- // Show trash bin
- $('#trash').on('click', function() {
- window.location=OC.filePath('files_trashbin', '', 'index.php');
- });
+ // drag&drop support using jquery.fileupload
+ // TODO use OC.dialogs
+ $(document).bind('drop dragover', function (e) {
+ e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
+ });
+
+ //do a background scan if needed
+ scanFiles();
+
+ // display storage warnings
+ setTimeout(Files.displayStorageWarnings, 100);
+ OC.Notification.setDefault(Files.displayStorageWarnings);
+
+ // only possible at the moment if user is logged in or the files app is loaded
+ if (OC.currentUser && OCA.Files.App) {
+ // start on load - we ask the server every 5 minutes
+ var func = _.bind(OCA.Files.App.fileList.updateStorageStatistics, OCA.Files.App.fileList);
+ var updateStorageStatisticsInterval = 5*60*1000;
+ var updateStorageStatisticsIntervalId = setInterval(func, updateStorageStatisticsInterval);
+
+ // TODO: this should also stop when switching to another view
+ // Use jquery-visibility to de-/re-activate file stats sync
+ if ($.support.pageVisibility) {
+ $(document).on({
+ 'show.visibility': function() {
+ if (!updateStorageStatisticsIntervalId) {
+ updateStorageStatisticsIntervalId = setInterval(func, updateStorageStatisticsInterval);
+ }
+ },
+ 'hide.visibility': function() {
+ clearInterval(updateStorageStatisticsIntervalId);
+ updateStorageStatisticsIntervalId = 0;
+ }
+ });
+ }
+ }
- // drag&drop support using jquery.fileupload
- // TODO use OC.dialogs
- $(document).bind('drop dragover', function (e) {
- e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
- });
-
- //do a background scan if needed
- scanFiles();
-
- // display storage warnings
- setTimeout(Files.displayStorageWarnings, 100);
- OC.Notification.setDefault(Files.displayStorageWarnings);
-
- // only possible at the moment if user is logged in
- if (OC.currentUser) {
- // start on load - we ask the server every 5 minutes
- var updateStorageStatisticsInterval = 5*60*1000;
- var updateStorageStatisticsIntervalId = setInterval(Files.updateStorageStatistics, updateStorageStatisticsInterval);
-
- // Use jquery-visibility to de-/re-activate file stats sync
- if ($.support.pageVisibility) {
- $(document).on({
- 'show.visibility': function() {
- if (!updateStorageStatisticsIntervalId) {
- updateStorageStatisticsIntervalId = setInterval(Files.updateStorageStatistics, updateStorageStatisticsInterval);
- }
- },
- 'hide.visibility': function() {
- clearInterval(updateStorageStatisticsIntervalId);
- updateStorageStatisticsIntervalId = 0;
+ $('#app-settings-header').on('click', function() {
+ var $settings = $('#app-settings');
+ $settings.toggleClass('opened');
+ if ($settings.hasClass('opened')) {
+ $settings.find('input').focus();
}
});
+ $('#webdavurl').on('click', function () {
+ $('#webdavurl').select();
+ });
+
+ //scroll to and highlight preselected file
+ /*
+ if (getURLParameter('scrollto')) {
+ FileList.scrollTo(getURLParameter('scrollto'));
+ }
+ */
}
}
- //scroll to and highlight preselected file
- if (getURLParameter('scrollto')) {
- FileList.scrollTo(getURLParameter('scrollto'));
- }
-});
+ Files._updateStorageStatisticsDebounced = _.debounce(Files._updateStorageStatistics, 250);
+ OCA.Files.Files = Files;
+})();
function scanFiles(force, dir, users) {
if (!OC.currentUser) {
@@ -292,7 +335,9 @@ function scanFiles(force, dir, users) {
scannerEventSource.listen('done',function(count) {
scanFiles.scanning=false;
console.log('done after ' + count + ' files');
- Files.updateStorageStatistics();
+ if (OCA.Files.App) {
+ OCA.Files.App.fileList.updateStorageStatistics(true);
+ }
});
scannerEventSource.listen('user',function(user) {
console.log('scanning files for ' + user);
@@ -303,6 +348,7 @@ scanFiles.scanning=false;
// TODO: move to FileList
var createDragShadow = function(event) {
//select dragged file
+ var FileList = OCA.Files.App.fileList;
var isDragSelected = $(event.target).parents('tr').find('td input:first').prop('checked');
if (!isDragSelected) {
//select dragged file
@@ -311,7 +357,7 @@ var createDragShadow = function(event) {
// do not show drag shadow for too many files
var selectedFiles = _.first(FileList.getSelectedFiles(), FileList.pageSize);
- selectedFiles.sort(FileList._fileInfoCompare);
+ selectedFiles = _.sortBy(selectedFiles, FileList._fileInfoCompare);
if (!isDragSelected && selectedFiles.length === 1) {
//revert the selection
@@ -323,7 +369,7 @@ var createDragShadow = function(event) {
var tbody = $('<tbody></tbody>');
dragshadow.append(tbody);
- var dir=$('#dir').val();
+ var dir = FileList.getCurrentDirectory();
$(selectedFiles).each(function(i,elem) {
var newtr = $('<tr/>')
@@ -336,8 +382,8 @@ var createDragShadow = function(event) {
if (elem.type === 'dir') {
newtr.find('td.filename').attr('style','background-image:url('+OC.imagePath('core', 'filetypes/folder.png')+')');
} else {
- var path = getPathForPreview(elem.name);
- Files.lazyLoadPreview(path, elem.mime, function(previewpath) {
+ var path = dir + '/' + elem.name;
+ OCA.Files.App.files.lazyLoadPreview(path, elem.mime, function(previewpath) {
newtr.find('td.filename').attr('style','background-image:url('+previewpath+')');
}, null, null, elem.etag);
}
@@ -350,9 +396,14 @@ var createDragShadow = function(event) {
//start&stop handlers needs some cleaning up
// TODO: move to FileList class
var dragOptions={
- revert: 'invalid', revertDuration: 300,
- opacity: 0.7, zIndex: 100, appendTo: 'body', cursorAt: { left: 24, top: 18 },
- helper: createDragShadow, cursor: 'move',
+ revert: 'invalid',
+ revertDuration: 300,
+ opacity: 0.7,
+ zIndex: 100,
+ appendTo: 'body',
+ cursorAt: { left: 24, top: 18 },
+ helper: createDragShadow,
+ cursor: 'move',
start: function(event, ui){
var $selectedFiles = $('td.filename input:checkbox:checked');
if($selectedFiles.length > 1){
@@ -383,6 +434,7 @@ var folderDropOptions = {
hoverClass: "canDrop",
drop: function( event, ui ) {
// don't allow moving a file into a selected folder
+ var FileList = OCA.Files.App.fileList;
if ($(event.target).parents('tr').find('td input:first').prop('checked') === true) {
return false;
}
@@ -400,115 +452,11 @@ var folderDropOptions = {
tolerance: 'pointer'
};
-Files.getMimeIcon = function(mime, ready) {
- if (Files.getMimeIcon.cache[mime]) {
- ready(Files.getMimeIcon.cache[mime]);
- } else {
- $.get( OC.filePath('files','ajax','mimeicon.php'), {mime: mime}, function(path) {
- if(OC.Util.hasSVGSupport()){
- path = path.substr(0, path.length-4) + '.svg';
- }
- Files.getMimeIcon.cache[mime]=path;
- ready(Files.getMimeIcon.cache[mime]);
- });
- }
-}
-Files.getMimeIcon.cache={};
-
-function getPathForPreview(name) {
- var path = $('#dir').val() + '/' + name;
- return path;
-}
-
-/**
- * Generates a preview URL based on the URL space.
- * @param urlSpec map with {x: width, y: height, file: file path}
- * @return preview URL
- */
-Files.generatePreviewUrl = function(urlSpec) {
- urlSpec = urlSpec || {};
- if (!urlSpec.x) {
- urlSpec.x = $('#filestable').data('preview-x');
- }
- if (!urlSpec.y) {
- urlSpec.y = $('#filestable').data('preview-y');
- }
- urlSpec.y *= window.devicePixelRatio;
- urlSpec.x *= window.devicePixelRatio;
- urlSpec.forceIcon = 0;
- return OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
-};
-
-Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
- // get mime icon url
- Files.getMimeIcon(mime, function(iconURL) {
- var previewURL,
- urlSpec = {};
- ready(iconURL); // set mimeicon URL
-
- urlSpec.file = Files.fixPath(path);
-
- if (etag){
- // use etag as cache buster
- urlSpec.c = etag;
- }
- else {
- console.warn('Files.lazyLoadPreview(): missing etag argument');
- }
-
- previewURL = Files.generatePreviewUrl(urlSpec);
- previewURL = previewURL.replace('(', '%28');
- previewURL = previewURL.replace(')', '%29');
-
- // preload image to prevent delay
- // this will make the browser cache the image
- var img = new Image();
- img.onload = function(){
- // if loading the preview image failed (no preview for the mimetype) then img.width will < 5
- if (img.width > 5) {
- ready(previewURL);
- }
- };
- img.src = previewURL;
- });
-};
-
-function getUniqueName(name) {
- if (FileList.findFileEl(name).exists()) {
- var numMatch;
- var parts=name.split('.');
- var extension = "";
- if (parts.length > 1) {
- extension=parts.pop();
- }
- var base=parts.join('.');
- numMatch=base.match(/\((\d+)\)/);
- var num=2;
- if (numMatch && numMatch.length>0) {
- num=parseInt(numMatch[numMatch.length-1])+1;
- base=base.split('(');
- base.pop();
- base=$.trim(base.join('('));
- }
- name=base+' ('+num+')';
- if (extension) {
- name = name+'.'+extension;
- }
- return getUniqueName(name);
- }
- return name;
-}
-
-function checkTrashStatus() {
- $.post(OC.filePath('files_trashbin', 'ajax', 'isEmpty.php'), function(result) {
- if (result.data.isEmpty === false) {
- $("input[type=button][id=trash]").removeAttr("disabled");
- }
- });
-}
-
// override core's fileDownloadPath (legacy)
function fileDownloadPath(dir, file) {
- return Files.getDownloadUrl(file, dir);
+ return OCA.Files.Files.getDownloadUrl(file, dir);
}
+// for backward compatibility
+window.Files = OCA.Files.Files;
+
diff --git a/apps/files/js/filesummary.js b/apps/files/js/filesummary.js
index b5130247cc99911f068fe1a952b7f72fd738b29a..104dabf1b04ec5e533ee08b30e8a7884a54f8387 100644
--- a/apps/files/js/filesummary.js
+++ b/apps/files/js/filesummary.js
@@ -190,6 +190,6 @@
this.$el.append($summary);
}
};
- window.FileSummary = FileSummary;
+ OCA.Files.FileSummary = FileSummary;
})();
diff --git a/apps/files/js/keyboardshortcuts.js b/apps/files/js/keyboardshortcuts.js
index 9d6c3ae8c3308ddeeb7774ca000aaf95f8886ef3..b2f2cd0e5828ad9b6ea861c0ebd6eaf7d317eaf2 100644
--- a/apps/files/js/keyboardshortcuts.js
+++ b/apps/files/js/keyboardshortcuts.js
@@ -12,7 +12,6 @@
* enter: open file/folder
* delete/backspace: delete file/folder
*****************************/
-var Files = Files || {};
(function(Files) {
var keys = [];
var keyCodes = {
@@ -167,4 +166,4 @@ var Files = Files || {};
removeA(keys, event.keyCode);
});
};
-})(Files);
+})((OCA.Files && OCA.Files.Files) || {});
diff --git a/apps/files/js/navigation.js b/apps/files/js/navigation.js
new file mode 100644
index 0000000000000000000000000000000000000000..c58a284e83fe01eb36ff1fcea06427e6788df1e5
--- /dev/null
+++ b/apps/files/js/navigation.js
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2014
+ *
+ * @author Vincent Petry
+ * @copyright 2014 Vincent Petry <pvince81@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+
+ var Navigation = function($el) {
+ this.initialize($el);
+ };
+
+ Navigation.prototype = {
+
+ /**
+ * Currently selected item in the list
+ */
+ _activeItem: null,
+
+ /**
+ * Currently selected container
+ */
+ $currentContent: null,
+
+ /**
+ * Initializes the navigation from the given container
+ * @param $el element containing the navigation
+ */
+ initialize: function($el) {
+ this.$el = $el;
+ this._activeItem = null;
+ this.$currentContent = null;
+ this._setupEvents();
+ },
+
+ /**
+ * Setup UI events
+ */
+ _setupEvents: function() {
+ this.$el.on('click', 'li a', _.bind(this._onClickItem, this));
+ },
+
+ /**
+ * Returns the container of the currently active app.
+ *
+ * @return app container
+ */
+ getActiveContainer: function() {
+ return this.$currentContent;
+ },
+
+ /**
+ * Returns the currently active item
+ *
+ * @return item ID
+ */
+ getActiveItem: function() {
+ return this._activeItem;
+ },
+
+ /**
+ * Switch the currently selected item, mark it as selected and
+ * make the content container visible, if any.
+ *
+ * @param string itemId id of the navigation item to select
+ * @param array options "silent" to not trigger event
+ */
+ setActiveItem: function(itemId, options) {
+ var oldItemId = this._activeItem;
+ if (itemId === this._activeItem) {
+ if (!options || !options.silent) {
+ this.$el.trigger(
+ new $.Event('itemChanged', {itemId: itemId, previousItemId: oldItemId})
+ );
+ }
+ return;
+ }
+ this.$el.find('li').removeClass('selected');
+ if (this.$currentContent) {
+ this.$currentContent.addClass('hidden');
+ this.$currentContent.trigger(jQuery.Event('hide'));
+ }
+ this._activeItem = itemId;
+ this.$el.find('li[data-id=' + itemId + ']').addClass('selected');
+ this.$currentContent = $('#app-content-' + itemId);
+ this.$currentContent.removeClass('hidden');
+ if (!options || !options.silent) {
+ this.$currentContent.trigger(jQuery.Event('show'));
+ this.$el.trigger(
+ new $.Event('itemChanged', {itemId: itemId, previousItemId: oldItemId})
+ );
+ }
+ },
+
+ /**
+ * Returns whether a given item exists
+ */
+ itemExists: function(itemId) {
+ return this.$el.find('li[data-id=' + itemId + ']').length;
+ },
+
+ /**
+ * Event handler for when clicking on an item.
+ */
+ _onClickItem: function(ev) {
+ var $target = $(ev.target);
+ var itemId = $target.closest('li').attr('data-id');
+ this.setActiveItem(itemId);
+ return false;
+ }
+ };
+
+ OCA.Files.Navigation = Navigation;
+
+})();
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index 6779141c5eece747e39125b5bf96c651d057d87b..72effe3e207c396ddbdd5384bbf04b443f8a7aa8 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -52,19 +52,19 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 = غير Ù…Øدود",
"Maximum input size for ZIP files" => "الØد الأقصى Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¨Ù‡ لملÙات ZIP",
"Save" => "ØÙظ",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "استخدم هذا العنوان لـ <a href=\"%s\" target=\"_blank\">الدخول الى ملÙاتك عن طريق WebDAV</a>",
"New" => "جديد",
"Text file" => "ملÙ",
"New folder" => "مجلد جديد",
"Folder" => "مجلد",
"From link" => "من رابط",
-"Deleted files" => "Øذ٠الملÙات",
"Cancel upload" => "إلغاء رÙع الملÙات",
"Nothing in here. Upload something!" => "لا يوجد شيء هنا. إرÙع بعض الملÙات!",
"Download" => "تØميل",
"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." => "يرجى الانتظار , جاري ÙØص الملÙات .",
-"Current scanning" => "الÙØص الØالي"
+"Files are being scanned, please wait." => "يرجى الانتظار , جاري ÙØص الملÙات ."
);
$PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/apps/files/l10n/ast.php b/apps/files/l10n/ast.php
index a2568ae7631ebef0ba5771b51b749fe025431ad4..b0d7e42d5d0ab1d134ad3bb8032217d487fa7db5 100644
--- a/apps/files/l10n/ast.php
+++ b/apps/files/l10n/ast.php
@@ -1,29 +1,93 @@
<?php
$TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Nun pudo movese %s - Yá existe un ficheru con esi nome.",
+"Could not move %s" => "Nun pudo movese %s",
"File name cannot be empty." => "El nome de ficheru nun pue quedar baleru.",
+"\"%s\" is an invalid file name." => "\"%s\" ye un nome de ficheru inválidu.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome inválidu, los caráuteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" nun tán permitÃos.",
+"The target folder has been moved or deleted." => "La carpeta oxetivu movióse o desanicióse.",
+"The name %s is already used in the folder %s. Please choose a different name." => "El nome %s yá ta n'usu na carpeta %s. Por favor, escueyi un nome diferente.",
+"Not a valid source" => "Nun ye una fonte válida",
+"Server is not allowed to open URLs, please check the server configuration" => "Nun se-y permite al sirvidor abrir URLs, por favor comprueba la configuración del sirvidor",
+"Error while downloading %s to %s" => "Fallu cuando se descargaba %s a %s",
+"Error when creating the file" => "Fallu cuando se creaba'l ficheru",
+"Folder name cannot be empty." => "El nome la carpeta nun pue tar baleru.",
+"Error when creating the folder" => "Fallu cuando se creaba la carpeta",
+"Unable to set upload directory." => "Nun pue afitase la carpeta de xubida.",
+"Invalid Token" => "Token inválidu",
"No file was uploaded. Unknown error" => "Nun se xubió dengún ficheru. Fallu desconocÃu",
"There is no error, the file uploaded with success" => "Nun hai dengún fallu, el ficheru xubióse ensin problemes",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El ficheru xubÃu perpasa la direutiva \"upload_max_filesize\" del ficheru php.ini",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El ficheru xubÃu perpasa la direutiva \"MAX_FILE_SIZE\" especificada nel formulariu HTML",
"The uploaded file was only partially uploaded" => "El ficheru xubióse de mou parcial",
"No file was uploaded" => "Nun se xubió dengún ficheru",
"Missing a temporary folder" => "Falta una carpeta temporal",
"Failed to write to disk" => "Fallu al escribir al discu",
"Not enough storage available" => "Nun hai abondu espaciu disponible",
+"Upload failed. Could not find uploaded file" => "Xubida fallÃa. Nun se pudo atopar el ficheru xubÃu.",
+"Upload failed. Could not get file info." => "Falló la xubida. Nun se pudo obtener la información del ficheru.",
+"Invalid directory." => "Direutoriu non válidu.",
"Files" => "Ficheros",
+"All files" => "Tolos ficheros",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nun se pudo xubir {filename}, paez que ye un directoriu o tien 0 bytes",
+"Total file size {size1} exceeds upload limit {size2}" => "El tamañu de ficheru total {size1} perpasa'l llÃmite de xuba {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nun hai abondu espaciu llibre, tas xubiendo {size1} pero namái falta {size2}",
+"Upload cancelled." => "Xuba encaboxada.",
+"Could not get result from server." => "Nun se pudo obtener el resultáu del servidor.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "La xuba del ficheru ta en progresu. Si dexes agora la páxina, la xuba nun s'encaboxará.",
+"URL cannot be empty" => "La URL nun pue tar balera",
+"{new_name} already exists" => "{new_name} yá existe",
+"Could not create file" => "Nun pudo crease'l ficheru",
+"Could not create folder" => "Nun pudo crease la carpeta",
"Share" => "Compartir",
+"Delete permanently" => "Desaniciar dafechu",
"Rename" => "Renomar",
+"Your download is being prepared. This might take some time if the files are big." => "Ta preparándose la to descarga. Esto podrÃa llevar dalgún tiempu si los ficheros son grandes.",
+"Pending" => "Pendiente",
+"Error moving file." => "Fallu moviendo'l ficheru.",
+"Error moving file" => "Fallu moviendo'l ficheru",
"Error" => "Fallu",
+"Could not rename file" => "Nun pudo renomase'l ficheru",
+"Error deleting file." => "Fallu desaniciando'l ficheru.",
"Name" => "Nome",
"Size" => "Tamañu",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"Modified" => "Modificáu",
+"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"),
+"_%n file_::_%n files_" => array("%n ficheru","%n ficheros"),
+"_Uploading %n file_::_Uploading %n files_" => array("Xubiendo %n ficheru","Xubiendo %n ficheros"),
+"\"{name}\" is an invalid file name." => "\"{name}\" ye un nome de ficheru inválidu.",
+"Your storage is full, files can not be updated or synced anymore!" => "L'almacenamientu ta completu, ¡yá nun se pueden anovar o sincronizar ficheros!",
+"Your storage is almost full ({usedSpacePercent}%)" => "L'almacenamientu ta casi completu ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y anÃciala de nueves",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Clave privada non válida pa Encryption. Por favor, anova la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos.",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Deshabilitose'l cifráu pero los tos ficheros tovÃa tan cifraos. Por favor, vete a los axustes personales pa descrifrar los tos ficheros.",
+"{dirs} and {files}" => "{dirs} y {files}",
+"%s could not be renamed" => "Nun se puede renomar %s ",
+"Upload (max. %s)" => "Xuba (máx. %s)",
+"File handling" => "Alministración de ficheros",
+"Maximum upload size" => "Tamañu máximu de xubida",
+"max. possible: " => "máx. posible:",
+"Needed for multi-file and folder downloads." => "Ye necesariu pa descargues multificheru y de carpetes",
+"Enable ZIP-download" => "Activar descarga ZIP",
+"0 is unlimited" => "0 ye illimitao",
+"Maximum input size for ZIP files" => "Tamañu máximu d'entrada pa ficheros ZIP",
"Save" => "Guardar",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Usa esta direición pa <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a los ficheros a traviés de WebDAV</a>",
+"New" => "Nuevu",
+"New text file" => "Ficheru de testu nuevu",
+"Text file" => "Ficheru de testu",
"New folder" => "Nueva carpeta",
"Folder" => "Carpeta",
+"From link" => "Dende enllaz",
"Cancel upload" => "Encaboxar xuba",
+"You don’t have permission to upload or create files here" => "Nun tienes permisu pa xubir o crear ficheros equÃ",
+"Nothing in here. Upload something!" => "Nun hai nada equÃ. ¡Xubi daqué!",
"Download" => "Descargar",
-"Delete" => "Desaniciar"
+"Delete" => "Desaniciar",
+"Upload too large" => "La xuba ye abondo grande",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los ficheros que tas intentando xubir perpasen el tamañu máximu pa les xubÃes de ficheros nesti servidor.",
+"Files are being scanned, please wait." => "Tan escaniándose los ficheros, espera por favor.",
+"Currently scanning" => "Anguaño escaneando"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index f9ef3750b5ce8c46b75aec0ce6250fc4bbd9720f..7b5bac636d793089cf2f4586d39cb5d7deaa2e37 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -23,6 +23,7 @@ $TRANSLATIONS = array(
"Maximum upload size" => "МакÑимален размер за качване",
"0 is unlimited" => "Ползвайте 0 за без ограничениÑ",
"Save" => "ЗапиÑ",
+"WebDAV" => "WebDAV",
"New" => "Ðово",
"Text file" => "ТекÑтов файл",
"New folder" => "Ðова папка",
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index b96d2515f1c7439186420e872a57179915ab2efb..55bafd1a8fdae1b6296bde9c07108fe3c54b26b5 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -35,6 +35,7 @@ $TRANSLATIONS = array(
"0 is unlimited" => "০ à¦à¦° অরà§à¦¥ অসীম",
"Maximum input size for ZIP files" => "ZIP ফাইলের ইনপà§à¦Ÿà§‡à¦° সরà§à¦¬à§‹à¦šà§à¦š আকার",
"Save" => "সংরকà§à¦·à¦£",
+"WebDAV" => "WebDAV",
"New" => "নতà§à¦¨",
"Text file" => "টেকà§à¦¸à¦Ÿ ফাইল",
"Folder" => "ফোলà§à¦¡à¦¾à¦°",
@@ -45,7 +46,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." => "ফাইলগà§à¦²à§‹ সà§à¦•à§à¦¯à¦¾à¦¨ করা হচà§à¦›à§‡, দয়া করে অপেকà§à¦·à¦¾ করà§à¦¨à¥¤",
-"Current scanning" => "বরà§à¦¤à¦®à¦¾à¦¨ সà§à¦•à§à¦¯à¦¾à¦¨à¦¿à¦‚"
+"Files are being scanned, please wait." => "ফাইলগà§à¦²à§‹ সà§à¦•à§à¦¯à¦¾à¦¨ করা হচà§à¦›à§‡, দয়া করে অপেকà§à¦·à¦¾ করà§à¦¨à¥¤"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/bn_IN.php b/apps/files/l10n/bn_IN.php
new file mode 100644
index 0000000000000000000000000000000000000000..0157af093e92200cc7790497227e92e62d80165f
--- /dev/null
+++ b/apps/files/l10n/bn_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/ca.php b/apps/files/l10n/ca.php
index 6226168175a895e491ca1b8700eff75430d0537c..9929cfea88d2bbf5506ea9a149cf35aa91da74e5 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -44,6 +44,7 @@ $TRANSLATIONS = array(
"Rename" => "Reanomena",
"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.",
"Pending" => "Pendent",
+"Error moving file." => "Error en moure el fitxer.",
"Error moving file" => "Error en moure el fitxer",
"Error" => "Error",
"Could not rename file" => "No es pot canviar el nom de fitxer",
@@ -70,13 +71,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 és sense lÃmit",
"Maximum input size for ZIP files" => "Mida mà xima d'entrada per fitxers ZIP",
"Save" => "Desa",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>",
"New" => "Nou",
"New text file" => "Nou fitxer de text",
"Text file" => "Fitxer de text",
"New folder" => "Carpeta nova",
"Folder" => "Carpeta",
"From link" => "Des d'enllaç",
-"Deleted files" => "Fitxers esborrats",
"Cancel upload" => "Cancel·la la pujada",
"You don’t have permission to upload or create files here" => "No teniu permisos per a pujar o crear els fitxers aquÃ",
"Nothing in here. Upload something!" => "Res per aquÃ. Pugeu alguna cosa!",
@@ -84,7 +86,6 @@ $TRANSLATIONS = array(
"Delete" => "Esborra",
"Upload too large" => "La pujada és massa gran",
"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"
+"Files are being scanned, please wait." => "S'estan escanejant els fitxers, espereu"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ca@valencia.php b/apps/files/l10n/ca@valencia.php
new file mode 100644
index 0000000000000000000000000000000000000000..0157af093e92200cc7790497227e92e62d80165f
--- /dev/null
+++ b/apps/files/l10n/ca@valencia.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/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 8fa0bb21370d0e6b81d4a620ce61840014d6ee63..ebfc2e6add78eca5ae2be368336e370f74a14e80 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -72,13 +72,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 znamená bez omezenÃ",
"Maximum input size for ZIP files" => "Maximálnà velikost vstupu pro ZIP soubory",
"Save" => "Uložit",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Použijte <a href=\"%s\" target=\"_blank\">tuto adresu pro pÅ™Ãstup k vaÅ¡im souborům pÅ™es WebDAV</a>",
"New" => "Nový",
"New text file" => "Nový textový soubor",
"Text file" => "Textový soubor",
"New folder" => "Nová složka",
"Folder" => "Složka",
"From link" => "Z odkazu",
-"Deleted files" => "Odstraněné soubory",
"Cancel upload" => "ZruÅ¡it odesÃlánÃ",
"You don’t have permission to upload or create files here" => "Nemáte oprávnÄ›nà zde nahrávat Äi vytvářet soubory",
"Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",
@@ -86,7 +87,6 @@ $TRANSLATIONS = array(
"Delete" => "Smazat",
"Upload too large" => "OdesÃlaný soubor je pÅ™ÃliÅ¡ velký",
"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Ã"
+"Files are being scanned, please wait." => "Soubory se prohledávajÃ, prosÃm Äekejte."
);
$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 6ed94e5c77c79dad87a5d83b87229e0b27bf52ab..443d21667ccfec2df1054397a4d93aad4cd1cf5f 100644
--- a/apps/files/l10n/cy_GB.php
+++ b/apps/files/l10n/cy_GB.php
@@ -44,14 +44,12 @@ $TRANSLATIONS = array(
"Text file" => "Ffeil destun",
"Folder" => "Plygell",
"From link" => "Dolen o",
-"Deleted files" => "Ffeiliau ddilewyd",
"Cancel upload" => "Diddymu llwytho i fyny",
"Nothing in here. Upload something!" => "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!",
"Download" => "Llwytho i lawr",
"Delete" => "Dileu",
"Upload too large" => "Maint llwytho i fyny'n rhy fawr",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn.",
-"Files are being scanned, please wait." => "Arhoswch, mae ffeiliau'n cael eu sganio.",
-"Current scanning" => "Sganio cyfredol"
+"Files are being scanned, please wait." => "Arhoswch, mae ffeiliau'n cael eu sganio."
);
$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 076fa46b4c38f6f13638f37d9d9b5fc0585781e2..95b848a50e510e729099164d9c3ec92044540bdb 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -72,13 +72,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 er ubegrænset",
"Maximum input size for ZIP files" => "Maksimal størrelse på ZIP filer",
"Save" => "Gem",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Brug denne adresse for at <a href=\"%s\" target=\"_blank\">tilgå dine filer via WebDAV</a>",
"New" => "Ny",
"New text file" => "Ny tekstfil",
"Text file" => "Tekstfil",
"New folder" => "Ny Mappe",
"Folder" => "Mappe",
"From link" => "Fra link",
-"Deleted files" => "Slettede filer",
"Cancel upload" => "Fortryd upload",
"You don’t have permission to upload or create files here" => "Du har ikke tilladelse til at uploade eller oprette filer her",
"Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
@@ -86,7 +87,6 @@ $TRANSLATIONS = array(
"Delete" => "Slet",
"Upload too large" => "Upload er for stor",
"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"
+"Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 8ad0f8909f194e2c84b1edb1f62fd0aec7fa9690..685d84854b1967c420647cf871133f1f62a2401f 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden.",
"Invalid directory." => "Ungültiges Verzeichnis.",
"Files" => "Dateien",
+"All files" => "Alle Dateien",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
"Total file size {size1} exceeds upload limit {size2}" => "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nicht genügend freier Speicherplatz, du möchtest {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
@@ -72,13 +73,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 bedeutet unbegrenzt",
"Maximum input size for ZIP files" => "Maximale Größe für ZIP-Dateien",
"Save" => "Speichern",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
"New" => "Neu",
"New text file" => "Neue Textdatei",
"Text file" => "Textdatei",
"New folder" => "Neuer Ordner",
"Folder" => "Ordner",
"From link" => "Von einem Link",
-"Deleted files" => "Gelöschte Dateien",
"Cancel upload" => "Upload abbrechen",
"You don’t have permission to upload or create files here" => "Du besitzt hier keine Berechtigung, um Dateien hochzuladen oder zu erstellen",
"Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
@@ -87,6 +89,6 @@ $TRANSLATIONS = array(
"Upload too large" => "Der Upload ist zu groß",
"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"
+"Currently scanning" => "Durchsuchen läuft"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de_CH.php b/apps/files/l10n/de_CH.php
index 625b9387b0ab630144cf74ed14dcebb2763ac5a5..536b0c055c95970de62f9650d43574b18d08ee91 100644
--- a/apps/files/l10n/de_CH.php
+++ b/apps/files/l10n/de_CH.php
@@ -44,19 +44,18 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 bedeutet unbegrenzt",
"Maximum input size for ZIP files" => "Maximale Grösse für ZIP-Dateien",
"Save" => "Speichern",
+"WebDAV" => "WebDAV",
"New" => "Neu",
"Text file" => "Textdatei",
"New folder" => "Neues Verzeichnis",
"Folder" => "Ordner",
"From link" => "Von einem Link",
-"Deleted files" => "Gelöschte Dateien",
"Cancel upload" => "Upload abbrechen",
"Nothing in here. Upload something!" => "Alles leer. Laden Sie etwas hoch!",
"Download" => "Herunterladen",
"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"
+"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 9a834f1cc31733d5c4a3014a5a060a0678142ea8..bc7e12b066f9925cac7038e05ecbfe6c5792588c 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Die Dateiinformationen konnten nicht abgerufen werden.",
"Invalid directory." => "Ungültiges Verzeichnis.",
"Files" => "Dateien",
+"All files" => "Alle Dateien",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
"Total file size {size1} exceeds upload limit {size2}" => "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
@@ -72,13 +73,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 bedeutet unbegrenzt",
"Maximum input size for ZIP files" => "Maximale Größe für ZIP-Dateien",
"Save" => "Speichern",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
"New" => "Neu",
"New text file" => "Neue Textdatei",
"Text file" => "Textdatei",
"New folder" => "Neuer Ordner",
"Folder" => "Ordner",
"From link" => "Von einem Link",
-"Deleted files" => "Gelöschte Dateien",
"Cancel upload" => "Upload abbrechen",
"You don’t have permission to upload or create files here" => "Sie besitzen hier keine Berechtigung Dateien hochzuladen oder zu erstellen",
"Nothing in here. Upload something!" => "Alles leer. Laden Sie etwas hoch!",
@@ -87,6 +89,6 @@ $TRANSLATIONS = array(
"Upload too large" => "Der Upload ist zu groß",
"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"
+"Currently scanning" => "Durchsuchen läuft"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 5ba92033d13360b780be3d1f0cac1d11e43f47be..1ea2c3cc3d2bcf3ef355b93577d0664272bb3761 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "Η φόÏτωση απÎτυχε. Αδυναμία λήψης πληÏοφοÏιών αÏχείων.",
"Invalid directory." => "Μη ÎγκυÏος φάκελος.",
"Files" => "ΑÏχεία",
+"All files" => "Όλα τα αÏχεία",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Αδυναμία φόÏτωσης {filename} καθώς είναι κατάλογος αÏχείων ή Îχει 0 bytes",
"Total file size {size1} exceeds upload limit {size2}" => "Το συνολικό μÎγεθος αÏχείου {size1} υπεÏβαίνει το ÏŒÏιο μεταφόÏτωσης {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Δεν υπάÏχει αÏκετός ελεÏθεÏος χώÏος, μεταφοÏτώνετε μÎγεθος {size1} αλλά υπάÏχει χώÏος μόνο {size2}",
@@ -44,6 +45,7 @@ $TRANSLATIONS = array(
"Rename" => "Μετονομασία",
"Your download is being prepared. This might take some time if the files are big." => "Η λήψη Ï€Ïοετοιμάζεται. Αυτό μποÏεί να πάÏει ÏŽÏα εάν τα αÏχεία Îχουν μεγάλο μÎγεθος.",
"Pending" => "ΕκκÏεμεί",
+"Error moving file." => "Σφάλμα κατά τη μετακίνηση του αÏχείου.",
"Error moving file" => "Σφάλμα κατά τη μετακίνηση του αÏχείου",
"Error" => "Σφάλμα",
"Could not rename file" => "Αδυναμία μετονομασίας αÏχείου",
@@ -71,13 +73,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 για απεÏιόÏιστο",
"Maximum input size for ZIP files" => "ÎœÎγιστο μÎγεθος για αÏχεία ZIP",
"Save" => "Αποθήκευση",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "ΧÏησιμοποιήστε αυτήν την διεÏθυνση για να αποκτήσετε <a href=\"%s\" target=\"_blank\">Ï€Ïόσβαση στα αÏχεία σας μÎσω WebDAV</a>",
"New" => "ÎÎο",
"New text file" => "ÎÎο αÏχείο κειμÎνου",
"Text file" => "ΑÏχείο κειμÎνου",
"New folder" => "ÎÎος κατάλογος",
"Folder" => "Φάκελος",
"From link" => "Από σÏνδεσμο",
-"Deleted files" => "ΔιαγÏαμμÎνα αÏχεία",
"Cancel upload" => "ΑκÏÏωση αποστολής",
"You don’t have permission to upload or create files here" => "Δεν Îχετε δικαιώματα φόÏτωσης ή δημιουÏγίας αÏχείων εδώ",
"Nothing in here. Upload something!" => "Δεν υπάÏχει τίποτα εδώ. Ανεβάστε κάτι!",
@@ -85,7 +88,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." => "Τα αÏχεία σαÏώνονται, παÏακαλώ πεÏιμÎνετε.",
-"Current scanning" => "ΤÏÎχουσα ανίχνευση"
+"Files are being scanned, please wait." => "Τα αÏχεία σαÏώνονται, παÏακαλώ πεÏιμÎνετε."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/en_GB.php b/apps/files/l10n/en_GB.php
index 5ebc141b80e74b175f4be917cbf0be3c8e3305dc..37229a45808885f6090a06ab36af1b16d3ea4b28 100644
--- a/apps/files/l10n/en_GB.php
+++ b/apps/files/l10n/en_GB.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "Upload failed. Could not get file info.",
"Invalid directory." => "Invalid directory.",
"Files" => "Files",
+"All files" => "All 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",
"Total file size {size1} exceeds upload limit {size2}" => "Total file size {size1} exceeds upload limit {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Not enough free space, you are uploading {size1} but only {size2} is left",
@@ -72,13 +73,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 is unlimited",
"Maximum input size for ZIP files" => "Maximum input size for ZIP files",
"Save" => "Save",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>",
"New" => "New",
"New text file" => "New text file",
"Text file" => "Text file",
"New folder" => "New folder",
"Folder" => "Folder",
"From link" => "From link",
-"Deleted files" => "Deleted files",
"Cancel upload" => "Cancel upload",
"You don’t have permission to upload or create files here" => "You don’t have permission to upload or create files here",
"Nothing in here. Upload something!" => "Nothing in here. Upload something!",
@@ -87,6 +89,6 @@ $TRANSLATIONS = array(
"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" => "Currently scanning"
+"Currently scanning" => "Currently scanning"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index eebd94abc33263042a211434e3cdfde4f2a54bc0..651948dfeb0301261bc8e9ad98cc5c3e084e50c0 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -58,12 +58,12 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 signifas senlime",
"Maximum input size for ZIP files" => "Maksimuma enirgrando por ZIP-dosieroj",
"Save" => "Konservi",
+"WebDAV" => "WebDAV",
"New" => "Nova",
"Text file" => "Tekstodosiero",
"New folder" => "Nova dosierujo",
"Folder" => "Dosierujo",
"From link" => "El ligilo",
-"Deleted files" => "Forigitaj dosieroj",
"Cancel upload" => "Nuligi alÅuton",
"You don’t have permission to upload or create files here" => "Vi ne havas permeson alÅuti aÅ krei dosierojn ĉi tie",
"Nothing in here. Upload something!" => "Nenio estas ĉi tie. AlÅutu ion!",
@@ -71,7 +71,6 @@ $TRANSLATIONS = array(
"Delete" => "Forigi",
"Upload too large" => "AlÅuto tro larÄa",
"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"
+"Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index ba115e6af7883183e91ce9957be1afd16d66b6bb..9449f90f1c984e6e96e8a78730d10d2fd00c030d 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "Actualización fallida. No se pudo obtener información del archivo.",
"Invalid directory." => "Directorio inválido.",
"Files" => "Archivos",
+"All files" => "Todos los archivos",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes",
"Total file size {size1} exceeds upload limit {size2}" => "El tamaño total del archivo {size1} excede el lÃmite {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}",
@@ -72,13 +73,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 significa ilimitado",
"Maximum input size for ZIP files" => "Tamaño máximo para archivos ZIP de entrada",
"Save" => "Guardar",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use esta URL <a href=\"%s\" target=\"_blank\">para acceder via WebDAV</a>",
"New" => "Nuevo",
"New text file" => "Nuevo archivo de texto",
"Text file" => "Archivo de texto",
"New folder" => "Nueva carpeta",
"Folder" => "Carpeta",
"From link" => "Desde enlace",
-"Deleted files" => "Archivos eliminados",
"Cancel upload" => "Cancelar subida",
"You don’t have permission to upload or create files here" => "No tienes permisos para subir o crear archivos aquÃ.",
"Nothing in here. Upload something!" => "No hay nada aquÃ. ¡Suba algo!",
@@ -87,6 +89,6 @@ $TRANSLATIONS = array(
"Upload too large" => "Subida demasido grande",
"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"
+"Currently scanning" => "Escaneando en este momento"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 7d1eb0fb4aaa0f7b20ed60e832804fcab626f54d..3bef48950552e41e1e9d9329b679c66847a4fef8 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -65,13 +65,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 significa ilimitado",
"Maximum input size for ZIP files" => "Tamaño máximo para archivos ZIP de entrada",
"Save" => "Guardar",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vÃa WebDAV</a>",
"New" => "Nuevo",
"New text file" => "Nuevo archivo de texto",
"Text file" => "Archivo de texto",
"New folder" => "Nueva Carpeta",
"Folder" => "Carpeta",
"From link" => "Desde enlace",
-"Deleted files" => "Archivos borrados",
"Cancel upload" => "Cancelar subida",
"You don’t have permission to upload or create files here" => "No tienes permisos para subir o crear archivos aquÃ",
"Nothing in here. Upload something!" => "No hay nada. ¡Subà contenido!",
@@ -79,7 +80,6 @@ $TRANSLATIONS = array(
"Delete" => "Borrar",
"Upload too large" => "El tamaño del archivo que querés subir es demasiado grande",
"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"
+"Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_BO.php b/apps/files/l10n/es_BO.php
new file mode 100644
index 0000000000000000000000000000000000000000..0157af093e92200cc7790497227e92e62d80165f
--- /dev/null
+++ b/apps/files/l10n/es_BO.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/es_CL.php b/apps/files/l10n/es_CL.php
index fa856ad5292d9d6cec61e5af15db45ae15e33107..bdefea1d8c8ad0a76ef063d69cea6952108e457c 100644
--- a/apps/files/l10n/es_CL.php
+++ b/apps/files/l10n/es_CL.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"New folder" => "Nuevo directorio",
+"Cancel upload" => "cancelar subida",
"Download" => "Descargar"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_CO.php b/apps/files/l10n/es_CO.php
new file mode 100644
index 0000000000000000000000000000000000000000..0157af093e92200cc7790497227e92e62d80165f
--- /dev/null
+++ b/apps/files/l10n/es_CO.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/es_EC.php b/apps/files/l10n/es_EC.php
new file mode 100644
index 0000000000000000000000000000000000000000..0157af093e92200cc7790497227e92e62d80165f
--- /dev/null
+++ b/apps/files/l10n/es_EC.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/es_MX.php b/apps/files/l10n/es_MX.php
index b6d06d941363d443f68d95ceb1577b74e5fcac01..3743a33f606d7744e0b1e2d12f3c3fd22c535574 100644
--- a/apps/files/l10n/es_MX.php
+++ b/apps/files/l10n/es_MX.php
@@ -65,13 +65,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 significa ilimitado",
"Maximum input size for ZIP files" => "Tamaño máximo para archivos ZIP de entrada",
"Save" => "Guardar",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vÃa WebDAV</a>",
"New" => "Nuevo",
"New text file" => "Nuevo archivo de texto",
"Text file" => "Archivo de texto",
"New folder" => "Nueva carpeta",
"Folder" => "Carpeta",
"From link" => "Desde enlace",
-"Deleted files" => "Archivos eliminados",
"Cancel upload" => "Cancelar subida",
"You don’t have permission to upload or create files here" => "No tienes permisos para subir o crear archivos aquÃ.",
"Nothing in here. Upload something!" => "No hay nada aquÃ. ¡Suba algo!",
@@ -79,7 +80,6 @@ $TRANSLATIONS = array(
"Delete" => "Eliminar",
"Upload too large" => "Subida demasido grande",
"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"
+"Files are being scanned, please wait." => "Los archivos están siendo escaneados, por favor espere."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_PE.php b/apps/files/l10n/es_PE.php
new file mode 100644
index 0000000000000000000000000000000000000000..0157af093e92200cc7790497227e92e62d80165f
--- /dev/null
+++ b/apps/files/l10n/es_PE.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/es_PY.php b/apps/files/l10n/es_PY.php
new file mode 100644
index 0000000000000000000000000000000000000000..0157af093e92200cc7790497227e92e62d80165f
--- /dev/null
+++ b/apps/files/l10n/es_PY.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/es_US.php b/apps/files/l10n/es_US.php
new file mode 100644
index 0000000000000000000000000000000000000000..0157af093e92200cc7790497227e92e62d80165f
--- /dev/null
+++ b/apps/files/l10n/es_US.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/es_UY.php b/apps/files/l10n/es_UY.php
new file mode 100644
index 0000000000000000000000000000000000000000..0157af093e92200cc7790497227e92e62d80165f
--- /dev/null
+++ b/apps/files/l10n/es_UY.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 4956e3fb45b72d440b74271ce243d72d3aa032ad..7531d2b25627ed7946ee0f2b7c7e51dbeef2f172 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "Üleslaadimine ebaõnnestus. Faili info hankimine ebaõnnestus.",
"Invalid directory." => "Vigane kaust.",
"Files" => "Failid",
+"All files" => "Kõik failid",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti",
"Total file size {size1} exceeds upload limit {size2}" => "Faili suurus {size1} ületab faili üleslaadimise mahu piirangu {size2}.",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval.",
@@ -41,9 +42,11 @@ $TRANSLATIONS = array(
"Error fetching URL" => "Viga URL-i haaramisel",
"Share" => "Jaga",
"Delete permanently" => "Kustuta jäädavalt",
+"Delete" => "Kustuta",
"Rename" => "Nimeta ümber",
"Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. ",
"Pending" => "Ootel",
+"Error moving file." => "Viga faili liigutamisel.",
"Error moving file" => "Viga faili eemaldamisel",
"Error" => "Viga",
"Could not rename file" => "Ei suuda faili ümber nimetada",
@@ -71,21 +74,21 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 tähendab piiramatut",
"Maximum input size for ZIP files" => "Maksimaalne ZIP-faili sisestatava faili suurus",
"Save" => "Salvesta",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>",
"New" => "Uus",
"New text file" => "Uus tekstifail",
"Text file" => "Tekstifail",
"New folder" => "Uus kaust",
"Folder" => "Kaust",
"From link" => "Allikast",
-"Deleted files" => "Kustutatud failid",
"Cancel upload" => "Tühista üleslaadimine",
"You don’t have permission to upload or create files here" => "Sul puuduvad õigused siia failide üleslaadimiseks või tekitamiseks",
"Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!",
"Download" => "Lae alla",
-"Delete" => "Kustuta",
"Upload too large" => "Ãœleslaadimine on liiga suur",
"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"
+"Currently scanning" => "Praegu skännimisel"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 914518151d59f9b43090fda4ed6c86a7e1597a91..b60358e4202c640af4d32c4d93a8892651f4e040 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -3,7 +3,9 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da",
"Could not move %s" => "Ezin dira fitxategiak mugitu %s",
"File name cannot be empty." => "Fitxategi izena ezin da hutsa izan.",
+"\"%s\" is an invalid file name." => "\"%s\" ez da fitxategi izen baliogarria.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
+"The target folder has been moved or deleted." => "Jatorrizko karpeta mugitu edo ezabatu da.",
"The name %s is already used in the folder %s. Please choose a different name." => "%s izena dagoeneko erabilita dago %s karpetan. Mesdez hautatu izen ezberdina.",
"Not a valid source" => "Ez da jatorri baliogarria",
"Server is not allowed to open URLs, please check the server configuration" => "Zerbitzaria ez dago URLak irekitzeko baimendua, mesedez egiaztatu zerbitzariaren konfigurazioa",
@@ -27,6 +29,8 @@ $TRANSLATIONS = array(
"Invalid directory." => "Baliogabeko karpeta.",
"Files" => "Fitxategiak",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Ezin da {filename} igo karpeta bat delako edo 0 byte dituelako",
+"Total file size {size1} exceeds upload limit {size2}" => "Fitxategiaren tamainak {size1} igotzeko muga {size2} gainditzen du",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Ez dago leku nahikorik, zu {size1} igotzen ari zara baina bakarrik {size2} libre dago",
"Upload cancelled." => "Igoera ezeztatuta",
"Could not get result from server." => "Ezin da zerbitzaritik emaitzik lortu",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
@@ -40,6 +44,7 @@ $TRANSLATIONS = array(
"Rename" => "Berrizendatu",
"Your download is being prepared. This might take some time if the files are big." => "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. ",
"Pending" => "Zain",
+"Error moving file." => "Errorea fitxategia mugitzean.",
"Error moving file" => "Errorea fitxategia mugitzean",
"Error" => "Errorea",
"Could not rename file" => "Ezin izan da fitxategia berrizendatu",
@@ -50,6 +55,7 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"),
"_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"),
"_Uploading %n file_::_Uploading %n files_" => array("Fitxategi %n igotzen","%n fitxategi igotzen"),
+"\"{name}\" is an invalid file name." => "\"{name}\" ez da fitxategi izen baliogarria.",
"Your storage is full, files can not be updated or synced anymore!" => "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!",
"Your storage is almost full ({usedSpacePercent}%)" => "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
@@ -57,6 +63,7 @@ $TRANSLATIONS = array(
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko.",
"{dirs} and {files}" => "{dirs} eta {files}",
"%s could not be renamed" => "%s ezin da berrizendatu",
+"Upload (max. %s)" => "Igo (max. %s)",
"File handling" => "Fitxategien kudeaketa",
"Maximum upload size" => "Igo daitekeen gehienezko tamaina",
"max. possible: " => "max, posiblea:",
@@ -65,13 +72,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 mugarik gabe esan nahi du",
"Maximum input size for ZIP files" => "ZIP fitxategien gehienezko tamaina",
"Save" => "Gorde",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>",
"New" => "Berria",
"New text file" => "Testu fitxategi berria",
"Text file" => "Testu fitxategia",
"New folder" => "Karpeta berria",
"Folder" => "Karpeta",
"From link" => "Estekatik",
-"Deleted files" => "Ezabatutako fitxategiak",
"Cancel upload" => "Ezeztatu igoera",
"You don’t have permission to upload or create files here" => "Ez duzu fitxategiak hona igotzeko edo hemen sortzeko baimenik",
"Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
@@ -79,7 +87,6 @@ $TRANSLATIONS = array(
"Delete" => "Ezabatu",
"Upload too large" => "Igoera handiegia da",
"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"
+"Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index ce4efe00e2ccb19900a8f8a31f6ace5c31f21b20..46e8dca52349031e0c92af62742d81cd461f9871 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -43,19 +43,19 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 نامØدود است",
"Maximum input size for ZIP files" => "Øداکثرمقدار برای بار گزاری پرونده های Ùشرده",
"Save" => "ذخیره",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "از این آدرس استÙاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به Ùایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>",
"New" => "جدید",
"Text file" => "Ùایل متنی",
"New folder" => "پوشه جدید",
"Folder" => "پوشه",
"From link" => "از پیوند",
-"Deleted files" => "Ùایل های Øذ٠شده",
"Cancel upload" => "متوق٠کردن بار گذاری",
"Nothing in here. Upload something!" => "اینجا هیچ چیز نیست.",
"Download" => "دانلود",
"Delete" => "ØØ°Ù",
"Upload too large" => "سایز Ùایل برای آپلود زیاد است(Ù….تنظیمات در php.ini)",
"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" => "بازرسی کنونی"
+"Files are being scanned, please wait." => "پرونده ها در Øال بازرسی هستند لطÙا صبر کنید"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 2a5c02277f683fba20511db1c3af8f6dae213861..668f85cfc45de31b6f5be3f1c6329c5f1be9693e 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -27,6 +27,7 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty.",
"Invalid directory." => "Virheellinen kansio.",
"Files" => "Tiedostot",
+"All files" => "Kaikki tiedostot",
"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",
"Total file size {size1} exceeds upload limit {size2}" => "Yhteiskoko {size1} ylittää lähetysrajan {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä",
@@ -71,13 +72,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 on rajoittamaton",
"Maximum input size for ZIP files" => "ZIP-tiedostojen enimmäiskoko",
"Save" => "Tallenna",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\">käyttääksesi tiedostojasi WebDAVin kautta</a>",
"New" => "Uusi",
"New text file" => "Uusi tekstitiedosto",
"Text file" => "Tekstitiedosto",
"New folder" => "Uusi kansio",
"Folder" => "Kansio",
"From link" => "Linkistä",
-"Deleted files" => "Poistetut tiedostot",
"Cancel upload" => "Peru lähetys",
"You don’t have permission to upload or create files here" => "Käyttöoikeutesi eivät riitä tiedostojen lähettämiseen tai kansioiden luomiseen tähän sijaintiin",
"Nothing in here. Upload something!" => "Täällä ei ole mitään. Lähetä tänne jotakin!",
@@ -86,6 +88,6 @@ $TRANSLATIONS = array(
"Upload too large" => "Lähetettävä tiedosto on liian suuri",
"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"
+"Currently scanning" => "Tutkitaan parhaillaan"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 3e61c782a5631bded7d7ee1bdb72d9e998619ef1..fcba687f4b474fb77a81f5b4001dd9ecdec667ae 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "L'envoi a échoué. Impossible d'obtenir les informations du fichier.",
"Invalid directory." => "Dossier invalide.",
"Files" => "Fichiers",
+"All files" => "Tous les fichiers",
"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",
"Total file size {size1} exceeds upload limit {size2}" => "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Espace insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles",
@@ -72,13 +73,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 est illimité",
"Maximum input size for ZIP files" => "Taille maximale pour les fichiers ZIP",
"Save" => "Sauvegarder",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utiliser cette adresse pour <a href=\"%s\" target=\"_blank\"> accéder à vos fichiers par WebDAV</a>",
"New" => "Nouveau",
"New text file" => "Nouveau fichier texte",
"Text file" => "Fichier texte",
"New folder" => "Nouveau dossier",
"Folder" => "Dossier",
"From link" => "Depuis le lien",
-"Deleted files" => "Fichiers supprimés",
"Cancel upload" => "Annuler l'envoi",
"You don’t have permission to upload or create files here" => "Vous n'avez pas la permission de téléverser ou de créer des fichiers ici",
"Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
@@ -87,6 +89,6 @@ $TRANSLATIONS = array(
"Upload too large" => "Téléversement trop volumineux",
"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"
+"Currently scanning" => "Analyse en cours de traitement"
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 66d981c45430ad376fcdc9bcf09450511c76865b..611809e506c58d84923787c486fc1c275938d5ad 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "O envÃo fracasou. Non foi posÃbel obter información do ficheiro.",
"Invalid directory." => "O directorio é incorrecto.",
"Files" => "Ficheiros",
+"All files" => "Todos os ficheiros",
"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",
"Total file size {size1} exceeds upload limit {size2}" => "O tamaño total do ficheiro {size1} excede do lÃmite de envÃo {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Non hai espazo libre abondo, o seu envÃo é de {size1} mais só dispón de {size2}",
@@ -72,13 +73,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 significa ilimitado",
"Maximum input size for ZIP files" => "Tamaño máximo de descarga para os ficheiros ZIP",
"Save" => "Gardar",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Empregue esta ligazón para <a href=\"%s\" target=\"_blank\">acceder aos seus ficheiros mediante WebDAV</a>",
"New" => "Novo",
"New text file" => "Ficheiro novo de texto",
"Text file" => "Ficheiro de texto",
"New folder" => "Novo cartafol",
"Folder" => "Cartafol",
"From link" => "Desde a ligazón",
-"Deleted files" => "Ficheiros eliminados",
"Cancel upload" => "Cancelar o envÃo",
"You don’t have permission to upload or create files here" => "Non ten permisos para enviar ou crear ficheiros aquÃ.",
"Nothing in here. Upload something!" => "Aquà non hai nada. EnvÃe algo.",
@@ -87,6 +89,6 @@ $TRANSLATIONS = array(
"Upload too large" => "EnvÃo demasiado grande",
"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"
+"Currently scanning" => "Análise actual"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 7f155176546295843a074f1f8d861680af5055fe..56810eaabefe0e872a888777eb7a710ef0ad30d5 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -40,18 +40,17 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 - ×œ×œ× ×”×’×‘×œ×”",
"Maximum input size for ZIP files" => "גודל הקלט המרבי לקובצי ZIP",
"Save" => "שמירה",
+"WebDAV" => "WebDAV",
"New" => "חדש",
"Text file" => "קובץ טקסט",
"Folder" => "תיקייה",
"From link" => "מקישור",
-"Deleted files" => "×§×‘×¦×™× ×©× ×ž×—×§×•",
"Cancel upload" => "ביטול ההעל××”",
"Nothing in here. Upload something!" => "×ין ×›×ן ×©×•× ×“×‘×¨. ×ולי ×‘×¨×¦×•× ×š להעלות משהו?",
"Download" => "הורדה",
"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." => "×”×§×‘×¦×™× × ×¡×¨×§×™×, × × ×œ×”×ž×ª×™×Ÿ.",
-"Current scanning" => "הסריקה ×”× ×•×›×—×™×ª"
+"Files are being scanned, please wait." => "×”×§×‘×¦×™× × ×¡×¨×§×™×, × × ×œ×”×ž×ª×™×Ÿ."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index 4e8deeed5131962f3646b897e1076f81c3ade21b..626a7d6a6e0cded1e98eeb6955edf90afeca707d 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -36,7 +36,6 @@ $TRANSLATIONS = array(
"Delete" => "Obriši",
"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"
+"Files are being scanned, please wait." => "Datoteke se skeniraju, molimo priÄekajte."
);
$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 3cfb54726147845c03b6baf534ee82bae554ac17..02ca5866e2fde7fbece99be2fc77583e493902b6 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -65,13 +65,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 = korlátlan",
"Maximum input size for ZIP files" => "ZIP-fájlok maximális kiindulási mérete",
"Save" => "Mentés",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Ezt a cÃmet használd, hogy <a href=\"%s\" target=\"_blank\">hozzáférj a fileokhoz WebDAV-on keresztül</a>",
"New" => "Új",
"New text file" => "Új szöveges file",
"Text file" => "Szövegfájl",
"New folder" => "Új mappa",
"Folder" => "Mappa",
"From link" => "Feltöltés linkről",
-"Deleted files" => "Törölt fájlok",
"Cancel upload" => "A feltöltés megszakÃtása",
"You don’t have permission to upload or create files here" => "Önnek nincs jogosultsága ahhoz, hogy ide állományokat töltsön föl, vagy itt újakat hozzon létre",
"Nothing in here. Upload something!" => "Itt nincs semmi. Töltsön fel valamit!",
@@ -79,7 +80,6 @@ $TRANSLATIONS = array(
"Delete" => "Törlés",
"Upload too large" => "A feltöltés túl nagy",
"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"
+"Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index e4a2529e5ed629fbe917a5b30b21d9f84c3ca24c..67896a2a6ddf683f42455637bfceceab21101c0a 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -63,13 +63,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 berarti tidak terbatas",
"Maximum input size for ZIP files" => "Ukuran masukan maksimum untuk berkas ZIP",
"Save" => "Simpan",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses Berkas via WebDAV</a>",
"New" => "Baru",
"New text file" => "Berkas teks baru",
"Text file" => "Berkas teks",
"New folder" => "Map baru",
"Folder" => "Folder",
"From link" => "Dari tautan",
-"Deleted files" => "Berkas yang dihapus",
"Cancel upload" => "Batal pengunggahan",
"You don’t have permission to upload or create files here" => "Anda tidak memiliki akses untuk mengunggah atau membuat berkas disini",
"Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
@@ -77,7 +78,6 @@ $TRANSLATIONS = array(
"Delete" => "Hapus",
"Upload too large" => "Yang diunggah terlalu besar",
"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"
+"Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index 82b3db81d651f4859b5781ce62fa33d3be0861be..fef4df6ea1750d4ca0d534ef3551d36a0467b829 100644
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@@ -35,6 +35,7 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 er ótakmarkað",
"Maximum input size for ZIP files" => "Hámarks inntaksstærð fyrir ZIP skrár",
"Save" => "Vista",
+"WebDAV" => "WebDAV",
"New" => "Nýtt",
"Text file" => "Texta skrá",
"Folder" => "Mappa",
@@ -45,7 +46,6 @@ $TRANSLATIONS = array(
"Delete" => "Eyða",
"Upload too large" => "Innsend skrá er of stór",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.",
-"Files are being scanned, please wait." => "Verið er að skima skrár, vinsamlegast hinkraðu.",
-"Current scanning" => "Er að skima"
+"Files are being scanned, please wait." => "Verið er að skima skrár, vinsamlegast hinkraðu."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index d55c80091602ff8815f3d4aaf7dec6eba06896e2..e7bdf24e455c59bc18339d12a8306404e9659c57 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "Caricamento non riuscito. Impossibile ottenere informazioni sul file.",
"Invalid directory." => "Cartella non valida.",
"Files" => "File",
+"All files" => "Tutti i file",
"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.",
"Total file size {size1} exceeds upload limit {size2}" => "La dimensione totale del file {size1} supera il limite di caricamento {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}",
@@ -72,13 +73,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 è illimitato",
"Maximum input size for ZIP files" => "Dimensione massima per i file ZIP",
"Save" => "Salva",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\">accedere ai tuoi file con WebDAV</a>",
"New" => "Nuovo",
"New text file" => "Nuovo file di testo",
"Text file" => "File di testo",
"New folder" => "Nuova cartella",
"Folder" => "Cartella",
"From link" => "Da collegamento",
-"Deleted files" => "File eliminati",
"Cancel upload" => "Annulla invio",
"You don’t have permission to upload or create files here" => "Qui non hai i permessi di caricare o creare file",
"Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
@@ -87,6 +89,6 @@ $TRANSLATIONS = array(
"Upload too large" => "Caricamento troppo grande",
"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"
+"Currently scanning" => "Scansione in corso"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ja.php b/apps/files/l10n/ja.php
index 0b00594d71c4406316ae8f08e153f75c7b62e56e..c0e0468bafd69ce5365e1c967040507e81b322ee 100644
--- a/apps/files/l10n/ja.php
+++ b/apps/files/l10n/ja.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "アップãƒãƒ¼ãƒ‰ã«å¤±æ•—ã€‚ãƒ•ã‚¡ã‚¤ãƒ«æƒ…å ±ã‚’å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚",
"Invalid directory." => "無効ãªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã™ã€‚",
"Files" => "ファイル",
+"All files" => "ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "ディレクトリもã—ãã¯0ãƒã‚¤ãƒˆã®ãŸã‚ {filename} をアップãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“",
"Total file size {size1} exceeds upload limit {size2}" => "åˆè¨ˆãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚º {size1} ã¯ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰åˆ¶é™ {size2} を超éŽã—ã¦ã„ã¾ã™ã€‚",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "空ã容é‡ãŒå分ã§ãªã〠{size1} をアップãƒãƒ¼ãƒ‰ã—ã¦ã„ã¾ã™ãŒã€ {size2} ã—ã‹æ®‹ã£ã¦ã„ã¾ã›ã‚“。",
@@ -72,13 +73,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0を指定ã—ãŸå ´åˆã¯ç„¡åˆ¶é™",
"Maximum input size for ZIP files" => "ZIPファイルã§ã®æœ€å¤§å…¥åŠ›ã‚µã‚¤ã‚º",
"Save" => "ä¿å˜",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">WebDAV 経由ã§ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¢ã‚¯ã‚»ã‚¹</a> ã™ã‚‹ã«ã¯ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’利用ã—ã¦ãã ã•ã„",
"New" => "æ–°è¦ä½œæˆ",
"New text file" => "æ–°è¦ã®ãƒ†ã‚ストファイル作æˆ",
"Text file" => "テã‚ストファイル",
"New folder" => "æ–°ã—ã„フォルダー",
"Folder" => "フォルダー",
"From link" => "リンク",
-"Deleted files" => "ゴミ箱",
"Cancel upload" => "アップãƒãƒ¼ãƒ‰ã‚’ã‚ャンセル",
"You don’t have permission to upload or create files here" => "ã“ã“ã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’アップãƒãƒ¼ãƒ‰ã‚‚ã—ãã¯ä½œæˆã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“",
"Nothing in here. Upload something!" => "ã“ã“ã«ã¯ä½•ã‚‚ã‚ã‚Šã¾ã›ã‚“。何ã‹ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„。",
@@ -86,7 +88,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." => "ファイルをスã‚ャンã—ã¦ã„ã¾ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„。",
-"Current scanning" => "スã‚ャンä¸"
+"Files are being scanned, please wait." => "ファイルをスã‚ャンã—ã¦ã„ã¾ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„。"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index d9f5244fa736df165fcb5aacfae014612ae9323e..82f3404cfe8a8db02b9994210186c176c1afa8a3 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -40,19 +40,18 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 is unlimited",
"Maximum input size for ZIP files" => "ZIP ფáƒáƒ˜áƒšáƒ”ბის მáƒáƒ¥áƒ¡áƒ˜áƒ›áƒ£áƒ› დáƒáƒ¡áƒáƒ¨áƒ•áƒ”ბი ზáƒáƒ›áƒ",
"Save" => "შენáƒáƒ®áƒ•áƒ",
+"WebDAV" => "WebDAV",
"New" => "áƒáƒ®áƒáƒšáƒ˜",
"Text file" => "ტექსტური ფáƒáƒ˜áƒšáƒ˜",
"New folder" => "áƒáƒ®áƒáƒšáƒ˜ ფáƒáƒšáƒ“ერი",
"Folder" => "სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე",
"From link" => "მისáƒáƒ›áƒáƒ თიდáƒáƒœ",
-"Deleted files" => "წáƒáƒ¨áƒšáƒ˜áƒšáƒ˜ ფáƒáƒ˜áƒšáƒ”ბი",
"Cancel upload" => "áƒáƒ¢áƒ•áƒ˜áƒ თვის გáƒáƒ£áƒ¥áƒ›áƒ”ბáƒ",
"Nothing in here. Upload something!" => "áƒáƒ¥ áƒáƒ áƒáƒ¤áƒ”რი áƒáƒ áƒáƒ ის. áƒáƒ¢áƒ•áƒ˜áƒ თე რáƒáƒ›áƒ”!",
"Download" => "ჩáƒáƒ›áƒáƒ¢áƒ•áƒ˜áƒ თვáƒ",
"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." => "მიმდინáƒáƒ ეáƒáƒ‘ს ფáƒáƒ˜áƒšáƒ”ბის სკáƒáƒœáƒ˜áƒ ებáƒ, გთხáƒáƒ•áƒ— დáƒáƒ”ლáƒáƒ“áƒáƒ—.",
-"Current scanning" => "მიმდინáƒáƒ ე სკáƒáƒœáƒ˜áƒ ებáƒ"
+"Files are being scanned, please wait." => "მიმდინáƒáƒ ეáƒáƒ‘ს ფáƒáƒ˜áƒšáƒ”ბის სკáƒáƒœáƒ˜áƒ ებáƒ, გთხáƒáƒ•áƒ— დáƒáƒ”ლáƒáƒ“áƒáƒ—."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/km.php b/apps/files/l10n/km.php
index 08b29304c1b402225e12ea1a6188b81da25739de..3cfb33854bc9c2b54c21726a5ef3a488b129e8f4 100644
--- a/apps/files/l10n/km.php
+++ b/apps/files/l10n/km.php
@@ -1,17 +1,37 @@
<?php
$TRANSLATIONS = array(
+"File name cannot be empty." => "ឈ្មោះ​ឯកសារ​មិន​អាច​នៅ​ទទáŸâ€‹áž”ាន​ឡើយ។",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ឈ្មោះ​មិន​ážáŸ’រឹម​ážáŸ’រូវ, មិន​អនុញ្ញាហ'\\', '/', '<', '>', ':', '\"', '|', '?' áž“áž·áž„ '*' áž‘áŸáŸ”",
"Files" => "ឯកសារ",
+"Upload cancelled." => "បាន​បោះបង់​ការ​ផ្ទុក​ឡើង។",
+"{new_name} already exists" => "មាន​ឈ្មោះ {new_name} រួច​ហើយ",
"Share" => "ចែក​រំលែក",
+"Delete permanently" => "លុប​ជា​អចិន្ážáŸ’រៃយáŸ",
+"Rename" => "ប្ដូរ​ឈ្មោះ",
+"Your download is being prepared. This might take some time if the files are big." => "ការ​ទាញយក​របស់​អ្នក​កំពុង​ážáŸ’រូវ​បាន​រៀបចំ​ហើយ។ áž“áŸáŸ‡â€‹áž¢áž¶áž…​ចំណាយ​ពáŸáž›â€‹áž˜áž½áž™â€‹ážŸáŸ†áž‘ុះ ប្រសិន​បើ​ឯកសារ​ធំ។",
+"Pending" => "កំពុង​រង់ចាំ",
"Error" => "កំហុស",
"Name" => "ឈ្មោះ",
"Size" => "ទំហំ",
+"Modified" => "បាន​កែ​ប្រែ",
"_%n folder_::_%n folders_" => array(""),
"_%n file_::_%n files_" => array(""),
"_Uploading %n file_::_Uploading %n files_" => array(""),
+"Maximum upload size" => "ទំហំ​ផ្ទុកឡើង​ជា​អážáž·áž”រមា",
+"Enable ZIP-download" => "បើក​ការ​ទាញយក​ជា ZIP",
+"0 is unlimited" => "0 គឺ​មិន​កំណážáŸ‹",
+"Maximum input size for ZIP files" => "ទំហំ​ចូល​ជា​អážáž·áž”រមា​សម្រាប់​ឯកសារ ZIP",
"Save" => "រក្សាទុក",
+"WebDAV" => "WebDAV",
+"New" => "ážáŸ’មី",
+"Text file" => "ឯកសារ​អក្សរ",
"New folder" => "ážážâ€‹ážáŸ’មី",
"Folder" => "ážáž",
+"From link" => "ពី​ážáŸ†ážŽ",
+"Cancel upload" => "បោះបង់​ការ​ផ្ទុកឡើង",
+"Nothing in here. Upload something!" => "គ្មាន​អ្វី​នៅ​ទីនáŸáŸ‡â€‹áž‘áŸáŸ” ផ្ទុក​ឡើង​អ្វី​មួយ!",
"Download" => "ទាញយក",
-"Delete" => "លុប"
+"Delete" => "លុប",
+"Upload too large" => "ផ្ទុក​ឡើង​ធំ​ពáŸáž€"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index bfb69bb4445a85b4fa4777889449e4712aa2e42c..1caab50ecf21b376e16dc9c148834a2660985592 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -65,13 +65,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0ì€ ë¬´ì œí•œìž…ë‹ˆë‹¤",
"Maximum input size for ZIP files" => "ZIP íŒŒì¼ ìµœëŒ€ í¬ê¸°",
"Save" => "ì €ìž¥",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "WebDAVë¡œ 파ì¼ì— ì ‘ê·¼í•˜ë ¤ë©´ <a href=\"%s\" target=\"_blank\">ì´ ì£¼ì†Œë¥¼ 사용하ì‹ì‹œì˜¤</a>",
"New" => "새로 만들기",
"New text file" => "새 í…스트 파ì¼",
"Text file" => "í…스트 파ì¼",
"New folder" => "새 í´ë”",
"Folder" => "í´ë”",
"From link" => "ë§í¬ì—ì„œ",
-"Deleted files" => "ì‚ì œëœ íŒŒì¼",
"Cancel upload" => "업로드 취소",
"You don’t have permission to upload or create files here" => "ì—¬ê¸°ì— íŒŒì¼ì„ 업로드하거나 만들 ê¶Œí•œì´ ì—†ìŠµë‹ˆë‹¤",
"Nothing in here. Upload something!" => "ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤. ì—…ë¡œë“œí• ìˆ˜ 있습니다!",
@@ -79,7 +80,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." => "파ì¼ì„ ê²€ìƒ‰í•˜ê³ ìžˆìŠµë‹ˆë‹¤. ê¸°ë‹¤ë ¤ 주ì‹ì‹œì˜¤.",
-"Current scanning" => "현재 검색"
+"Files are being scanned, please wait." => "파ì¼ì„ ê²€ìƒ‰í•˜ê³ ìžˆìŠµë‹ˆë‹¤. ê¸°ë‹¤ë ¤ 주ì‹ì‹œì˜¤."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index b742be43c35e6ee90e92f4b414869306d1699c69..95efe7e1be72629d0b1e80d308e84383c7a1ee97 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -35,7 +35,6 @@ $TRANSLATIONS = array(
"Delete" => "Läschen",
"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"
+"Files are being scanned, please wait." => "Fichieren gi gescannt, war weg."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index b2055162d98458046420c40839056aaefca5c5b2..0204f7e80a8e94c3b5aa86697540e38699d6f154 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -65,13 +65,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 yra neribotas",
"Maximum input size for ZIP files" => "Maksimalus ZIP archyvo failo dydis",
"Save" => "IÅ¡saugoti",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Naudokite šį adresą, kad <a href=\"%s\" target=\"_blank\">pasiektumėte savo failus per WebDAV</a>",
"New" => "Naujas",
"New text file" => "Naujas tekstinis failas",
"Text file" => "Teksto failas",
"New folder" => "Naujas aplankas",
"Folder" => "Katalogas",
"From link" => "IÅ¡ nuorodos",
-"Deleted files" => "IÅ¡trinti failai",
"Cancel upload" => "Atšaukti siuntimą",
"You don’t have permission to upload or create files here" => "JÅ«s neturite leidimo Äia įkelti arba kurti failus",
"Nothing in here. Upload something!" => "ÄŒia tuÅ¡Äia. Ä®kelkite kÄ… nors!",
@@ -79,7 +80,6 @@ $TRANSLATIONS = array(
"Delete" => "IÅ¡trinti",
"Upload too large" => "Įkėlimui failas per didelis",
"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"
+"Files are being scanned, please wait." => "Skenuojami failai, prašome palaukti."
);
$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 c5a9b9338a7494b606a715888b67f8227f26f1de..8eb939a2789efbf4379637c73a0143807a1003a0 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -44,19 +44,18 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 ir neierobežots",
"Maximum input size for ZIP files" => "MaksimÄlais ievades izmÄ“rs ZIP datnÄ“m",
"Save" => "SaglabÄt",
+"WebDAV" => "WebDAV",
"New" => "Jauna",
"Text file" => "Teksta datne",
"New folder" => "Jauna mape",
"Folder" => "Mape",
"From link" => "No saites",
-"Deleted files" => "DzÄ“stÄs datnes",
"Cancel upload" => "Atcelt augÅ¡upielÄdi",
"Nothing in here. Upload something!" => "Te vÄ“l nekas nav. RÄ«kojies, sÄc augÅ¡upielÄdÄ“t!",
"Download" => "LejupielÄdÄ“t",
"Delete" => "Dzēst",
"Upload too large" => "Datne ir par lielu, lai to augÅ¡upielÄdÄ“tu",
"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"
+"Files are being scanned, please wait." => "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet."
);
$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 4a1f16c7921af3a3c5c2485c6799cab65ec4391b..d006b2e8dde060e00f925a4ead3d17014e6ffa22 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -56,18 +56,17 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 е неограничено",
"Maximum input size for ZIP files" => "МакÑимална големина за Ð²Ð½ÐµÑ Ð½Ð° ZIP датотеки",
"Save" => "Сними",
+"WebDAV" => "WebDAV",
"New" => "Ðово",
"Text file" => "ТекÑтуална датотека",
"Folder" => "Папка",
"From link" => "Од врÑка",
-"Deleted files" => "Избришани датотеки",
"Cancel upload" => "Откажи прикачување",
"Nothing in here. Upload something!" => "Тука нема ништо. Снимете нешто!",
"Download" => "Преземи",
"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." => "Се Ñкенираат датотеки, ве молам почекајте.",
-"Current scanning" => "Моментално Ñкенирам"
+"Files are being scanned, please wait." => "Се Ñкенираат датотеки, ве молам почекајте."
);
$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 81d3de6299e4f8b87a56fcfcd03738b82897f8b1..e3fee81a15848790770393007a60e016356d2c46 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -36,7 +36,6 @@ $TRANSLATIONS = array(
"Delete" => "Padam",
"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"
+"Files are being scanned, please wait." => "Fail sedang diimbas, harap bersabar."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 80b706dd5368d28c9516428d1ceaefd165069b73..a9f92214c3d85ad62ae7634ff5d3f1f8cc3527e5 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -3,7 +3,9 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Kan ikke flytte %s - En fil med samme navn finnes allerede",
"Could not move %s" => "Kunne ikke flytte %s",
"File name cannot be empty." => "Filnavn kan ikke være tomt.",
+"\"%s\" is an invalid file name." => "\"%s\" er et ugyldig filnavn.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
+"The target folder has been moved or deleted." => "MÃ¥lmappen er blitt flyttet eller slettet.",
"The name %s is already used in the folder %s. Please choose a different name." => "Navnet %s brukes allerede i mappen %s. Velg et annet navn.",
"Not a valid source" => "Ikke en gyldig kilde",
"Server is not allowed to open URLs, please check the server configuration" => "Serveren har ikke lov til å åpne URL-er. Sjekk konfigurasjon av server",
@@ -26,7 +28,10 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "Opplasting feilet. Klarte ikke å finne informasjon om fil.",
"Invalid directory." => "Ugyldig katalog.",
"Files" => "Filer",
+"All files" => "Alle filer",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kan ikke laste opp {filename} fordi det er en mappe eller har 0 bytes",
+"Total file size {size1} exceeds upload limit {size2}" => "Total filstørrelse {size1} overstiger grense for opplasting {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Ikke nok ledig plass. Du laster opp size1} men bare {size2} er ledig",
"Upload cancelled." => "Opplasting avbrutt.",
"Could not get result from server." => "Fikk ikke resultat fra serveren.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
@@ -37,9 +42,11 @@ $TRANSLATIONS = array(
"Error fetching URL" => "Feil ved henting av URL",
"Share" => "Del",
"Delete permanently" => "Slett permanent",
+"Delete" => "Slett",
"Rename" => "Gi nytt navn",
"Your download is being prepared. This might take some time if the files are big." => "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid.",
"Pending" => "Ventende",
+"Error moving file." => "Feil ved flytting av fil.",
"Error moving file" => "Feil ved flytting av fil",
"Error" => "Feil",
"Could not rename file" => "Klarte ikke å gi nytt navn til fil",
@@ -50,6 +57,7 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
"_%n file_::_%n files_" => array("%n fil","%n filer"),
"_Uploading %n file_::_Uploading %n files_" => array("Laster opp %n fil","Laster opp %n filer"),
+"\"{name}\" is an invalid file name." => "\"{name}\" er et uglydig filnavn.",
"Your storage is full, files can not be updated or synced anymore!" => "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
"Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
@@ -57,6 +65,7 @@ $TRANSLATIONS = array(
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kryptering ble slått av men filene dine er fremdeles kryptert. Gå til dine personlige innstillinger for å dekryptere filene dine.",
"{dirs} and {files}" => "{dirs} og {files}",
"%s could not be renamed" => "Kunne ikke gi nytt navn til %s",
+"Upload (max. %s)" => "Opplasting (maks. %s)",
"File handling" => "Filhåndtering",
"Maximum upload size" => "Maksimum opplastingsstørrelse",
"max. possible: " => "max. mulige:",
@@ -65,21 +74,21 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 er ubegrenset",
"Maximum input size for ZIP files" => "Maksimal størrelse på ZIP-filer",
"Save" => "Lagre",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Bruk denne adressen for å <a href=\"%s\" target=\"_blank\">aksessere filene dine via WebDAV</a>",
"New" => "Ny",
"New text file" => "Ny tekstfil",
"Text file" => "Tekstfil",
"New folder" => "Ny mappe",
"Folder" => "Mappe",
"From link" => "Fra link",
-"Deleted files" => "Slettede filer",
"Cancel upload" => "Avbryt opplasting",
"You don’t have permission to upload or create files here" => "Du har ikke tillatelse til å laste opp eller opprette filer her",
"Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
"Download" => "Last ned",
-"Delete" => "Slett",
"Upload too large" => "Filen er for stor",
"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"
+"Currently scanning" => "Skanner nå"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 6bde1e612d0a738450cc7e21063a9c0477599d07..4c7c73b318ba5b28910e6f416d294f11a87c41b3 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "Upload mislukt, Kon geen bestandsinfo krijgen.",
"Invalid directory." => "Ongeldige directory.",
"Files" => "Bestanden",
+"All files" => "Alle bestanden",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is",
"Total file size {size1} exceeds upload limit {size2}" => "Totale bestandsgrootte {size1} groter dan uploadlimiet {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Niet genoeg vrije ruimte. U upload {size1}, maar is is slechts {size2} beschikbaar",
@@ -41,6 +42,7 @@ $TRANSLATIONS = array(
"Error fetching URL" => "Fout bij ophalen URL",
"Share" => "Delen",
"Delete permanently" => "Verwijder definitief",
+"Delete" => "Verwijder",
"Rename" => "Hernoem",
"Your download is being prepared. This might take some time if the files are big." => "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden.",
"Pending" => "In behandeling",
@@ -72,21 +74,21 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 is ongelimiteerd",
"Maximum input size for ZIP files" => "Maximale grootte voor ZIP bestanden",
"Save" => "Bewaren",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Gebruik deze link <a href=\"%s\" target=\"_blank\">om uw bestanden via WebDAV te benaderen</a>",
"New" => "Nieuw",
"New text file" => "Nieuw tekstbestand",
"Text file" => "Tekstbestand",
"New folder" => "Nieuwe map",
"Folder" => "Map",
"From link" => "Vanaf link",
-"Deleted files" => "Verwijderde bestanden",
"Cancel upload" => "Upload afbreken",
"You don’t have permission to upload or create files here" => "U hebt geen toestemming om hier te uploaden of bestanden te maken",
"Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!",
"Download" => "Downloaden",
-"Delete" => "Verwijder",
"Upload too large" => "Upload is te groot",
"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"
+"Currently scanning" => "Nu aan het scannen"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 238d1459b1adfe00b40595caa94e9144004faba4..3b40cc58f0d41eb2dfa1a1910e4dda6c4c831c41 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -50,19 +50,18 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 er ubegrensa",
"Maximum input size for ZIP files" => "Maksimal storleik for ZIP-filer",
"Save" => "Lagre",
+"WebDAV" => "WebDAV",
"New" => "Ny",
"Text file" => "Tekst fil",
"New folder" => "Ny mappe",
"Folder" => "Mappe",
"From link" => "Frå lenkje",
-"Deleted files" => "Sletta filer",
"Cancel upload" => "Avbryt opplasting",
"Nothing in here. Upload something!" => "Ingenting her. Last noko opp!",
"Download" => "Last ned",
"Delete" => "Slett",
"Upload too large" => "For stor opplasting",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.",
-"Files are being scanned, please wait." => "Skannar filer, ver venleg og vent.",
-"Current scanning" => "Køyrande skanning"
+"Files are being scanned, please wait." => "Skannar filer, ver venleg og vent."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
index 3683ae433a67515633b8faa225188ed59046d575..d72d496f29a065478970fcc4b83fcce9647ea2d9 100644
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@@ -36,7 +36,6 @@ $TRANSLATIONS = array(
"Delete" => "Escafa",
"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"
+"Files are being scanned, please wait." => "Los fiichièrs son a èsser explorats, "
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index fa9c7911443bfad08cb8bd341dbea25624845b22..aaa1b18737cc4ceb4ff2de5effdd5a80f55e4f4b 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "Nieudane przesłanie. Nie można pobrać informacji o pliku.",
"Invalid directory." => "Zła ścieżka.",
"Files" => "Pliki",
+"All files" => "Wszystkie pliki",
"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",
"Total file size {size1} exceeds upload limit {size2}" => "Całkowity rozmiar {size1} przekracza limit uploadu {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Brak wolnej przestrzeni, przesyłasz {size1} a pozostało tylko {size2}",
@@ -72,13 +73,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 - bez limitów",
"Maximum input size for ZIP files" => "Maksymalna wielkość pliku wejściowego ZIP ",
"Save" => "Zapisz",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Użyj tego adresu do <a href=\"%s\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>",
"New" => "Nowy",
"New text file" => "Nowy plik tekstowy",
"Text file" => "Plik tekstowy",
"New folder" => "Nowy folder",
"Folder" => "Folder",
"From link" => "Z odnośnika",
-"Deleted files" => "Pliki usunięte",
"Cancel upload" => "Anuluj wysyłanie",
"You don’t have permission to upload or create files here" => "Nie masz uprawnień do wczytywania lub tworzenia plików w tym miejscu",
"Nothing in here. Upload something!" => "Pusto. Wyślij coś!",
@@ -87,6 +89,6 @@ $TRANSLATIONS = array(
"Upload too large" => "Åadowany plik jest za duży",
"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"
+"Currently scanning" => "Aktualnie skanowane"
);
$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 5e0399bc4e2c3c35977570549aaf919f065816b4..3b3fedaeb12719deeb6adcf4d3ab7097bcdf36e4 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -1,6 +1,6 @@
<?php
$TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "ImpossÃvel mover %s - Um arquivo com este nome já existe",
+"Could not move %s - File with this name already exists" => "ImpossÃvel mover %s - Já existe um arquivo com esse nome",
"Could not move %s" => "ImpossÃvel mover %s",
"File name cannot be empty." => "O nome do arquivo não pode estar vazio.",
"\"%s\" is an invalid file name." => "\"%s\" é um nome de arquivo inválido.",
@@ -8,7 +8,7 @@ $TRANSLATIONS = array(
"The target folder has been moved or deleted." => "A pasta de destino foi movida ou excluÃda.",
"The name %s is already used in the folder %s. Please choose a different name." => "O nome %s já é usado na pasta %s. Por favor, escolha um nome diferente.",
"Not a valid source" => "Não é uma fonte válida",
-"Server is not allowed to open URLs, please check the server configuration" => "Não é permitido ao servidor abrir URLs, por favor verificar a configuração do servidor.",
+"Server is not allowed to open URLs, please check the server configuration" => "O servidor não tem permissão para abrir URLs. Por favor, verifique a configuração do servidor.",
"Error while downloading %s to %s" => "Erro ao baixar %s para %s",
"Error when creating the file" => "Erro ao criar o arquivo",
"Folder name cannot be empty." => "O nome da pasta não pode estar vazio.",
@@ -28,8 +28,9 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "Falha no envio. Não foi possÃvel obter informações do arquivo.",
"Invalid directory." => "Diretório inválido.",
"Files" => "Arquivos",
+"All files" => "Todos os arquivos",
"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",
-"Total file size {size1} exceeds upload limit {size2}" => "Tamanho total do arquivo {size1} excede limite de envio {size2}",
+"Total file size {size1} exceeds upload limit {size2}" => "O tamanho total do arquivo {size1} excede o limite de envio {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Não há espaço suficiente, você está enviando {size1} mas resta apenas {size2}",
"Upload cancelled." => "Envio cancelado.",
"Could not get result from server." => "Não foi possÃvel obter o resultado do servidor.",
@@ -72,21 +73,22 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 para ilimitado",
"Maximum input size for ZIP files" => "Tamanho máximo para arquivo ZIP",
"Save" => "Guardar",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso aos seus Arquivos via WebDAV</a>",
"New" => "Novo",
"New text file" => "Novo arquivo texto",
"Text file" => "Arquivo texto",
"New folder" => "Nova pasta",
"Folder" => "Pasta",
"From link" => "Do link",
-"Deleted files" => "Arquivos apagados",
"Cancel upload" => "Cancelar upload",
"You don’t have permission to upload or create files here" => "Você não tem permissão para carregar ou criar arquivos aqui",
-"Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
+"Nothing in here. Upload something!" => "Nada aqui. Carrege alguma coisa!",
"Download" => "Baixar",
"Delete" => "Excluir",
"Upload too large" => "Upload muito grande",
"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"
+"Currently scanning" => "Atualmente escaneando"
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index c6d2767fb81f9ec5d20a39e6ca4e1b5f07fced17..5ba460730843fc679fa83516250fb0212ebce4d9 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -3,7 +3,9 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Não pôde mover o ficheiro %s - Já existe um ficheiro com esse nome",
"Could not move %s" => "Não foi possÃvel move o ficheiro %s",
"File name cannot be empty." => "O nome do ficheiro não pode estar vazio.",
+"\"%s\" is an invalid file name." => "\"%s\" é um nome de ficheiro inválido.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
+"The target folder has been moved or deleted." => "A pasta de destino foi movida ou eliminada.",
"The name %s is already used in the folder %s. Please choose a different name." => "O nome %s já está em uso na pasta %s. Por favor escolha um nome diferente.",
"Not a valid source" => "Não é uma fonte válida",
"Server is not allowed to open URLs, please check the server configuration" => "O servidor não consegue abrir URLs, por favor verifique a configuração do servidor",
@@ -26,7 +28,10 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "O carregamento falhou. Não foi possÃvel obter a informação do ficheiro.",
"Invalid directory." => "Directório Inválido",
"Files" => "Ficheiros",
+"All files" => "Todos os ficheiros",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes",
+"Total file size {size1} exceeds upload limit {size2}" => "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponÃvel",
"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." => "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora.",
@@ -37,9 +42,11 @@ $TRANSLATIONS = array(
"Error fetching URL" => "Erro ao obter URL",
"Share" => "Partilhar",
"Delete permanently" => "Eliminar permanentemente",
+"Delete" => "Eliminar",
"Rename" => "Renomear",
"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.",
"Pending" => "Pendente",
+"Error moving file." => "Erro a mover o ficheiro.",
"Error moving file" => "Erro ao mover o ficheiro",
"Error" => "Erro",
"Could not rename file" => "Não pôde renomear o ficheiro",
@@ -50,6 +57,7 @@ $TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("%n pasta","%n pastas"),
"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
"_Uploading %n file_::_Uploading %n files_" => array("A carregar %n ficheiro","A carregar %n ficheiros"),
+"\"{name}\" is an invalid file name." => "\"{name}\" é um nome de ficheiro inválido.",
"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 App is enabled but your keys are not initialized, please log-out and log-in again" => "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
@@ -57,6 +65,7 @@ $TRANSLATIONS = array(
"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.",
"{dirs} and {files}" => "{dirs} e {files}",
"%s could not be renamed" => "%s não pode ser renomeada",
+"Upload (max. %s)" => "Enviar (max. %s)",
"File handling" => "Manuseamento de ficheiros",
"Maximum upload size" => "Tamanho máximo de envio",
"max. possible: " => "max. possivel: ",
@@ -65,21 +74,21 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 é ilimitado",
"Maximum input size for ZIP files" => "Tamanho máximo para ficheiros ZIP",
"Save" => "Guardar",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>",
"New" => "Novo",
"New text file" => "Novo ficheiro de texto",
"Text file" => "Ficheiro de texto",
"New folder" => "Nova Pasta",
"Folder" => "Pasta",
"From link" => "Da ligação",
-"Deleted files" => "Ficheiros eliminados",
"Cancel upload" => "Cancelar envio",
"You don’t have permission to upload or create files here" => "Você não tem permissão para enviar ou criar ficheiros aqui",
"Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
"Download" => "Transferir",
-"Delete" => "Eliminar",
"Upload too large" => "Upload muito grande",
"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"
+"Currently scanning" => "A analisar"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index c36ba11fc0c5f6a01294c8de934b9baa085649a4..8bfde7b1f332c0b4c59bba4720d8a77166a4927d 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -72,13 +72,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 este nelimitat",
"Maximum input size for ZIP files" => "Dimensiunea maximă de intrare pentru fișierele ZIP",
"Save" => "Salvează",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Folosește această adresă <a href=\"%s\" target=\"_blank\">pentru acces la fișierele tale folosind WebDAV</a>",
"New" => "Nou",
"New text file" => "Un nou fișier text",
"Text file" => "Fișier text",
"New folder" => "Un nou dosar",
"Folder" => "Dosar",
"From link" => "De la adresa",
-"Deleted files" => "Fișiere șterse",
"Cancel upload" => "Anulează încărcarea",
"You don’t have permission to upload or create files here" => "Nu aveti permisiunea de a incarca sau crea fisiere aici",
"Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!",
@@ -86,7 +87,6 @@ $TRANSLATIONS = array(
"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șierele pe care încerci să le încarci depășesc limita de încărcare maximă admisă pe acest server.",
-"Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteaptă.",
-"Current scanning" => "ÃŽn curs de scanare"
+"Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteaptă."
);
$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 181e063e6067d110efef1cb0f840a01100e6f31b..f24744223ee5b87e198d0b0742aeb1d08a81999c 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "Загрузка не удалаÑÑŒ. Ðевозможно получить информацию о файле",
"Invalid directory." => "Ðеверный каталог.",
"Files" => "Файлы",
+"All files" => "Ð’Ñе файлы",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Ðевозможно загрузить {filename}, так как Ñто либо каталог, либо файл нулевого размера",
"Total file size {size1} exceeds upload limit {size2}" => "Полный размер файла {size1} превышает лимит по загрузке {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Ðе доÑтаточно Ñвободного меÑта, Ð’Ñ‹ загружаете {size1} но оÑталоÑÑŒ только {size2}",
@@ -41,9 +42,11 @@ $TRANSLATIONS = array(
"Error fetching URL" => "Ошибка Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ URL",
"Share" => "Открыть доÑтуп",
"Delete permanently" => "Удалить окончательно",
+"Delete" => "Удалить",
"Rename" => "Переименовать",
"Your download is being prepared. This might take some time if the files are big." => "Идёт подготовка к Ñкачиванию. Ðто может занÑÑ‚ÑŒ некоторое времÑ, еÑли файлы большого размера.",
"Pending" => "Ожидание",
+"Error moving file." => "Ошибка Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð°.",
"Error moving file" => "Ошибка при перемещении файла",
"Error" => "Ошибка",
"Could not rename file" => "Ðе удалоÑÑŒ переименовать файл",
@@ -71,21 +74,21 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 - без ограничений",
"Maximum input size for ZIP files" => "МакÑимальный иÑходный размер Ð´Ð»Ñ ZIP файлов",
"Save" => "Сохранить",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "ИÑпользуйте Ñтот адреÑÑ Ð´Ð»Ñ <a href=\"%s\" target=\"_blank\">доÑтупа к вашим файлам через WebDAV</a>",
"New" => "Ðовый",
"New text file" => "Ðовый текÑтовый файл",
"Text file" => "ТекÑтовый файл",
"New folder" => "Ðовый каталог",
"Folder" => "Каталог",
"From link" => "Объект по ÑÑылке",
-"Deleted files" => "Удалённые файлы",
"Cancel upload" => "Отменить загрузку",
"You don’t have permission to upload or create files here" => "У Ð²Ð°Ñ Ð½ÐµÑ‚ прав Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ или ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² здеÑÑŒ.",
"Nothing in here. Upload something!" => "ЗдеÑÑŒ ничего нет. Загрузите что-нибудь!",
"Download" => "Скачать",
-"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." => "Подождите, файлы ÑканируютÑÑ.",
-"Current scanning" => "Текущее Ñканирование"
+"Currently scanning" => "Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ ÑканируетÑÑ"
);
$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 e8d2a8a53c8e8932cbc3adad2ee94c7ecab2abb4..59b720e710076274befb3b2c928cf437e80a11c9 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -37,7 +37,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." => "ගොනු පරික්ෂ෠කෙරේ. මඳක් රà·à¶³à·“ සිටින්න",
-"Current scanning" => "වර්à¶à¶¸à·à¶± පරික්ෂà·à·€"
+"Files are being scanned, please wait." => "ගොනු පරික්ෂ෠කෙරේ. මඳක් රà·à¶³à·“ සිටින්න"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 66f1c616e4f2a5329b835c75ef8fc9750567335c..343e53e5acdfe15ef48dc97bbd811c2dbafb3ffc 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -71,13 +71,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 znamená neobmedzené",
"Maximum input size for ZIP files" => "NajväÄÅ¡ia veľkosÅ¥ ZIP súborov",
"Save" => "Uložiť",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prÃstup k vaÅ¡im súborom cez WebDAV</a>",
"New" => "Nový",
"New text file" => "Nový textový súbor",
"Text file" => "Textový súbor",
"New folder" => "Nový prieÄinok",
"Folder" => "PrieÄinok",
"From link" => "Z odkazu",
-"Deleted files" => "Zmazané súbory",
"Cancel upload" => "Zrušiť odosielanie",
"You don’t have permission to upload or create files here" => "Nemáte oprávnenie sem nahrávať alebo vytvoriť súbory",
"Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte nieÄo!",
@@ -85,7 +86,6 @@ $TRANSLATIONS = array(
"Delete" => "Zmazať",
"Upload too large" => "Nahrávanie je prÃliÅ¡ veľké",
"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é"
+"Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané."
);
$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 90b18f632c3f5bac89dabaf952a9812cafe234ec..ca7590263e970178bdad11d0e6b0e4006f9a44d6 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -72,13 +72,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 predstavlja neomejeno vrednost",
"Maximum input size for ZIP files" => "NajveÄja vhodna velikost za datoteke ZIP",
"Save" => "Shrani",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek rpeko sistema WebDAV</a>.",
"New" => "Novo",
"New text file" => "Nova besedilna datoteka",
"Text file" => "Besedilna datoteka",
"New folder" => "Nova mapa",
"Folder" => "Mapa",
"From link" => "Iz povezave",
-"Deleted files" => "Izbrisane datoteke",
"Cancel upload" => "PrekliÄi poÅ¡iljanje",
"You don’t have permission to upload or create files here" => "Ni ustreznih dovoljenj za pošiljanje ali ustvarjanje datotek na tem mestu.",
"Nothing in here. Upload something!" => "Tukaj Å¡e ni niÄesar. Najprej je treba kakÅ¡no datoteko poslati v oblak!",
@@ -86,7 +87,6 @@ $TRANSLATIONS = array(
"Delete" => "Izbriši",
"Upload too large" => "PrekoraÄenje omejitve velikosti",
"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"
+"Files are being scanned, please wait." => "Poteka preuÄevanje datotek, poÄakajte ..."
);
$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 d246fdd6d64b997db3f368f26a09b81ef466d85e..d872dfc284b656386d9811639dbdda4ce5578be3 100644
--- a/apps/files/l10n/sq.php
+++ b/apps/files/l10n/sq.php
@@ -48,19 +48,18 @@ $TRANSLATIONS = array(
"0 is unlimited" => "o është pa limit",
"Maximum input size for ZIP files" => "Maksimumi hyrës i skedarëve ZIP",
"Save" => "Ruaj",
+"WebDAV" => "WebDAV",
"New" => "E re",
"Text file" => "Skedar tekst",
"New folder" => "Dosje e're",
"Folder" => "Dosje",
"From link" => "Nga lidhja",
-"Deleted files" => "Skedarë të fshirë ",
"Cancel upload" => "Anullo ngarkimin",
"Nothing in here. Upload something!" => "Këtu nuk ka asgje. Ngarko dicka",
"Download" => "Shkarko",
"Delete" => "Fshi",
"Upload too large" => "Ngarkimi shumë i madh",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Skedarët që po mundoheni të ngarkoni e tejkalojnë madhësinë maksimale të lejuar nga serveri.",
-"Files are being scanned, please wait." => "Skanerizimi i skedarit në proces. Ju lutem prisni.",
-"Current scanning" => "Skanimi aktual"
+"Files are being scanned, please wait." => "Skanerizimi i skedarit në proces. Ju lutem prisni."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index 4cb50b318c2e5b8d8318a1f9a32968045376e171..b58bc90c35b59843b039835d59f404d0c48f153a 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -40,18 +40,17 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 је неограничено",
"Maximum input size for ZIP files" => "Ðајвећа величина ZIP датотека",
"Save" => "Сачувај",
+"WebDAV" => "WebDAV",
"New" => "Ðова",
"Text file" => "текÑтуална датотека",
"Folder" => "фаÑцикла",
"From link" => "Са везе",
-"Deleted files" => "ОбриÑане датотеке",
"Cancel upload" => "Прекини отпремање",
"Nothing in here. Upload something!" => "Овде нема ничег. Отпремите нешто!",
"Download" => "Преузми",
"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." => "Скенирам датотеке…",
-"Current scanning" => "Тренутно Ñкенирање"
+"Files are being scanned, please wait." => "Скенирам датотеке…"
);
$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/sv.php b/apps/files/l10n/sv.php
index 8908be66d3e45dd9baaf013c2bc8601096132944..3a69acf7296ff5f4f4f904fff3f009673de91c65 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "Uppladdning misslyckades. Gick inte att hämta filinformation.",
"Invalid directory." => "Felaktig mapp.",
"Files" => "Filer",
+"All files" => "Alla filer",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller har 0 bytes.",
"Total file size {size1} exceeds upload limit {size2}" => "Totala filstorleken {size1} överskrider uppladdningsgränsen {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Inte tillräckligt med ledigt utrymme, du laddar upp {size1} men endast {size2} finns kvar.",
@@ -44,6 +45,7 @@ $TRANSLATIONS = array(
"Rename" => "Byt namn",
"Your download is being prepared. This might take some time if the files are big." => "Din nedladdning förbereds. Det kan ta tid om det är stora filer.",
"Pending" => "Väntar",
+"Error moving file." => "Fel vid flytt av fil.",
"Error moving file" => "Fel uppstod vid flyttning av fil",
"Error" => "Fel",
"Could not rename file" => "Kan ej byta filnamn",
@@ -71,13 +73,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 är oändligt",
"Maximum input size for ZIP files" => "Största tillåtna storlek för ZIP-filer",
"Save" => "Spara",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Använd denna adress till <a href=\"%s\" target=\"_blank\">nå dina Filer via WebDAV</a>",
"New" => "Ny",
"New text file" => "Ny textfil",
"Text file" => "Textfil",
"New folder" => "Ny mapp",
"Folder" => "Mapp",
"From link" => "Från länk",
-"Deleted files" => "Raderade filer",
"Cancel upload" => "Avbryt uppladdning",
"You don’t have permission to upload or create files here" => "Du har ej tillåtelse att ladda upp eller skapa filer här",
"Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!",
@@ -86,6 +89,6 @@ $TRANSLATIONS = array(
"Upload too large" => "För stor uppladdning",
"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"
+"Currently scanning" => "sökning pågår"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index bba3ce994220ebd10661663e81da94f9c2dfddc4..dd7b55b58c6be1977c80a9438c61daf52f600a58 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -40,7 +40,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." => "கோபà¯à®ªà¯à®•à®³à¯ வரà¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®©, தயவà¯à®šà¯†à®¯à¯à®¤à¯ காதà¯à®¤à®¿à®°à¯à®™à¯à®•à®³à¯.",
-"Current scanning" => "தறà¯à®ªà¯‹à®¤à¯ வரà¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®ªà®µà¯ˆ"
+"Files are being scanned, please wait." => "கோபà¯à®ªà¯à®•à®³à¯ வரà¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®©, தயவà¯à®šà¯†à®¯à¯à®¤à¯ காதà¯à®¤à®¿à®°à¯à®™à¯à®•à®³à¯."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 63714471104bbc39a64c49dbf8de360b2664a23a..15cf39b96cc94ca09380b72fe42f531690adb129 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -39,6 +39,7 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 หมายถึงไม่จำà¸à¸±à¸”",
"Maximum input size for ZIP files" => "ขนาดไฟล์ ZIP สูงสุด",
"Save" => "บันทึà¸",
+"WebDAV" => "WebDAV",
"New" => "à¸à¸±à¸žà¹‚หลดไฟล์ใหม่",
"Text file" => "ไฟล์ข้à¸à¸„วาม",
"New folder" => "โฟลเดà¸à¸£à¹Œà¹ƒà¸«à¸¡à¹ˆ",
@@ -50,7 +51,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." => "ไฟล์à¸à¸³à¸¥à¸±à¸‡à¸à¸¢à¸¹à¹ˆà¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸à¸²à¸£à¸ªà¹à¸à¸™, à¸à¸£à¸¸à¸“ารà¸à¸ªà¸±à¸à¸„รู่.",
-"Current scanning" => "ไฟล์ที่à¸à¸³à¸¥à¸±à¸‡à¸ªà¹à¸à¸™à¸à¸¢à¸¹à¹ˆà¸‚ณะนี้"
+"Files are being scanned, please wait." => "ไฟล์à¸à¸³à¸¥à¸±à¸‡à¸à¸¢à¸¹à¹ˆà¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸à¸²à¸£à¸ªà¹à¸à¸™, à¸à¸£à¸¸à¸“ารà¸à¸ªà¸±à¸à¸„รู่."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index a62e0f3eb66ed1dc5a5bbe863b8064624dfce779..775dc4b163718039942760e658fcf27ee4e0ca15 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -3,37 +3,38 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten mevcut",
"Could not move %s" => "%s taşınamadı",
"File name cannot be empty." => "Dosya adı boş olamaz.",
-"\"%s\" is an invalid file name." => "'%s' geçersiz bir dosya adı.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.",
+"\"%s\" is an invalid file name." => "\"%s\" geçersiz bir dosya adı.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Geçersiz isim. '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.",
"The target folder has been moved or deleted." => "Hedef klasör taşındı veya silindi.",
"The name %s is already used in the folder %s. Please choose a different name." => "%s ismi zaten %s klasöründe kullanılıyor. Lütfen farklı bir isim seçin.",
"Not a valid source" => "Geçerli bir kaynak değil",
-"Server is not allowed to open URLs, please check the server configuration" => "Sunucunun adresleri açma izi yok, lütfen sunucu yapılandırmasını denetleyin",
+"Server is not allowed to open URLs, please check the server configuration" => "Sunucunun adresleri açma izni yok, lütfen sunucu yapılandırmasını denetleyin",
"Error while downloading %s to %s" => "%s, %s içine indirilirken hata",
"Error when creating the file" => "Dosya oluÅŸturulurken hata",
"Folder name cannot be empty." => "Klasör adı boş olamaz.",
"Error when creating the folder" => "Klasör oluşturulurken hata",
-"Unable to set upload directory." => "Yükleme dizini tanımlanamadı.",
-"Invalid Token" => "Geçersiz Simge",
+"Unable to set upload directory." => "Yükleme dizini ayarlanamadı.",
+"Invalid Token" => "Geçersiz Belirteç",
"No file was uploaded. Unknown error" => "Dosya yüklenmedi. Bilinmeyen hata",
"There is no error, the file uploaded with success" => "Dosya başarıyla yüklendi, hata oluşmadı",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı:",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor",
-"The uploaded file was only partially uploaded" => "Dosya kısmen karşıya yüklenebildi",
+"The uploaded file was only partially uploaded" => "Dosya karşıya kısmen yüklenebildi",
"No file was uploaded" => "Hiç dosya gönderilmedi",
-"Missing a temporary folder" => "Geçici dizin eksik",
+"Missing a temporary folder" => "Geçici bir dizin eksik",
"Failed to write to disk" => "Diske yazılamadı",
"Not enough storage available" => "Yeterli disk alanı yok",
"Upload failed. Could not find uploaded file" => "Yükleme başarısız. Yüklenen dosya bulunamadı",
"Upload failed. Could not get file info." => "Yükleme başarısız. Dosya bilgisi alınamadı.",
"Invalid directory." => "Geçersiz dizin.",
"Files" => "Dosyalar",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Bir dizin veya 0 bayt olduğundan {filename} yüklenemedi",
+"All files" => "Tüm dosyalar",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "{filename} bir dizin veya 0 bayt olduğundan yüklenemedi",
"Total file size {size1} exceeds upload limit {size2}" => "Toplam dosya boyutu {size1}, {size2} gönderme sınırını aşıyor",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Yeterince boş alan yok. Gönderdiğiniz boyut {size1} ancak {size2} alan mevcut",
"Upload cancelled." => "Yükleme iptal edildi.",
"Could not get result from server." => "Sunucudan sonuç alınamadı.",
-"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.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek.",
"URL cannot be empty" => "URL boÅŸ olamaz",
"{new_name} already exists" => "{new_name} zaten mevcut",
"Could not create file" => "Dosya oluşturulamadı",
@@ -42,7 +43,7 @@ $TRANSLATIONS = array(
"Share" => "PaylaÅŸ",
"Delete permanently" => "Kalıcı olarak sil",
"Rename" => "Yeniden adlandır",
-"Your download is being prepared. This might take some time if the files are big." => "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir.",
+"Your download is being prepared. This might take some time if the files are big." => "İndirme hazırlanıyor. Dosyalar büyük ise bu biraz zaman alabilir.",
"Pending" => "Bekliyor",
"Error moving file." => "Dosya taşıma hatası.",
"Error moving file" => "Dosya taşıma hatası",
@@ -57,36 +58,37 @@ $TRANSLATIONS = array(
"_Uploading %n file_::_Uploading %n files_" => array("%n dosya yükleniyor","%n dosya yükleniyor"),
"\"{name}\" is an invalid file name." => "\"{name}\" geçersiz bir dosya adı.",
"Your storage is full, files can not be updated or synced anymore!" => "Depolama alanınız dolu, artık dosyalar güncellenmeyecek veya eşitlenmeyecek.",
-"Your storage is almost full ({usedSpacePercent}%)" => "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)",
+"Your storage is almost full ({usedSpacePercent}%)" => "Depolama alanınız neredeyse dolu (%{usedSpacePercent})",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Şifreleme Uygulaması için geçersiz özel anahtar. Lütfen şifreli dosyalarınıza erişimi tekrar kazanabilmek için kişisel ayarlarınızdan özel anahtar parolanızı güncelleyin.",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Ş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çin.",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Şifreleme işlemi durduruldu ancak dosyalarınız hala şifreli. Dosyalarınızın şifrelemesini kaldırmak için lütfen kişisel ayarlar kısmına geçin.",
"{dirs} and {files}" => "{dirs} ve {files}",
"%s could not be renamed" => "%s yeniden adlandırılamadı",
"Upload (max. %s)" => "Yükle (azami: %s)",
"File handling" => "Dosya iÅŸlemleri",
-"Maximum upload size" => "Maksimum yükleme boyutu",
+"Maximum upload size" => "Azami yükleme boyutu",
"max. possible: " => "mümkün olan en fazla: ",
"Needed for multi-file and folder downloads." => "Çoklu dosya ve dizin indirmesi için gerekli.",
"Enable ZIP-download" => "ZIP indirmeyi etkinleÅŸtir",
"0 is unlimited" => "0 limitsiz demektir",
"Maximum input size for ZIP files" => "ZIP dosyaları için en fazla girdi boyutu",
"Save" => "Kaydet",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">Dosyalarınıza WebDAV aracılığıyla erişmek için</a> bu adresi kullanın",
"New" => "Yeni",
"New text file" => "Yeni metin dosyası",
"Text file" => "Metin dosyası",
"New folder" => "Yeni klasör",
"Folder" => "Klasör",
"From link" => "Bağlantıdan",
-"Deleted files" => "SilinmiÅŸ dosyalar",
"Cancel upload" => "Yüklemeyi iptal et",
"You don’t have permission to upload or create files here" => "Buraya dosya yükleme veya oluşturma izniniz yok",
"Nothing in here. Upload something!" => "Burada hiçbir şey yok. Bir şeyler yükleyin!",
"Download" => "Ä°ndir",
"Delete" => "Sil",
"Upload too large" => "Yükleme çok büyük",
-"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.",
+"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 azami yükleme boyutunu aşıyor.",
"Files are being scanned, please wait." => "Dosyalar taranıyor, lütfen bekleyin.",
-"Current scanning" => "Güncel tarama"
+"Currently scanning" => "Åžu anda taranan"
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php
index 446852368f30a76b3f015997151c4d9d903b262c..b104f60794763bede78f124e8aadd67ae0f131e4 100644
--- a/apps/files/l10n/ug.php
+++ b/apps/files/l10n/ug.php
@@ -22,11 +22,11 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array(""),
"_Uploading %n file_::_Uploading %n files_" => array(""),
"Save" => "ساقلا",
+"WebDAV" => "WebDAV",
"New" => "ÙŠÛÚÙ‰",
"Text file" => "تÛكىست ھۆججەت",
"New folder" => "ÙŠÛÚÙ‰ قىسقۇچ",
"Folder" => "قىسقۇچ",
-"Deleted files" => "ئۆچۈرۈلگەن ھۆججەتلەر",
"Cancel upload" => "يۈكلەشتىن ۋاز كەچ",
"Nothing in here. Upload something!" => "بۇ جايدا Ú¾ÛÚ†Ù†ÛÙ…Û• يوق. Upload something!",
"Download" => "چۈشۈر",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 8fb578016c75b8d02aba1206cf0307703b4dbaf1..a8657ea90056d8da9469735b9ad8ea2705f2dc38 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -48,19 +48,18 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 є безліміт",
"Maximum input size for ZIP files" => "МакÑимальний розмір завантажуємого ZIP файлу",
"Save" => "Зберегти",
+"WebDAV" => "WebDAV",
"New" => "Створити",
"Text file" => "ТекÑтовий файл",
"New folder" => "Ðова тека",
"Folder" => "Тека",
"From link" => "З поÑиланнÑ",
-"Deleted files" => "Видалено файлів",
"Cancel upload" => "Перервати завантаженнÑ",
"Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
"Download" => "Завантажити",
"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." => "Файли ÑкануютьÑÑ, зачекайте, будь-лаÑка.",
-"Current scanning" => "Поточне ÑкануваннÑ"
+"Files are being scanned, please wait." => "Файли ÑкануютьÑÑ, зачекайте, будь-лаÑка."
);
$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 b9548acde92c17a83f69260c7f9bf7f50dc1cba1..7aa430d7ed594da136b9fe2c480160999842fded 100644
--- a/apps/files/l10n/ur_PK.php
+++ b/apps/files/l10n/ur_PK.php
@@ -1,8 +1,13 @@
<?php
$TRANSLATIONS = array(
+"Share" => "تقسیم",
"Error" => "ایرر",
+"Name" => "اسم",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"Save" => "ØÙظ",
+"Download" => "ڈاؤن لوڈ،",
+"Delete" => "Øذ٠کریں"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index c14f1b7ea0984deff368e0441b50343299730d3a..f1b803a7e2673a1c8f87e9f777f71d517df6a4ae 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -63,13 +63,13 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 là không giới hạn",
"Maximum input size for ZIP files" => "KÃch thÆ°á»›c tối Ä‘a cho các táºp tin ZIP",
"Save" => "LÆ°u",
+"WebDAV" => "WebDAV",
"New" => "Tạo mới",
"New text file" => "File text má»›i",
"Text file" => "Táºp tin văn bản",
"New folder" => "Tạo thư mục",
"Folder" => "Thư mục",
"From link" => "Từ liên kết",
-"Deleted files" => "File đã bị xóa",
"Cancel upload" => "Hủy upload",
"You don’t have permission to upload or create files here" => "Bạn không có quyá»n upload hoặc tạo files ở đây",
"Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên một cái gì đó !",
@@ -77,7 +77,6 @@ $TRANSLATIONS = array(
"Delete" => "Xóa",
"Upload too large" => "Táºp tin tải lên quá lá»›n",
"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"
+"Files are being scanned, please wait." => "Táºp tin Ä‘ang được quét ,vui lòng chá»."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 7f0183e9205a9f797c7f65bf9986ca81feae189c..ae444ee52bd7b98d13d5bd23a156367387d302f1 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -72,13 +72,14 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0 ä¸ºæ— é™åˆ¶",
"Maximum input size for ZIP files" => "ZIP 文件的最大输入大å°",
"Save" => "ä¿å˜",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "ä½¿ç”¨è¿™ä¸ªåœ°å€ <a href=\"%s\" target=\"_blank\">通过 WebDAV 访问您的文件</a>",
"New" => "新建",
"New text file" => "创建文本文件",
"Text file" => "文本文件",
"New folder" => "æ·»åŠ æ–‡ä»¶å¤¹",
"Folder" => "文件夹",
"From link" => "æ¥è‡ªé“¾æŽ¥",
-"Deleted files" => "å·²åˆ é™¤æ–‡ä»¶",
"Cancel upload" => "å–æ¶ˆä¸Šä¼ ",
"You don’t have permission to upload or create files here" => "您没有æƒé™æ¥ä¸Šä¼ 湖州哦和创建文件",
"Nothing in here. Upload something!" => "è¿™é‡Œè¿˜ä»€ä¹ˆéƒ½æ²¡æœ‰ã€‚ä¸Šä¼ äº›ä¸œè¥¿å§ï¼",
@@ -86,7 +87,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." => "文件æ£åœ¨è¢«æ‰«æ，请ç¨å€™ã€‚",
-"Current scanning" => "当å‰æ‰«æ"
+"Files are being scanned, please wait." => "文件æ£åœ¨è¢«æ‰«æ，请ç¨å€™ã€‚"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 7b4caf592a088f90fe235767eec3284c9479953d..bfdeb6fe127812197aded491f8b808739ff35b24 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -62,12 +62,13 @@ $TRANSLATIONS = array(
"0 is unlimited" => "0代表沒有é™åˆ¶",
"Maximum input size for ZIP files" => "ZIP 壓縮å‰çš„原始大å°é™åˆ¶",
"Save" => "儲å˜",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "使用這個地å€<a href=\"%s\" target=\"_blank\">來é€éŽ WebDAV å˜å–檔案</a>",
"New" => "新增",
"Text file" => "æ–‡å—檔",
"New folder" => "新資料夾",
"Folder" => "資料夾",
"From link" => "從連çµ",
-"Deleted files" => "回收桶",
"Cancel upload" => "å–消上傳",
"You don’t have permission to upload or create files here" => "您沒有權é™åœ¨é€™è£¡ä¸Šå‚³æˆ–建立檔案",
"Nothing in here. Upload something!" => "這裡還沒有æ±è¥¿ï¼Œä¸Šå‚³ä¸€äº›å§ï¼",
@@ -75,7 +76,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." => "æ£åœ¨æŽƒæ檔案，請ç¨ç‰ã€‚",
-"Current scanning" => "æ£åœ¨æŽƒæ"
+"Files are being scanned, please wait." => "æ£åœ¨æŽƒæ檔案，請ç¨ç‰ã€‚"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/lib/app.php b/apps/files/lib/app.php
index ed4aa32c66246bb0058f1a76d94b6c7c392d6c4a..e32225d06805451ae98c85f8d2873182e5942a71 100644
--- a/apps/files/lib/app.php
+++ b/apps/files/lib/app.php
@@ -30,6 +30,11 @@ class App {
*/
private $l10n;
+ /**
+ * @var \OCP\INavigationManager
+ */
+ private static $navigationManager;
+
/**
* @var \OC\Files\View
*/
@@ -40,6 +45,18 @@ class App {
$this->l10n = $l10n;
}
+ /**
+ * Returns the app's navigation manager
+ *
+ * @return \OCP\INavigationManager
+ */
+ public static function getNavigationManager() {
+ if (self::$navigationManager === null) {
+ self::$navigationManager = new \OC\NavigationManager();
+ }
+ return self::$navigationManager;
+ }
+
/**
* rename a file
*
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index 0ae87d12fbfb3974a90b47bd388dcc30ef096a5c..7d8906e22514b9f9383685519839a7a7682c2250 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -1,7 +1,16 @@
<?php
+/**
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
namespace OCA\Files;
+/**
+ * Helper class for manipulating file information
+ */
class Helper
{
public static function buildFileStorageStatistics($dir) {
@@ -9,12 +18,12 @@ class Helper
$storageInfo = \OC_Helper::getStorageInfo($dir);
$l = new \OC_L10N('files');
- $maxUploadFilesize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
- $maxHumanFilesize = \OCP\Util::humanFileSize($maxUploadFilesize);
- $maxHumanFilesize = $l->t('Upload (max. %s)', array($maxHumanFilesize));
+ $maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
+ $maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize);
+ $maxHumanFileSize = $l->t('Upload (max. %s)', array($maxHumanFileSize));
- return array('uploadMaxFilesize' => $maxUploadFilesize,
- 'maxHumanFilesize' => $maxHumanFilesize,
+ return array('uploadMaxFilesize' => $maxUploadFileSize,
+ 'maxHumanFilesize' => $maxHumanFileSize,
'freeSpace' => $storageInfo['free'],
'usedSpacePercent' => (int)$storageInfo['relative']);
}
@@ -27,20 +36,11 @@ class Helper
*/
public static function determineIcon($file) {
if($file['type'] === 'dir') {
- $dir = $file['directory'];
$icon = \OC_Helper::mimetypeIcon('dir');
- $absPath = $file->getPath();
- $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') {
- $icon = \OC_Helper::mimetypeIcon('dir-shared');
- } elseif ($sid[0] !== 'local' and $sid[0] !== 'home') {
- $icon = \OC_Helper::mimetypeIcon('dir-external');
- }
- }
+ if ($file->isShared()) {
+ $icon = \OC_Helper::mimetypeIcon('dir-shared');
+ } elseif ($file->isMounted()) {
+ $icon = \OC_Helper::mimetypeIcon('dir-external');
}
}else{
$icon = \OC_Helper::mimetypeIcon($file->getMimetype());
@@ -57,7 +57,7 @@ class Helper
* @param \OCP\Files\FileInfo $b file
* @return int -1 if $a must come before $b, 1 otherwise
*/
- public static function fileCmp($a, $b) {
+ public static function compareFileNames($a, $b) {
$aType = $a->getType();
$bType = $b->getType();
if ($aType === 'dir' and $bType !== 'dir') {
@@ -69,6 +69,32 @@ class Helper
}
}
+ /**
+ * Comparator function to sort files by date
+ *
+ * @param \OCP\Files\FileInfo $a file
+ * @param \OCP\Files\FileInfo $b file
+ * @return int -1 if $a must come before $b, 1 otherwise
+ */
+ public static function compareTimestamp($a, $b) {
+ $aTime = $a->getMTime();
+ $bTime = $b->getMTime();
+ return $aTime - $bTime;
+ }
+
+ /**
+ * Comparator function to sort files by size
+ *
+ * @param \OCP\Files\FileInfo $a file
+ * @param \OCP\Files\FileInfo $b file
+ * @return int -1 if $a must come before $b, 1 otherwise
+ */
+ public static function compareSize($a, $b) {
+ $aSize = $a->getSize();
+ $bSize = $b->getSize();
+ return $aSize - $bSize;
+ }
+
/**
* Formats the file info to be returned as JSON to the client.
*
@@ -120,12 +146,35 @@ class Helper
* returns it as a sorted array of FileInfo.
*
* @param string $dir path to the directory
+ * @param string $sortAttribute attribute to sort on
+ * @param bool $sortDescending true for descending sort, false otherwise
* @return \OCP\Files\FileInfo[] files
*/
- public static function getFiles($dir) {
+ public static function getFiles($dir, $sortAttribute = 'name', $sortDescending = false) {
$content = \OC\Files\Filesystem::getDirectoryContent($dir);
- usort($content, array('\OCA\Files\Helper', 'fileCmp'));
- return $content;
+ return self::sortFiles($content, $sortAttribute, $sortDescending);
+ }
+
+ /**
+ * Sort the given file info array
+ *
+ * @param \OCP\Files\FileInfo[] $files files to sort
+ * @param string $sortAttribute attribute to sort on
+ * @param bool $sortDescending true for descending sort, false otherwise
+ * @return \OCP\Files\FileInfo[] sorted files
+ */
+ public static function sortFiles($files, $sortAttribute = 'name', $sortDescending = false) {
+ $sortFunc = 'compareFileNames';
+ if ($sortAttribute === 'mtime') {
+ $sortFunc = 'compareTimestamp';
+ } else if ($sortAttribute === 'size') {
+ $sortFunc = 'compareSize';
+ }
+ usort($files, array('\OCA\Files\Helper', $sortFunc));
+ if ($sortDescending) {
+ $files = array_reverse($files);
+ }
+ return $files;
}
}
diff --git a/apps/files/list.php b/apps/files/list.php
new file mode 100644
index 0000000000000000000000000000000000000000..e583839b2519449f3e1e366ec1b98fd18da8cec7
--- /dev/null
+++ b/apps/files/list.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * ownCloud - Files list
+ *
+ * @author Vincent Petry
+ * @copyright 2014 Vincent Petry <pvince81@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/>.
+ *
+ */
+
+// Check if we are a user
+OCP\User::checkLoggedIn();
+
+$config = \OC::$server->getConfig();
+// TODO: move this to the generated config.js
+$publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes');
+$uploadLimit=OCP\Util::uploadLimit();
+
+// renders the controls and table headers template
+$tmpl = new OCP\Template('files', 'list', '');
+$tmpl->assign('uploadLimit', $uploadLimit); // PHP upload limit
+$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
+$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+$tmpl->printPage();
+
diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php
new file mode 100644
index 0000000000000000000000000000000000000000..86436bbe8c4733398c0bf809a610a04a941286fe
--- /dev/null
+++ b/apps/files/templates/appnavigation.php
@@ -0,0 +1,17 @@
+<div id="app-navigation">
+ <ul>
+ <?php foreach ($_['navigationItems'] as $item) { ?>
+ <li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?>"><a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>"><?php p($item['name']);?></a></li>
+ <?php } ?>
+ </ul>
+ <div id="app-settings">
+ <div id="app-settings-header">
+ <button class="settings-button"></button>
+ </div>
+ <div id="app-settings-content">
+ <h2><?php p($l->t('WebDAV'));?></h2>
+ <div><input id="webdavurl" type="text" readonly="readonly" value="<?php p(OC_Helper::linkToRemote('webdav')); ?>"></input></div>
+ <em><?php print_unescaped($l->t('Use this address to <a href="%s" target="_blank">access your Files via WebDAV</a>', array(link_to_docs('user-webdav'))));?></em>
+ </div>
+ </div>
+</div>
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 42263c880a7b530ccfa78d12e8a5410dcd81c830..b52effb1e7808dadb5776cc4848f129f29ccd75b 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -1,117 +1,15 @@
-<div id="controls">
- <div class="actions creatable hidden">
- <?php if(!isset($_['dirToken'])):?>
- <div id="new" class="button">
- <a><?php p($l->t('New'));?></a>
- <ul>
- <li class="icon-filetype-text svg"
- data-type="file" data-newname="<?php p($l->t('New text file')) ?>.txt">
- <p><?php p($l->t('Text file'));?></p>
- </li>
- <li class="icon-filetype-folder svg"
- data-type="folder" data-newname="<?php p($l->t('New folder')) ?>">
- <p><?php p($l->t('Folder'));?></p>
- </li>
- <li class="icon-link svg" data-type="web">
- <p><?php p($l->t('From link'));?></p>
- </li>
- </ul>
- </div>
- <?php endif;?>
- <div id="upload" class="button"
- title="<?php p($l->t('Upload (max. %s)', array($_['uploadMaxHumanFilesize']))) ?>">
- <?php if($_['uploadMaxFilesize'] >= 0):?>
- <input type="hidden" id="max_upload" name="MAX_FILE_SIZE" value="<?php p($_['uploadMaxFilesize']) ?>">
- <?php endif;?>
- <input type="hidden" id="upload_limit" value="<?php p($_['uploadLimit']) ?>">
- <input type="hidden" id="free_space" value="<?php p($_['freeSpace']) ?>">
- <?php if(isset($_['dirToken'])):?>
- <input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
- <input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
- <?php endif;?>
- <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[]'
- data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" />
- <a href="#" class="svg icon-upload"></a>
- </div>
- <?php if ($_['trash']): ?>
- <input id="trash" type="button" value="<?php p($l->t('Deleted files'));?>" class="button" <?php $_['trashEmpty'] ? p('disabled') : '' ?> />
- <?php endif; ?>
- <div id="uploadprogresswrapper">
- <div id="uploadprogressbar"></div>
- <input type="button" class="stop" style="display:none"
- value="<?php p($l->t('Cancel upload'));?>"
- />
- </div>
- </div>
- <div id="file_action_panel"></div>
- <div class="notCreatable notPublic hidden">
- <?php p($l->t('You don’t have permission to upload or create files here'))?>
- </div>
- <input type="hidden" name="permissions" value="<?php p($_['permissions']); ?>" id="permissions">
-</div>
-
-<div id="emptycontent" class="hidden"><?php p($l->t('Nothing in here. Upload something!'))?></div>
-
-<input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>" />
-
-<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>" data-preview-x="36" data-preview-y="36">
- <thead>
- <tr>
- <th class="hidden" id='headerName'>
- <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 id="selectedActionsList" 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 class="hidden" id="headerSize"><?php p($l->t('Size')); ?></th>
- <th class="hidden" id="headerDate">
- <span id="modified"><?php p($l->t( 'Modified' )); ?></span>
- <?php if ($_['permissions'] & OCP\PERMISSION_DELETE): ?>
- <span class="selectedActions"><a href="" class="delete-selected">
- <?php p($l->t('Delete'))?>
- <img class="svg" alt="<?php p($l->t('Delete'))?>"
- src="<?php print_unescaped(OCP\image_path("core", "actions/delete.svg")); ?>" />
- </a></span>
- <?php endif; ?>
- </th>
- </tr>
- </thead>
- <tbody id="fileList">
- </tbody>
- <tfoot>
- </tfoot>
-</table>
-<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.'));?>
- </p>
-</div>
-<div id="scanning-message">
- <h3>
- <?php p($l->t('Files are being scanned, please wait.'));?> <span id='scan-count'></span>
- </h3>
- <p>
- <?php p($l->t('Current scanning'));?> <span id='scan-current'></span>
- </p>
-</div>
+<?php /** @var $l OC_L10N */ ?>
+<?php $_['appNavigation']->printPage(); ?>
+<div id="app-content">
+ <?php foreach ($_['appContents'] as $content) { ?>
+ <div id="app-content-<?php p($content['id']) ?>" class="hidden viewcontainer">
+ <?php print_unescaped($content['content']) ?>
+ </div>
+ <?php } ?>
+</div><!-- closing app-content -->
<!-- config hints for javascript -->
<input type="hidden" name="filesApp" id="filesApp" value="1" />
-<input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" />
<input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" />
<?php if (!$_['isPublic']) :?>
<input type="hidden" name="encryptedFiles" id="encryptedFiles" value="<?php $_['encryptedFiles'] ? p('1') : p('0'); ?>" />
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
new file mode 100644
index 0000000000000000000000000000000000000000..17bf3b3de837e4d8df0727970dd558dd936b902a
--- /dev/null
+++ b/apps/files/templates/list.php
@@ -0,0 +1,107 @@
+<div id="controls">
+ <div class="actions creatable hidden">
+ <?php if(!isset($_['dirToken'])):?>
+ <div id="new" class="button">
+ <a><?php p($l->t('New'));?></a>
+ <ul>
+ <li class="icon-filetype-text svg"
+ data-type="file" data-newname="<?php p($l->t('New text file')) ?>.txt">
+ <p><?php p($l->t('Text file'));?></p>
+ </li>
+ <li class="icon-filetype-folder svg"
+ data-type="folder" data-newname="<?php p($l->t('New folder')) ?>">
+ <p><?php p($l->t('Folder'));?></p>
+ </li>
+ <li class="icon-link svg" data-type="web">
+ <p><?php p($l->t('From link'));?></p>
+ </li>
+ </ul>
+ </div>
+ <?php endif;?>
+ <?php /* Note: the template attributes are here only for the public page. These are normally loaded
+ through ajax instead (updateStorageStatistics).
+ */ ?>
+ <div id="upload" class="button"
+ title="<?php isset($_['uploadMaxHumanFilesize']) ? p($l->t('Upload (max. %s)', array($_['uploadMaxHumanFilesize']))) : '' ?>">
+ <input type="hidden" id="max_upload" name="MAX_FILE_SIZE" value="<?php isset($_['uploadMaxFilesize']) ? p($_['uploadMaxFilesize']) : '' ?>">
+ <input type="hidden" id="upload_limit" value="<?php isset($_['uploadLimit']) ? p($_['uploadLimit']) : '' ?>">
+ <input type="hidden" id="free_space" value="<?php isset($_['freeSpace']) ? p($_['freeSpace']) : '' ?>">
+ <?php if(isset($_['dirToken'])):?>
+ <input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
+ <input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
+ <?php endif;?>
+ <input type="hidden" class="max_human_file_size"
+ value="(max <?php isset($_['uploadMaxHumanFilesize']) ? p($_['uploadMaxHumanFilesize']) : ''; ?>)">
+ <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 icon-upload"></a>
+ </div>
+ <div id="uploadprogresswrapper">
+ <div id="uploadprogressbar"></div>
+ <input type="button" class="stop" style="display:none"
+ value="<?php p($l->t('Cancel upload'));?>"
+ />
+ </div>
+ </div>
+ <div id="file_action_panel"></div>
+ <div class="notCreatable notPublic hidden">
+ <?php p($l->t('You don’t have permission to upload or create files here'))?>
+ </div>
+ <input type="hidden" name="permissions" value="" id="permissions">
+</div>
+
+<div id="emptycontent" class="hidden"><?php p($l->t('Nothing in here. Upload something!'))?></div>
+
+<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>" data-preview-x="36" data-preview-y="36">
+ <thead>
+ <tr>
+ <th id='headerName' class="hidden column-name">
+ <div id="headerName-container">
+ <input type="checkbox" id="select_all_files" class="select-all"/>
+ <label for="select_all_files"></label>
+ <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+ <span id="selectedActionsList" 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" class="hidden column-size">
+ <a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
+ </th>
+ <th id="headerDate" class="hidden column-mtime">
+ <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
+ <span class="selectedActions"><a href="" class="delete-selected">
+ <?php p($l->t('Delete'))?>
+ <img class="svg" alt="<?php p($l->t('Delete'))?>"
+ src="<?php print_unescaped(OCP\image_path("core", "actions/delete.svg")); ?>" />
+ </a></span>
+ </th>
+ </tr>
+ </thead>
+ <tbody id="fileList">
+ </tbody>
+ <tfoot>
+ </tfoot>
+</table>
+<input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" />
+<input type="hidden" name="dir" id="dir" value="" />
+<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.'));?>
+ </p>
+</div>
+<div id="scanning-message">
+ <h3>
+ <?php p($l->t('Files are being scanned, please wait.'));?> <span id='scan-count'></span>
+ </h3>
+ <p>
+ <?php p($l->t('Currently scanning'));?> <span id='scan-current'></span>
+ </p>
+</div>
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index 74ca1e4495da1409742df4fb142ba2eacc54ad5b..9928053e5015ac0861f604e5a84cd76b1c771e97 100644
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -24,6 +24,16 @@
class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
private static $user;
+ /**
+ * @var PHPUnit_Framework_MockObject_MockObject
+ */
+ private $viewMock;
+
+ /**
+ * @var \OCA\Files\App
+ */
+ private $files;
+
function setUp() {
// mock OC_L10n
if (!self::$user) {
@@ -56,7 +66,7 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
}
/**
- * @brief test rename of file/folder
+ * test rename of file/folder
*/
function testRenameFolder() {
$dir = '/';
@@ -72,7 +82,7 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
->method('getFileInfo')
->will($this->returnValue(new \OC\Files\FileInfo(
'/',
- null,
+ new \OC\Files\Storage\Local(array('datadir' => '/')),
'/',
array(
'fileid' => 123,
diff --git a/apps/files/tests/helper.php b/apps/files/tests/helper.php
new file mode 100644
index 0000000000000000000000000000000000000000..9b3603cd5633197d272898ac71d0744ddeb2ffcb
--- /dev/null
+++ b/apps/files/tests/helper.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once __DIR__ . '/../lib/helper.php';
+
+use OCA\Files;
+
+/**
+ * Class Test_Files_Helper
+ */
+class Test_Files_Helper extends \PHPUnit_Framework_TestCase {
+
+ private function makeFileInfo($name, $size, $mtime, $isDir = false) {
+ return new \OC\Files\FileInfo(
+ '/',
+ null,
+ '/',
+ array(
+ 'name' => $name,
+ 'size' => $size,
+ 'mtime' => $mtime,
+ 'type' => $isDir ? 'dir' : 'file',
+ 'mimetype' => $isDir ? 'httpd/unix-directory' : 'application/octet-stream'
+ )
+ );
+ }
+
+ /**
+ * Returns a file list for testing
+ */
+ private function getTestFileList() {
+ return array(
+ self::makeFileInfo('a.txt', 4, 1000),
+ self::makeFileInfo('q.txt', 5, 150),
+ self::makeFileInfo('subdir2', 87, 128, true),
+ self::makeFileInfo('b.txt', 166, 800),
+ self::makeFileInfo('o.txt', 12, 100),
+ self::makeFileInfo('subdir', 88, 125, true),
+ );
+ }
+
+ function sortDataProvider() {
+ return array(
+ array(
+ 'name',
+ false,
+ array('subdir', 'subdir2', 'a.txt', 'b.txt', 'o.txt', 'q.txt'),
+ ),
+ array(
+ 'name',
+ true,
+ array('q.txt', 'o.txt', 'b.txt', 'a.txt', 'subdir2', 'subdir'),
+ ),
+ array(
+ 'size',
+ false,
+ array('a.txt', 'q.txt', 'o.txt', 'subdir2', 'subdir', 'b.txt'),
+ ),
+ array(
+ 'size',
+ true,
+ array('b.txt', 'subdir', 'subdir2', 'o.txt', 'q.txt', 'a.txt'),
+ ),
+ array(
+ 'mtime',
+ false,
+ array('o.txt', 'subdir', 'subdir2', 'q.txt', 'b.txt', 'a.txt'),
+ ),
+ array(
+ 'mtime',
+ true,
+ array('a.txt', 'b.txt', 'q.txt', 'subdir2', 'subdir', 'o.txt'),
+ ),
+ );
+ }
+
+ /**
+ * @dataProvider sortDataProvider
+ */
+ public function testSortByName($sort, $sortDescending, $expectedOrder) {
+ $files = self::getTestFileList();
+ $files = \OCA\Files\Helper::sortFiles($files, $sort, $sortDescending);
+ $fileNames = array();
+ foreach ($files as $fileInfo) {
+ $fileNames[] = $fileInfo->getName();
+ }
+ $this->assertEquals(
+ $expectedOrder,
+ $fileNames
+ );
+ }
+
+}
diff --git a/apps/files/tests/js/appSpec.js b/apps/files/tests/js/appSpec.js
new file mode 100644
index 0000000000000000000000000000000000000000..a9bbab03ecb4914be8abeb3fa31cf530d0eac7a8
--- /dev/null
+++ b/apps/files/tests/js/appSpec.js
@@ -0,0 +1,269 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2014 Vincent Petry <pvince81@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/>.
+*
+*/
+
+describe('OCA.Files.App tests', function() {
+ var App = OCA.Files.App;
+ var pushStateStub;
+ var parseUrlQueryStub;
+
+ beforeEach(function() {
+ $('#testArea').append(
+ '<div id="content" class="app-files">' +
+ '<div id="app-navigation">' +
+ '<ul><li data-id="files"><a>Files</a></li>' +
+ '<li data-id="other"><a>Other</a></li>' +
+ '</div>' +
+ '<div id="app-content">' +
+ '<div id="app-content-files" class="hidden">' +
+ '</div>' +
+ '<div id="app-content-other" class="hidden">' +
+ '</div>' +
+ '</div>' +
+ '</div>' +
+ '</div>'
+ );
+
+ window.FileActions = new OCA.Files.FileActions();
+ OCA.Files.legacyFileActions = window.FileActions;
+ OCA.Files.fileActions = new OCA.Files.FileActions();
+
+ pushStateStub = sinon.stub(OC.Util.History, 'pushState');
+ parseUrlQueryStub = sinon.stub(OC.Util.History, 'parseUrlQuery');
+ parseUrlQueryStub.returns({});
+
+ App.initialize();
+ });
+ afterEach(function() {
+ App.navigation = null;
+ App.fileList = null;
+ App.files = null;
+
+ pushStateStub.restore();
+ parseUrlQueryStub.restore();
+ });
+
+ describe('initialization', function() {
+ it('initializes the default file list with the default file actions', function() {
+ expect(App.fileList).toBeDefined();
+ expect(App.fileList.fileActions.actions.all).toBeDefined();
+ expect(App.fileList.$el.is('#app-content-files')).toEqual(true);
+ });
+ it('merges the legacy file actions with the default ones', function() {
+ var legacyActionStub = sinon.stub();
+ var actionStub = sinon.stub();
+ // legacy action
+ window.FileActions.register(
+ 'all',
+ 'LegacyTest',
+ OC.PERMISSION_READ,
+ OC.imagePath('core', 'actions/test'),
+ legacyActionStub
+ );
+ // legacy action to be overwritten
+ window.FileActions.register(
+ 'all',
+ 'OverwriteThis',
+ OC.PERMISSION_READ,
+ OC.imagePath('core', 'actions/test'),
+ legacyActionStub
+ );
+
+ // regular file actions
+ OCA.Files.fileActions.register(
+ 'all',
+ 'RegularTest',
+ OC.PERMISSION_READ,
+ OC.imagePath('core', 'actions/test'),
+ actionStub
+ );
+
+ // overwrite
+ OCA.Files.fileActions.register(
+ 'all',
+ 'OverwriteThis',
+ OC.PERMISSION_READ,
+ OC.imagePath('core', 'actions/test'),
+ actionStub
+ );
+
+ App.initialize();
+
+ var actions = App.fileList.fileActions.actions;
+ expect(actions.all.OverwriteThis.action).toBe(actionStub);
+ expect(actions.all.LegacyTest.action).toBe(legacyActionStub);
+ expect(actions.all.RegularTest.action).toBe(actionStub);
+ // default one still there
+ expect(actions.dir.Open.action).toBeDefined();
+ });
+ });
+
+ describe('URL handling', function() {
+ it('pushes the state to the URL when current app changed directory', function() {
+ $('#app-content-files').trigger(new $.Event('changeDirectory', {dir: 'subdir'}));
+ expect(pushStateStub.calledOnce).toEqual(true);
+ expect(pushStateStub.getCall(0).args[0].dir).toEqual('subdir');
+ expect(pushStateStub.getCall(0).args[0].view).not.toBeDefined();
+
+ $('li[data-id=other]>a').click();
+ pushStateStub.reset();
+
+ $('#app-content-other').trigger(new $.Event('changeDirectory', {dir: 'subdir'}));
+ expect(pushStateStub.calledOnce).toEqual(true);
+ expect(pushStateStub.getCall(0).args[0].dir).toEqual('subdir');
+ expect(pushStateStub.getCall(0).args[0].view).toEqual('other');
+ });
+ describe('onpopstate', function() {
+ it('sends "urlChanged" event to current app', function() {
+ var handler = sinon.stub();
+ $('#app-content-files').on('urlChanged', handler);
+ App._onPopState({view: 'files', dir: '/somedir'});
+ expect(handler.calledOnce).toEqual(true);
+ expect(handler.getCall(0).args[0].view).toEqual('files');
+ expect(handler.getCall(0).args[0].dir).toEqual('/somedir');
+ });
+ it('sends "show" event to current app and sets navigation', function() {
+ var showHandlerFiles = sinon.stub();
+ var showHandlerOther = sinon.stub();
+ var hideHandlerFiles = sinon.stub();
+ var hideHandlerOther = sinon.stub();
+ $('#app-content-files').on('show', showHandlerFiles);
+ $('#app-content-files').on('hide', hideHandlerFiles);
+ $('#app-content-other').on('show', showHandlerOther);
+ $('#app-content-other').on('hide', hideHandlerOther);
+ App._onPopState({view: 'other', dir: '/somedir'});
+ expect(showHandlerFiles.notCalled).toEqual(true);
+ expect(hideHandlerFiles.calledOnce).toEqual(true);
+ expect(showHandlerOther.calledOnce).toEqual(true);
+ expect(hideHandlerOther.notCalled).toEqual(true);
+
+ showHandlerFiles.reset();
+ showHandlerOther.reset();
+ hideHandlerFiles.reset();
+ hideHandlerOther.reset();
+
+ App._onPopState({view: 'files', dir: '/somedir'});
+ expect(showHandlerFiles.calledOnce).toEqual(true);
+ expect(hideHandlerFiles.notCalled).toEqual(true);
+ expect(showHandlerOther.notCalled).toEqual(true);
+ expect(hideHandlerOther.calledOnce).toEqual(true);
+
+ expect(App.navigation.getActiveItem()).toEqual('files');
+ expect($('#app-content-files').hasClass('hidden')).toEqual(false);
+ expect($('#app-content-other').hasClass('hidden')).toEqual(true);
+ });
+ it('does not send "show" or "hide" event to current app when already visible', function() {
+ var showHandler = sinon.stub();
+ var hideHandler = sinon.stub();
+ $('#app-content-files').on('show', showHandler);
+ $('#app-content-files').on('hide', hideHandler);
+ App._onPopState({view: 'files', dir: '/somedir'});
+ expect(showHandler.notCalled).toEqual(true);
+ expect(hideHandler.notCalled).toEqual(true);
+ });
+ it('state defaults to files app with root dir', function() {
+ var handler = sinon.stub();
+ parseUrlQueryStub.returns({});
+ $('#app-content-files').on('urlChanged', handler);
+ App._onPopState();
+ expect(handler.calledOnce).toEqual(true);
+ expect(handler.getCall(0).args[0].view).toEqual('files');
+ expect(handler.getCall(0).args[0].dir).toEqual('/');
+ });
+ it('activates files app if invalid view is passed', function() {
+ App._onPopState({view: 'invalid', dir: '/somedir'});
+
+ expect(App.navigation.getActiveItem()).toEqual('files');
+ expect($('#app-content-files').hasClass('hidden')).toEqual(false);
+ });
+ });
+ describe('navigation', function() {
+ it('switches the navigation item and panel visibility when onpopstate', function() {
+ App._onPopState({view: 'other', dir: '/somedir'});
+ expect(App.navigation.getActiveItem()).toEqual('other');
+ expect($('#app-content-files').hasClass('hidden')).toEqual(true);
+ expect($('#app-content-other').hasClass('hidden')).toEqual(false);
+ expect($('li[data-id=files]').hasClass('selected')).toEqual(false);
+ expect($('li[data-id=other]').hasClass('selected')).toEqual(true);
+
+ App._onPopState({view: 'files', dir: '/somedir'});
+
+ expect(App.navigation.getActiveItem()).toEqual('files');
+ expect($('#app-content-files').hasClass('hidden')).toEqual(false);
+ expect($('#app-content-other').hasClass('hidden')).toEqual(true);
+ expect($('li[data-id=files]').hasClass('selected')).toEqual(true);
+ expect($('li[data-id=other]').hasClass('selected')).toEqual(false);
+ });
+ it('clicking on navigation switches the panel visibility', function() {
+ $('li[data-id=other]>a').click();
+ expect(App.navigation.getActiveItem()).toEqual('other');
+ expect($('#app-content-files').hasClass('hidden')).toEqual(true);
+ expect($('#app-content-other').hasClass('hidden')).toEqual(false);
+ expect($('li[data-id=files]').hasClass('selected')).toEqual(false);
+ expect($('li[data-id=other]').hasClass('selected')).toEqual(true);
+
+ $('li[data-id=files]>a').click();
+ expect(App.navigation.getActiveItem()).toEqual('files');
+ expect($('#app-content-files').hasClass('hidden')).toEqual(false);
+ expect($('#app-content-other').hasClass('hidden')).toEqual(true);
+ expect($('li[data-id=files]').hasClass('selected')).toEqual(true);
+ expect($('li[data-id=other]').hasClass('selected')).toEqual(false);
+ });
+ it('clicking on navigation sends "show" and "urlChanged" event', function() {
+ var handler = sinon.stub();
+ var showHandler = sinon.stub();
+ $('#app-content-other').on('urlChanged', handler);
+ $('#app-content-other').on('show', showHandler);
+ $('li[data-id=other]>a').click();
+ expect(handler.calledOnce).toEqual(true);
+ expect(handler.getCall(0).args[0].view).toEqual('other');
+ expect(handler.getCall(0).args[0].dir).toEqual('/');
+ expect(showHandler.calledOnce).toEqual(true);
+ });
+ it('clicking on activate navigation only sends "urlChanged" event', function() {
+ var handler = sinon.stub();
+ var showHandler = sinon.stub();
+ $('#app-content-files').on('urlChanged', handler);
+ $('#app-content-files').on('show', showHandler);
+ $('li[data-id=files]>a').click();
+ expect(handler.calledOnce).toEqual(true);
+ expect(handler.getCall(0).args[0].view).toEqual('files');
+ expect(handler.getCall(0).args[0].dir).toEqual('/');
+ expect(showHandler.notCalled).toEqual(true);
+ });
+ });
+ describe('viewer mode', function() {
+ it('toggles the sidebar when viewer mode is enabled', function() {
+ $('#app-content-files').trigger(
+ new $.Event('changeViewerMode', {viewerModeEnabled: true}
+ ));
+ expect($('#app-navigation').hasClass('hidden')).toEqual(true);
+ expect($('.app-files').hasClass('viewer-mode no-sidebar')).toEqual(true);
+
+ $('#app-content-files').trigger(
+ new $.Event('changeViewerMode', {viewerModeEnabled: false}
+ ));
+
+ expect($('#app-navigation').hasClass('hidden')).toEqual(false);
+ expect($('.app-files').hasClass('viewer-mode no-sidebar')).toEqual(false);
+ });
+ });
+ });
+});
diff --git a/apps/files/tests/js/breadcrumbSpec.js b/apps/files/tests/js/breadcrumbSpec.js
index 1bfe5308a278c0dcabfcff3a9661ec14c01b47fc..e3d9c757a7c0a1e01031b2ed6b28f56aefd448b4 100644
--- a/apps/files/tests/js/breadcrumbSpec.js
+++ b/apps/files/tests/js/breadcrumbSpec.js
@@ -20,7 +20,9 @@
*/
/* global BreadCrumb */
-describe('BreadCrumb tests', function() {
+describe('OCA.Files.BreadCrumb tests', function() {
+ var BreadCrumb = OCA.Files.BreadCrumb;
+
describe('Rendering', function() {
var bc;
beforeEach(function() {
diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js
index f5eafba509f6d5ed8925aa5831ddc1012367582a..490594a17739f274c7fa6bfa3c1c485a3f618d42 100644
--- a/apps/files/tests/js/fileactionsSpec.js
+++ b/apps/files/tests/js/fileactionsSpec.js
@@ -19,35 +19,46 @@
*
*/
-/* global OC, FileActions, FileList */
-describe('FileActions tests', function() {
- var $filesTable;
+describe('OCA.Files.FileActions tests', function() {
+ var $filesTable, fileList;
+ var FileActions;
beforeEach(function() {
// init horrible parameters
- var $body = $('body');
+ var $body = $('#testArea');
$body.append('<input type="hidden" id="dir" value="/subdir"></input>');
$body.append('<input type="hidden" id="permissions" value="31"></input>');
// dummy files table
$filesTable = $body.append('<table id="filestable"></table>');
- FileList.files = [];
+ fileList = new OCA.Files.FileList($('#testArea'));
+ FileActions = new OCA.Files.FileActions();
+ FileActions.registerDefaultActions();
});
afterEach(function() {
+ FileActions = null;
+ fileList = undefined;
$('#dir, #permissions, #filestable').remove();
});
+ it('calling clear() clears file actions', function() {
+ FileActions.clear();
+ expect(FileActions.actions).toEqual({});
+ expect(FileActions.defaults).toEqual({});
+ expect(FileActions.icons).toEqual({});
+ expect(FileActions.currentFile).toBe(null);
+ });
it('calling display() sets file actions', function() {
var fileData = {
id: 18,
type: 'file',
name: 'testName.txt',
- mimetype: 'plain/text',
+ mimetype: 'text/plain',
size: '1234',
etag: 'a01234c',
mtime: '123456'
};
// note: FileActions.display() is called implicitly
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
// actions defined after call
expect($tr.find('.action.action-download').length).toEqual(1);
@@ -61,15 +72,15 @@ describe('FileActions tests', function() {
id: 18,
type: 'file',
name: 'testName.txt',
- mimetype: 'plain/text',
+ mimetype: 'text/plain',
size: '1234',
etag: 'a01234c',
mtime: '123456'
};
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
- FileActions.display($tr.find('td.filename'), true);
- FileActions.display($tr.find('td.filename'), true);
+ FileActions.display($tr.find('td.filename'), true, fileList);
+ FileActions.display($tr.find('td.filename'), true, fileList);
// actions defined after cal
expect($tr.find('.action.action-download').length).toEqual(1);
@@ -82,37 +93,100 @@ describe('FileActions tests', function() {
id: 18,
type: 'file',
name: 'testName.txt',
- mimetype: 'plain/text',
+ mimetype: 'text/plain',
+ size: '1234',
+ etag: 'a01234c',
+ mtime: '123456'
+ };
+ var $tr = fileList.add(fileData);
+ FileActions.display($tr.find('td.filename'), true, fileList);
+
+ $tr.find('.action-download').click();
+
+ expect(redirectStub.calledOnce).toEqual(true);
+ expect(redirectStub.getCall(0).args[0]).toEqual(
+ OC.webroot +
+ '/index.php/apps/files/ajax/download.php' +
+ '?dir=%2Fsubdir&files=testName.txt');
+ redirectStub.restore();
+ });
+ it('takes the file\'s path into account when clicking download', function() {
+ var redirectStub = sinon.stub(OC, 'redirect');
+ var fileData = {
+ id: 18,
+ type: 'file',
+ name: 'testName.txt',
+ path: '/anotherpath/there',
+ mimetype: 'text/plain',
size: '1234',
etag: 'a01234c',
mtime: '123456'
};
- var $tr = FileList.add(fileData);
- FileActions.display($tr.find('td.filename'), true);
+ var $tr = fileList.add(fileData);
+ FileActions.display($tr.find('td.filename'), true, fileList);
$tr.find('.action-download').click();
expect(redirectStub.calledOnce).toEqual(true);
- expect(redirectStub.getCall(0).args[0]).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=testName.txt');
+ expect(redirectStub.getCall(0).args[0]).toEqual(
+ OC.webroot + '/index.php/apps/files/ajax/download.php' +
+ '?dir=%2Fanotherpath%2Fthere&files=testName.txt'
+ );
redirectStub.restore();
});
it('deletes file when clicking delete', function() {
- var deleteStub = sinon.stub(FileList, 'do_delete');
+ var deleteStub = sinon.stub(fileList, 'do_delete');
var fileData = {
id: 18,
type: 'file',
name: 'testName.txt',
- mimetype: 'plain/text',
+ mimetype: 'text/plain',
size: '1234',
etag: 'a01234c',
mtime: '123456'
};
- var $tr = FileList.add(fileData);
- FileActions.display($tr.find('td.filename'), true);
+ var $tr = fileList.add(fileData);
+ FileActions.display($tr.find('td.filename'), true, fileList);
$tr.find('.action.delete').click();
expect(deleteStub.calledOnce).toEqual(true);
deleteStub.restore();
});
+ it('passes context to action handler', function() {
+ var actionStub = sinon.stub();
+ var fileData = {
+ id: 18,
+ type: 'file',
+ name: 'testName.txt',
+ mimetype: 'text/plain',
+ size: '1234',
+ etag: 'a01234c',
+ mtime: '123456'
+ };
+ var $tr = fileList.add(fileData);
+ FileActions.register(
+ 'all',
+ 'Test',
+ OC.PERMISSION_READ,
+ OC.imagePath('core', 'actions/test'),
+ actionStub
+ );
+ FileActions.display($tr.find('td.filename'), true, fileList);
+ $tr.find('.action-test').click();
+ expect(actionStub.calledOnce).toEqual(true);
+ expect(actionStub.getCall(0).args[0]).toEqual('testName.txt');
+ var context = actionStub.getCall(0).args[1];
+ expect(context.$file.is($tr)).toEqual(true);
+ expect(context.fileList).toBeDefined();
+ expect(context.fileActions).toBeDefined();
+ expect(context.dir).toEqual('/subdir');
+
+ // when data-path is defined
+ actionStub.reset();
+ $tr.attr('data-path', '/somepath');
+ $tr.find('.action-test').click();
+ context = actionStub.getCall(0).args[1];
+ expect(context.dir).toEqual('/somepath');
+ });
});
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 7a2b56d559a00edcf6b5fdf3e26cd5ce98875287..855a5c9af5188aef27c6ff5c9246bc3602369416 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -19,10 +19,8 @@
*
*/
-/* global OC, FileList */
-describe('FileList tests', function() {
- var testFiles, alertStub, notificationStub,
- pushStateStub;
+describe('OCA.Files.FileList tests', function() {
+ var testFiles, alertStub, notificationStub, fileList;
/**
* Generate test file data
@@ -52,21 +50,13 @@ describe('FileList tests', function() {
}
beforeEach(function() {
- // init horrible parameters
- var $body = $('body');
- $body.append('<input type="hidden" id="dir" value="/subdir"></input>');
- $body.append('<input type="hidden" id="permissions" value="31"></input>');
- // dummy files table
- $body.append('<table id="filestable"></table>');
-
- // prevents URL changes during tests
- pushStateStub = sinon.stub(window.history, 'pushState');
-
alertStub = sinon.stub(OC.dialogs, 'alert');
notificationStub = sinon.stub(OC.Notification, 'show');
// init parameters and test table elements
$('#testArea').append(
+ '<div id="app-content-files">' +
+ // init horrible parameters
'<input type="hidden" id="dir" value="/subdir"></input>' +
'<input type="hidden" id="permissions" value="31"></input>' +
// dummy controls
@@ -74,20 +64,27 @@ describe('FileList tests', function() {
' <div class="actions creatable"></div>' +
' <div class="notCreatable"></div>' +
'</div>' +
+ // uploader
+ '<input type="file" id="file_upload_start" name="files[]" multiple="multiple">' +
// dummy table
- // TODO: at some point this will be rendered by the FileList class itself!
+ // TODO: at some point this will be rendered by the fileList class itself!
'<table id="filestable">' +
- '<thead><tr><th id="headerName" class="hidden">' +
- '<input type="checkbox" id="select_all">' +
- '<span class="name">Name</span>' +
+ '<thead><tr>' +
+ '<th id="headerName" class="hidden column-name">' +
+ '<input type="checkbox" id="select_all_files" class="select-all">' +
+ '<a class="name columntitle" data-sort="name"><span>Name</span><span class="sort-indicator"></span></a>' +
'<span class="selectedActions hidden">' +
'<a href class="download">Download</a>' +
'<a href class="delete-selected">Delete</a></span>' +
- '</th></tr></thead>' +
- '<tbody id="fileList"></tbody>' +
+ '</th>' +
+ '<th class="hidden column-size"><a class="columntitle" data-sort="size"><span class="sort-indicator"></span></a></th>' +
+ '<th class="hidden column-mtime"><a class="columntitle" data-sort="mtime"><span class="sort-indicator"></span></a></th>' +
+ '</tr></thead>' +
+ '<tbody id="fileList"></tbody>' +
'<tfoot></tfoot>' +
'</table>' +
- '<div id="emptycontent">Empty content message</div>'
+ '<div id="emptycontent">Empty content message</div>' +
+ '</div>'
);
testFiles = [{
@@ -120,27 +117,23 @@ describe('FileList tests', function() {
etag: '456'
}];
- FileList.initialize();
+ fileList = new OCA.Files.FileList($('#app-content-files'));
});
afterEach(function() {
testFiles = undefined;
- FileList.initialized = false;
- FileList.isEmpty = true;
- delete FileList._reloadCall;
+ fileList = undefined;
- $('#dir, #permissions, #filestable').remove();
notificationStub.restore();
alertStub.restore();
- pushStateStub.restore();
});
describe('Getters', function() {
it('Returns the current directory', function() {
$('#dir').val('/one/two/three');
- expect(FileList.getCurrentDirectory()).toEqual('/one/two/three');
+ expect(fileList.getCurrentDirectory()).toEqual('/one/two/three');
});
it('Returns the directory permissions as int', function() {
$('#permissions').val('23');
- expect(FileList.getDirectoryPermissions()).toEqual(23);
+ expect(fileList.getDirectoryPermissions()).toEqual(23);
});
});
describe('Adding files', function() {
@@ -158,12 +151,12 @@ describe('FileList tests', function() {
id: 18,
type: 'file',
name: 'testName.txt',
- mimetype: 'plain/text',
+ mimetype: 'text/plain',
size: '1234',
etag: 'a01234c',
mtime: '123456'
};
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
expect($tr).toBeDefined();
expect($tr[0].tagName.toLowerCase()).toEqual('tr');
@@ -173,12 +166,14 @@ describe('FileList tests', function() {
expect($tr.attr('data-size')).toEqual('1234');
expect($tr.attr('data-etag')).toEqual('a01234c');
expect($tr.attr('data-permissions')).toEqual('31');
- expect($tr.attr('data-mime')).toEqual('plain/text');
+ expect($tr.attr('data-mime')).toEqual('text/plain');
expect($tr.attr('data-mtime')).toEqual('123456');
- expect($tr.find('a.name').attr('href')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=testName.txt');
+ expect($tr.find('a.name').attr('href'))
+ .toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=testName.txt');
+ expect($tr.find('.nametext').text().trim()).toEqual('testName.txt');
expect($tr.find('.filesize').text()).toEqual('1 kB');
- expect(FileList.findFileEl('testName.txt')[0]).toEqual($tr[0]);
+ expect(fileList.findFileEl('testName.txt')[0]).toEqual($tr[0]);
});
it('generates dir element with correct attributes when calling add() with dir data', function() {
var fileData = {
@@ -190,7 +185,7 @@ describe('FileList tests', function() {
etag: 'a01234c',
mtime: '123456'
};
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
expect($tr).toBeDefined();
expect($tr[0].tagName.toLowerCase()).toEqual('tr');
@@ -205,7 +200,7 @@ describe('FileList tests', function() {
expect($tr.find('.filesize').text()).toEqual('1 kB');
- expect(FileList.findFileEl('testFolder')[0]).toEqual($tr[0]);
+ expect(fileList.findFileEl('testFolder')[0]).toEqual($tr[0]);
});
it('generates file element with default attributes when calling add() with minimal data', function() {
var fileData = {
@@ -213,8 +208,8 @@ describe('FileList tests', function() {
name: 'testFile.txt'
};
- clock.tick(123456);
- var $tr = FileList.add(fileData);
+ clock.tick(123456);
+ var $tr = fileList.add(fileData);
expect($tr).toBeDefined();
expect($tr[0].tagName.toLowerCase()).toEqual('tr');
@@ -234,8 +229,8 @@ describe('FileList tests', function() {
type: 'dir',
name: 'testFolder'
};
- clock.tick(123456);
- var $tr = FileList.add(fileData);
+ clock.tick(123456);
+ var $tr = fileList.add(fileData);
expect($tr).toBeDefined();
expect($tr[0].tagName.toLowerCase()).toEqual('tr');
@@ -256,7 +251,7 @@ describe('FileList tests', function() {
name: 'testFolder',
size: '0'
};
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
expect($tr.find('.filesize').text()).toEqual('0 B');
});
it('adds new file to the end of the list', function() {
@@ -265,19 +260,19 @@ describe('FileList tests', function() {
type: 'file',
name: 'ZZZ.txt'
};
- FileList.setFiles(testFiles);
- $tr = FileList.add(fileData);
+ fileList.setFiles(testFiles);
+ $tr = fileList.add(fileData);
expect($tr.index()).toEqual(4);
});
it('inserts files in a sorted manner when insert option is enabled', function() {
var $tr;
for (var i = 0; i < testFiles.length; i++) {
- FileList.add(testFiles[i]);
+ fileList.add(testFiles[i]);
}
- expect(FileList.files[0].name).toEqual('somedir');
- expect(FileList.files[1].name).toEqual('One.txt');
- expect(FileList.files[2].name).toEqual('Three.pdf');
- expect(FileList.files[3].name).toEqual('Two.jpg');
+ expect(fileList.files[0].name).toEqual('somedir');
+ expect(fileList.files[1].name).toEqual('One.txt');
+ expect(fileList.files[2].name).toEqual('Three.pdf');
+ expect(fileList.files[3].name).toEqual('Two.jpg');
});
it('inserts new file at correct position', function() {
var $tr;
@@ -286,12 +281,12 @@ describe('FileList tests', function() {
name: 'P comes after O.txt'
};
for (var i = 0; i < testFiles.length; i++) {
- FileList.add(testFiles[i]);
+ fileList.add(testFiles[i]);
}
- $tr = FileList.add(fileData);
+ $tr = fileList.add(fileData);
// after "One.txt"
expect($tr.index()).toEqual(2);
- expect(FileList.files[2]).toEqual(fileData);
+ expect(fileList.files[2]).toEqual(fileData);
});
it('inserts new folder at correct position in insert mode', function() {
var $tr;
@@ -300,11 +295,11 @@ describe('FileList tests', function() {
name: 'somedir2 comes after somedir'
};
for (var i = 0; i < testFiles.length; i++) {
- FileList.add(testFiles[i]);
+ fileList.add(testFiles[i]);
}
- $tr = FileList.add(fileData);
+ $tr = fileList.add(fileData);
expect($tr.index()).toEqual(1);
- expect(FileList.files[1]).toEqual(fileData);
+ expect(fileList.files[1]).toEqual(fileData);
});
it('inserts new file at the end correctly', function() {
var $tr;
@@ -313,21 +308,22 @@ describe('FileList tests', function() {
name: 'zzz.txt'
};
for (var i = 0; i < testFiles.length; i++) {
- FileList.add(testFiles[i]);
+ fileList.add(testFiles[i]);
}
- $tr = FileList.add(fileData);
+ $tr = fileList.add(fileData);
expect($tr.index()).toEqual(4);
- expect(FileList.files[4]).toEqual(fileData);
+ expect(fileList.files[4]).toEqual(fileData);
});
it('removes empty content message and shows summary when adding first file', function() {
+ var $summary;
var fileData = {
type: 'file',
name: 'first file.txt',
size: 12
};
- FileList.setFiles([]);
- expect(FileList.isEmpty).toEqual(true);
- FileList.add(fileData);
+ fileList.setFiles([]);
+ expect(fileList.isEmpty).toEqual(true);
+ fileList.add(fileData);
$summary = $('#filestable .summary');
expect($summary.hasClass('hidden')).toEqual(false);
// yes, ugly...
@@ -337,19 +333,20 @@ describe('FileList tests', function() {
expect($summary.find('.filesize').text()).toEqual('12 B');
expect($('#filestable thead th').hasClass('hidden')).toEqual(false);
expect($('#emptycontent').hasClass('hidden')).toEqual(true);
- expect(FileList.isEmpty).toEqual(false);
+ expect(fileList.isEmpty).toEqual(false);
});
});
describe('Removing files from the list', function() {
it('Removes file from list when calling remove() and updates summary', function() {
+ var $summary;
var $removedEl;
- FileList.setFiles(testFiles);
- $removedEl = FileList.remove('One.txt');
+ fileList.setFiles(testFiles);
+ $removedEl = fileList.remove('One.txt');
expect($removedEl).toBeDefined();
expect($removedEl.attr('data-file')).toEqual('One.txt');
expect($('#fileList tr').length).toEqual(3);
- expect(FileList.files.length).toEqual(3);
- expect(FileList.findFileEl('One.txt').length).toEqual(0);
+ expect(fileList.files.length).toEqual(3);
+ expect(fileList.findFileEl('One.txt').length).toEqual(0);
$summary = $('#filestable .summary');
expect($summary.hasClass('hidden')).toEqual(false);
@@ -357,27 +354,28 @@ describe('FileList tests', function() {
expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(false);
expect($summary.find('.fileinfo').hasClass('hidden')).toEqual(false);
expect($summary.find('.filesize').text()).toEqual('69 kB');
- expect(FileList.isEmpty).toEqual(false);
+ expect(fileList.isEmpty).toEqual(false);
});
it('Shows empty content when removing last file', function() {
- FileList.setFiles([testFiles[0]]);
- FileList.remove('One.txt');
+ var $summary;
+ fileList.setFiles([testFiles[0]]);
+ fileList.remove('One.txt');
expect($('#fileList tr').length).toEqual(0);
- expect(FileList.files.length).toEqual(0);
- expect(FileList.findFileEl('One.txt').length).toEqual(0);
+ expect(fileList.files.length).toEqual(0);
+ expect(fileList.findFileEl('One.txt').length).toEqual(0);
$summary = $('#filestable .summary');
expect($summary.hasClass('hidden')).toEqual(true);
expect($('#filestable thead th').hasClass('hidden')).toEqual(true);
expect($('#emptycontent').hasClass('hidden')).toEqual(false);
- expect(FileList.isEmpty).toEqual(true);
+ expect(fileList.isEmpty).toEqual(true);
});
});
describe('Deleting files', function() {
function doDelete() {
var request, query;
// note: normally called from FileActions
- FileList.do_delete(['One.txt', 'Two.jpg']);
+ fileList.do_delete(['One.txt', 'Two.jpg']);
expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0];
@@ -387,7 +385,8 @@ describe('FileList tests', function() {
expect(OC.parseQueryString(query)).toEqual({'dir': '/subdir', files: '["One.txt","Two.jpg"]'});
}
it('calls delete.php, removes the deleted entries and updates summary', function() {
- FileList.setFiles(testFiles);
+ var $summary;
+ fileList.setFiles(testFiles);
doDelete();
fakeServer.requests[0].respond(
@@ -396,10 +395,10 @@ describe('FileList tests', function() {
JSON.stringify({status: 'success'})
);
- expect(FileList.findFileEl('One.txt').length).toEqual(0);
- expect(FileList.findFileEl('Two.jpg').length).toEqual(0);
- expect(FileList.findFileEl('Three.pdf').length).toEqual(1);
- expect(FileList.$fileList.find('tr').length).toEqual(2);
+ expect(fileList.findFileEl('One.txt').length).toEqual(0);
+ expect(fileList.findFileEl('Two.jpg').length).toEqual(0);
+ expect(fileList.findFileEl('Three.pdf').length).toEqual(1);
+ expect(fileList.$fileList.find('tr').length).toEqual(2);
$summary = $('#filestable .summary');
expect($summary.hasClass('hidden')).toEqual(false);
@@ -407,28 +406,29 @@ describe('FileList tests', function() {
expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(false);
expect($summary.find('.fileinfo').hasClass('hidden')).toEqual(false);
expect($summary.find('.filesize').text()).toEqual('57 kB');
- expect(FileList.isEmpty).toEqual(false);
+ expect(fileList.isEmpty).toEqual(false);
expect($('#filestable thead th').hasClass('hidden')).toEqual(false);
expect($('#emptycontent').hasClass('hidden')).toEqual(true);
expect(notificationStub.notCalled).toEqual(true);
});
it('shows spinner on files to be deleted', function() {
- FileList.setFiles(testFiles);
+ fileList.setFiles(testFiles);
doDelete();
- expect(FileList.findFileEl('One.txt').find('.progress-icon:not(.delete-icon)').length).toEqual(1);
- expect(FileList.findFileEl('Three.pdf').find('.delete-icon:not(.progress-icon)').length).toEqual(1);
+ expect(fileList.findFileEl('One.txt').find('.progress-icon:not(.delete-icon)').length).toEqual(1);
+ expect(fileList.findFileEl('Three.pdf').find('.delete-icon:not(.progress-icon)').length).toEqual(1);
});
it('shows spinner on all files when deleting all', function() {
- FileList.setFiles(testFiles);
+ fileList.setFiles(testFiles);
- FileList.do_delete();
+ fileList.do_delete();
- expect(FileList.$fileList.find('tr .progress-icon:not(.delete-icon)').length).toEqual(4);
+ expect(fileList.$fileList.find('tr .progress-icon:not(.delete-icon)').length).toEqual(4);
});
it('updates summary when deleting last file', function() {
- FileList.setFiles([testFiles[0], testFiles[1]]);
+ var $summary;
+ fileList.setFiles([testFiles[0], testFiles[1]]);
doDelete();
fakeServer.requests[0].respond(
@@ -437,17 +437,17 @@ describe('FileList tests', function() {
JSON.stringify({status: 'success'})
);
- expect(FileList.$fileList.find('tr').length).toEqual(0);
+ expect(fileList.$fileList.find('tr').length).toEqual(0);
$summary = $('#filestable .summary');
expect($summary.hasClass('hidden')).toEqual(true);
- expect(FileList.isEmpty).toEqual(true);
- expect(FileList.files.length).toEqual(0);
+ expect(fileList.isEmpty).toEqual(true);
+ expect(fileList.files.length).toEqual(0);
expect($('#filestable thead th').hasClass('hidden')).toEqual(true);
expect($('#emptycontent').hasClass('hidden')).toEqual(false);
});
it('bring back deleted item when delete call failed', function() {
- FileList.setFiles(testFiles);
+ fileList.setFiles(testFiles);
doDelete();
fakeServer.requests[0].respond(
@@ -457,36 +457,48 @@ describe('FileList tests', function() {
);
// files are still in the list
- expect(FileList.findFileEl('One.txt').length).toEqual(1);
- expect(FileList.findFileEl('Two.jpg').length).toEqual(1);
- expect(FileList.$fileList.find('tr').length).toEqual(4);
+ expect(fileList.findFileEl('One.txt').length).toEqual(1);
+ expect(fileList.findFileEl('Two.jpg').length).toEqual(1);
+ expect(fileList.$fileList.find('tr').length).toEqual(4);
expect(notificationStub.calledOnce).toEqual(true);
});
});
describe('Renaming files', function() {
+ function doCancelRename() {
+ var $input;
+ for (var i = 0; i < testFiles.length; i++) {
+ fileList.add(testFiles[i]);
+ }
+
+ // trigger rename prompt
+ fileList.rename('One.txt');
+ $input = fileList.$fileList.find('input.filename');
+ // keep same name
+ $input.val('One.txt');
+ // trigger submit because triggering blur doesn't work in all browsers
+ $input.closest('form').trigger('submit');
+
+ expect(fakeServer.requests.length).toEqual(0);
+ }
function doRename() {
var $input, request;
for (var i = 0; i < testFiles.length; i++) {
- FileList.add(testFiles[i]);
+ fileList.add(testFiles[i], {silent: true});
}
// trigger rename prompt
- FileList.rename('One.txt');
- $input = FileList.$fileList.find('input.filename');
- $input.val('Tu_after_three.txt').blur();
+ fileList.rename('One.txt');
+ $input = fileList.$fileList.find('input.filename');
+ $input.val('Tu_after_three.txt');
+ // trigger submit because triggering blur doesn't work in all browsers
+ $input.closest('form').trigger('submit');
expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0];
expect(request.url.substr(0, request.url.indexOf('?'))).toEqual(OC.webroot + '/index.php/apps/files/ajax/rename.php');
expect(OC.parseQueryString(request.url)).toEqual({'dir': '/subdir', newname: 'Tu_after_three.txt', file: 'One.txt'});
-
- // element is renamed before the request finishes
- expect(FileList.findFileEl('One.txt').length).toEqual(0);
- expect(FileList.findFileEl('Tu_after_three.txt').length).toEqual(1);
- // input is gone
- expect(FileList.$fileList.find('input.filename').length).toEqual(0);
}
it('Inserts renamed file entry at correct position if rename ajax call suceeded', function() {
doRename();
@@ -500,9 +512,9 @@ describe('FileList tests', function() {
}));
// element stays renamed
- expect(FileList.findFileEl('One.txt').length).toEqual(0);
- expect(FileList.findFileEl('Tu_after_three.txt').length).toEqual(1);
- expect(FileList.findFileEl('Tu_after_three.txt').index()).toEqual(2); // after Two.txt
+ expect(fileList.findFileEl('One.txt').length).toEqual(0);
+ expect(fileList.findFileEl('Tu_after_three.txt').length).toEqual(1);
+ expect(fileList.findFileEl('Tu_after_three.txt').index()).toEqual(2); // after Two.txt
expect(alertStub.notCalled).toEqual(true);
});
@@ -517,9 +529,9 @@ describe('FileList tests', function() {
}));
// element was reverted
- expect(FileList.findFileEl('One.txt').length).toEqual(1);
- expect(FileList.findFileEl('One.txt').index()).toEqual(1); // after somedir
- expect(FileList.findFileEl('Tu_after_three.txt').length).toEqual(0);
+ expect(fileList.findFileEl('One.txt').length).toEqual(1);
+ expect(fileList.findFileEl('One.txt').index()).toEqual(1); // after somedir
+ expect(fileList.findFileEl('Tu_after_three.txt').length).toEqual(0);
expect(alertStub.calledOnce).toEqual(true);
});
@@ -534,34 +546,63 @@ describe('FileList tests', function() {
}
}));
- $tr = FileList.findFileEl('Tu_after_three.txt');
+ $tr = fileList.findFileEl('Tu_after_three.txt');
expect($tr.find('a.name').attr('href')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=Tu_after_three.txt');
});
- // FIXME: fix this in the source code!
- xit('Correctly updates file link after rename when path has same name', function() {
- var $tr;
- // evil case: because of buggy code
- $('#dir').val('/One.txt/subdir');
+ it('Triggers "fileActionsReady" event after rename', function() {
+ var handler = sinon.stub();
+ fileList.$fileList.on('fileActionsReady', handler);
+ doRename();
+ expect(handler.notCalled).toEqual(true);
+ fakeServer.requests[0].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
+ status: 'success',
+ data: {
+ name: 'Tu_after_three.txt'
+ }
+ }));
+ expect(handler.calledOnce).toEqual(true);
+ expect(fileList.$fileList.find('.test').length).toEqual(0);
+ });
+ it('Leaves the summary alone when reinserting renamed element', function() {
+ var $summary = $('#filestable .summary');
doRename();
-
fakeServer.requests[0].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
status: 'success',
data: {
name: 'Tu_after_three.txt'
}
}));
+ expect($summary.find('.info').text()).toEqual('1 folder and 3 files');
+ });
+ it('Leaves the summary alone when cancel renaming', function() {
+ var $summary = $('#filestable .summary');
+ doCancelRename();
+ expect($summary.find('.info').text()).toEqual('1 folder and 3 files');
+ });
+ it('Hides actions while rename in progress', function() {
+ var $tr;
+ doRename();
- $tr = FileList.findFileEl('Tu_after_three.txt');
- expect($tr.find('a.name').attr('href')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=One.txt');
+ // element is renamed before the request finishes
+ $tr = fileList.findFileEl('Tu_after_three.txt');
+ expect($tr.length).toEqual(1);
+ expect(fileList.findFileEl('One.txt').length).toEqual(0);
+ // file actions are hidden
+ expect($tr.find('.action').hasClass('hidden')).toEqual(true);
+ expect($tr.find('.fileactions').hasClass('hidden')).toEqual(true);
+
+ // input and form are gone
+ expect(fileList.$fileList.find('input.filename').length).toEqual(0);
+ expect(fileList.$fileList.find('form').length).toEqual(0);
});
});
describe('Moving files', function() {
beforeEach(function() {
- FileList.setFiles(testFiles);
+ fileList.setFiles(testFiles);
});
it('Moves single file to target folder', function() {
var request;
- FileList.move('One.txt', '/somedir');
+ fileList.move('One.txt', '/somedir');
expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0];
@@ -576,17 +617,17 @@ describe('FileList tests', function() {
}
}));
- expect(FileList.findFileEl('One.txt').length).toEqual(0);
+ expect(fileList.findFileEl('One.txt').length).toEqual(0);
// folder size has increased
- expect(FileList.findFileEl('somedir').data('size')).toEqual(262);
- expect(FileList.findFileEl('somedir').find('.filesize').text()).toEqual('262 B');
+ expect(fileList.findFileEl('somedir').data('size')).toEqual(262);
+ expect(fileList.findFileEl('somedir').find('.filesize').text()).toEqual('262 B');
expect(notificationStub.notCalled).toEqual(true);
});
it('Moves list of files to target folder', function() {
var request;
- FileList.move(['One.txt', 'Two.jpg'], '/somedir');
+ fileList.move(['One.txt', 'Two.jpg'], '/somedir');
expect(fakeServer.requests.length).toEqual(2);
request = fakeServer.requests[0];
@@ -605,11 +646,11 @@ describe('FileList tests', function() {
}
}));
- expect(FileList.findFileEl('One.txt').length).toEqual(0);
+ expect(fileList.findFileEl('One.txt').length).toEqual(0);
// folder size has increased
- expect(FileList.findFileEl('somedir').data('size')).toEqual(262);
- expect(FileList.findFileEl('somedir').find('.filesize').text()).toEqual('262 B');
+ expect(fileList.findFileEl('somedir').data('size')).toEqual(262);
+ expect(fileList.findFileEl('somedir').find('.filesize').text()).toEqual('262 B');
fakeServer.requests[1].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
status: 'success',
@@ -619,17 +660,17 @@ describe('FileList tests', function() {
}
}));
- expect(FileList.findFileEl('Two.jpg').length).toEqual(0);
+ expect(fileList.findFileEl('Two.jpg').length).toEqual(0);
// folder size has increased
- expect(FileList.findFileEl('somedir').data('size')).toEqual(12311);
- expect(FileList.findFileEl('somedir').find('.filesize').text()).toEqual('12 kB');
+ expect(fileList.findFileEl('somedir').data('size')).toEqual(12311);
+ expect(fileList.findFileEl('somedir').find('.filesize').text()).toEqual('12 kB');
expect(notificationStub.notCalled).toEqual(true);
});
it('Shows notification if a file could not be moved', function() {
var request;
- FileList.move('One.txt', '/somedir');
+ fileList.move('One.txt', '/somedir');
expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0];
@@ -643,7 +684,7 @@ describe('FileList tests', function() {
}
}));
- expect(FileList.findFileEl('One.txt').length).toEqual(1);
+ expect(fileList.findFileEl('One.txt').length).toEqual(1);
expect(notificationStub.calledOnce).toEqual(true);
expect(notificationStub.getCall(0).args[0]).toEqual('Error while moving file');
@@ -651,47 +692,47 @@ describe('FileList tests', function() {
});
describe('List rendering', function() {
it('renders a list of files using add()', function() {
- expect(FileList.files.length).toEqual(0);
- expect(FileList.files).toEqual([]);
- FileList.setFiles(testFiles);
+ expect(fileList.files.length).toEqual(0);
+ expect(fileList.files).toEqual([]);
+ fileList.setFiles(testFiles);
expect($('#fileList tr').length).toEqual(4);
- expect(FileList.files.length).toEqual(4);
- expect(FileList.files).toEqual(testFiles);
+ expect(fileList.files.length).toEqual(4);
+ expect(fileList.files).toEqual(testFiles);
});
it('updates summary using the file sizes', function() {
var $summary;
- FileList.setFiles(testFiles);
+ fileList.setFiles(testFiles);
$summary = $('#filestable .summary');
expect($summary.hasClass('hidden')).toEqual(false);
expect($summary.find('.info').text()).toEqual('1 folder and 3 files');
expect($summary.find('.filesize').text()).toEqual('69 kB');
});
it('shows headers, summary and hide empty content message after setting files', function(){
- FileList.setFiles(testFiles);
+ fileList.setFiles(testFiles);
expect($('#filestable thead th').hasClass('hidden')).toEqual(false);
expect($('#emptycontent').hasClass('hidden')).toEqual(true);
- expect(FileList.$el.find('.summary').hasClass('hidden')).toEqual(false);
+ expect(fileList.$el.find('.summary').hasClass('hidden')).toEqual(false);
});
it('hides headers, summary and show empty content message after setting empty file list', function(){
- FileList.setFiles([]);
+ fileList.setFiles([]);
expect($('#filestable thead th').hasClass('hidden')).toEqual(true);
expect($('#emptycontent').hasClass('hidden')).toEqual(false);
- expect(FileList.$el.find('.summary').hasClass('hidden')).toEqual(true);
+ expect(fileList.$el.find('.summary').hasClass('hidden')).toEqual(true);
});
it('hides headers, empty content message, and summary when list is empty and user has no creation permission', function(){
$('#permissions').val(0);
- FileList.setFiles([]);
+ fileList.setFiles([]);
expect($('#filestable thead th').hasClass('hidden')).toEqual(true);
expect($('#emptycontent').hasClass('hidden')).toEqual(true);
- expect(FileList.$el.find('.summary').hasClass('hidden')).toEqual(true);
+ expect(fileList.$el.find('.summary').hasClass('hidden')).toEqual(true);
});
it('calling findFileEl() can find existing file element', function() {
- FileList.setFiles(testFiles);
- expect(FileList.findFileEl('Two.jpg').length).toEqual(1);
+ fileList.setFiles(testFiles);
+ expect(fileList.findFileEl('Two.jpg').length).toEqual(1);
});
it('calling findFileEl() returns empty when file not found in file', function() {
- FileList.setFiles(testFiles);
- expect(FileList.findFileEl('unexist.dat').length).toEqual(0);
+ fileList.setFiles(testFiles);
+ expect(fileList.findFileEl('unexist.dat').length).toEqual(0);
});
it('only add file if in same current directory', function() {
$('#dir').val('/current dir');
@@ -700,121 +741,136 @@ describe('FileList tests', function() {
name: 'testFile.txt',
directory: '/current dir'
};
- var $tr = FileList.add(fileData);
- expect(FileList.findFileEl('testFile.txt').length).toEqual(1);
+ var $tr = fileList.add(fileData);
+ expect(fileList.findFileEl('testFile.txt').length).toEqual(1);
});
it('triggers "fileActionsReady" event after update', function() {
var handler = sinon.stub();
- FileList.$fileList.on('fileActionsReady', handler);
- FileList.setFiles(testFiles);
+ fileList.$fileList.on('fileActionsReady', handler);
+ fileList.setFiles(testFiles);
expect(handler.calledOnce).toEqual(true);
});
+ it('triggers "fileActionsReady" event after single add', function() {
+ var handler = sinon.stub();
+ fileList.setFiles(testFiles);
+ fileList.$fileList.on('fileActionsReady', handler);
+ fileList.add({name: 'test.txt'});
+ expect(handler.calledOnce).toEqual(true);
+ });
+ it('does not trigger "fileActionsReady" event after single add with silent argument', function() {
+ var handler = sinon.stub();
+ fileList.setFiles(testFiles);
+ fileList.$fileList.on('fileActionsReady', handler);
+ fileList.add({name: 'test.txt'}, {silent: true});
+ expect(handler.notCalled).toEqual(true);
+ });
it('triggers "updated" event after update', function() {
var handler = sinon.stub();
- FileList.$fileList.on('updated', handler);
- FileList.setFiles(testFiles);
+ fileList.$fileList.on('updated', handler);
+ fileList.setFiles(testFiles);
expect(handler.calledOnce).toEqual(true);
});
it('does not update summary when removing non-existing files', function() {
+ var $summary;
// single file
- FileList.setFiles([testFiles[0]]);
+ fileList.setFiles([testFiles[0]]);
$summary = $('#filestable .summary');
expect($summary.hasClass('hidden')).toEqual(false);
expect($summary.find('.info').text()).toEqual('0 folders and 1 file');
- FileList.remove('unexist.txt');
+ fileList.remove('unexist.txt');
expect($summary.hasClass('hidden')).toEqual(false);
expect($summary.find('.info').text()).toEqual('0 folders and 1 file');
});
});
describe('Rendering next page on scroll', function() {
beforeEach(function() {
- FileList.setFiles(generateFiles(0, 64));
+ fileList.setFiles(generateFiles(0, 64));
});
it('renders only the first page', function() {
- expect(FileList.files.length).toEqual(65);
+ expect(fileList.files.length).toEqual(65);
expect($('#fileList tr').length).toEqual(20);
});
it('renders the second page when scrolling down (trigger nextPage)', function() {
// TODO: can't simulate scrolling here, so calling nextPage directly
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(40);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(60);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(65);
- FileList._nextPage(true);
+ fileList._nextPage(true);
// stays at 65
expect($('#fileList tr').length).toEqual(65);
});
it('inserts into the DOM if insertion point is in the visible page ', function() {
- FileList.add({
+ fileList.add({
id: 2000,
type: 'file',
name: 'File with index 15b.txt'
});
expect($('#fileList tr').length).toEqual(21);
- expect(FileList.findFileEl('File with index 15b.txt').index()).toEqual(16);
+ expect(fileList.findFileEl('File with index 15b.txt').index()).toEqual(16);
});
it('does not inserts into the DOM if insertion point is not the visible page ', function() {
- FileList.add({
+ fileList.add({
id: 2000,
type: 'file',
name: 'File with index 28b.txt'
});
expect($('#fileList tr').length).toEqual(20);
- expect(FileList.findFileEl('File with index 28b.txt').length).toEqual(0);
- FileList._nextPage(true);
+ expect(fileList.findFileEl('File with index 28b.txt').length).toEqual(0);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(40);
- expect(FileList.findFileEl('File with index 28b.txt').index()).toEqual(29);
+ expect(fileList.findFileEl('File with index 28b.txt').index()).toEqual(29);
});
it('appends into the DOM when inserting a file after the last visible element', function() {
- FileList.add({
+ fileList.add({
id: 2000,
type: 'file',
name: 'File with index 19b.txt'
});
expect($('#fileList tr').length).toEqual(21);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(41);
});
it('appends into the DOM when inserting a file on the last page when visible', function() {
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(40);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(60);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(65);
- FileList._nextPage(true);
- FileList.add({
+ fileList._nextPage(true);
+ fileList.add({
id: 2000,
type: 'file',
name: 'File with index 88.txt'
});
expect($('#fileList tr').length).toEqual(66);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(66);
});
it('shows additional page when appending a page of files and scrolling down', function() {
var newFiles = generateFiles(66, 81);
for (var i = 0; i < newFiles.length; i++) {
- FileList.add(newFiles[i]);
+ fileList.add(newFiles[i]);
}
expect($('#fileList tr').length).toEqual(20);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(40);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(60);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(80);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(81);
- FileList._nextPage(true);
+ fileList._nextPage(true);
expect($('#fileList tr').length).toEqual(81);
});
it('automatically renders next page when there are not enough elements visible', function() {
// delete the 15 first elements
for (var i = 0; i < 15; i++) {
- FileList.remove(FileList.files[0].name);
+ fileList.remove(fileList.files[0].name);
}
// still makes sure that there are 20 elements visible, if any
expect($('#fileList tr').length).toEqual(25);
@@ -834,7 +890,7 @@ describe('FileList tests', function() {
}
beforeEach(function() {
- previewLoadStub = sinon.stub(Files, 'lazyLoadPreview');
+ previewLoadStub = sinon.stub(OCA.Files.FileList.prototype, 'lazyLoadPreview');
});
afterEach(function() {
previewLoadStub.restore();
@@ -844,7 +900,7 @@ describe('FileList tests', function() {
type: 'file',
name: 'testFile.txt'
};
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
var $td = $tr.find('td.filename');
expect(getImageUrl($td)).toEqual(OC.webroot + '/core/img/filetypes/file.svg');
expect(previewLoadStub.notCalled).toEqual(true);
@@ -854,7 +910,7 @@ describe('FileList tests', function() {
type: 'dir',
name: 'test dir'
};
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
var $td = $tr.find('td.filename');
expect(getImageUrl($td)).toEqual(OC.webroot + '/core/img/filetypes/folder.svg');
expect(previewLoadStub.notCalled).toEqual(true);
@@ -865,7 +921,7 @@ describe('FileList tests', function() {
name: 'test dir',
icon: OC.webroot + '/core/img/filetypes/application-pdf.svg'
};
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
var $td = $tr.find('td.filename');
expect(getImageUrl($td)).toEqual(OC.webroot + '/core/img/filetypes/application-pdf.svg');
expect(previewLoadStub.notCalled).toEqual(true);
@@ -876,12 +932,12 @@ describe('FileList tests', function() {
name: 'test dir',
isPreviewAvailable: true
};
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
var $td = $tr.find('td.filename');
expect(getImageUrl($td)).toEqual(OC.webroot + '/core/img/filetypes/file.svg');
expect(previewLoadStub.calledOnce).toEqual(true);
// third argument is callback
- previewLoadStub.getCall(0).args[2](OC.webroot + '/somepath.png');
+ previewLoadStub.getCall(0).args[0].callback(OC.webroot + '/somepath.png');
expect(getImageUrl($td)).toEqual(OC.webroot + '/somepath.png');
});
it('renders default file type icon when no icon was provided and no preview is available', function() {
@@ -890,7 +946,7 @@ describe('FileList tests', function() {
name: 'test dir',
isPreviewAvailable: false
};
- var $tr = FileList.add(fileData);
+ var $tr = fileList.add(fileData);
var $td = $tr.find('td.filename');
expect(getImageUrl($td)).toEqual(OC.webroot + '/core/img/filetypes/file.svg');
expect(previewLoadStub.notCalled).toEqual(true);
@@ -898,26 +954,38 @@ describe('FileList tests', function() {
});
describe('viewer mode', function() {
it('enabling viewer mode hides files table and action buttons', function() {
- FileList.setViewerMode(true);
+ fileList.setViewerMode(true);
expect($('#filestable').hasClass('hidden')).toEqual(true);
expect($('.actions').hasClass('hidden')).toEqual(true);
expect($('.notCreatable').hasClass('hidden')).toEqual(true);
});
it('disabling viewer mode restores files table and action buttons', function() {
- FileList.setViewerMode(true);
- FileList.setViewerMode(false);
+ fileList.setViewerMode(true);
+ fileList.setViewerMode(false);
expect($('#filestable').hasClass('hidden')).toEqual(false);
expect($('.actions').hasClass('hidden')).toEqual(false);
expect($('.notCreatable').hasClass('hidden')).toEqual(true);
});
it('disabling viewer mode restores files table and action buttons with correct permissions', function() {
$('#permissions').val(0);
- FileList.setViewerMode(true);
- FileList.setViewerMode(false);
+ fileList.setViewerMode(true);
+ fileList.setViewerMode(false);
expect($('#filestable').hasClass('hidden')).toEqual(false);
expect($('.actions').hasClass('hidden')).toEqual(true);
expect($('.notCreatable').hasClass('hidden')).toEqual(false);
});
+ it('toggling viewer mode triggers event', function() {
+ var handler = sinon.stub();
+ fileList.$el.on('changeViewerMode', handler);
+ fileList.setViewerMode(true);
+ expect(handler.calledOnce).toEqual(true);
+ expect(handler.getCall(0).args[0].viewerModeEnabled).toEqual(true);
+
+ handler.reset();
+ fileList.setViewerMode(false);
+ expect(handler.calledOnce).toEqual(true);
+ expect(handler.getCall(0).args[0].viewerModeEnabled).toEqual(false);
+ });
});
describe('loading file list', function() {
beforeEach(function() {
@@ -936,22 +1004,22 @@ describe('FileList tests', function() {
]);
});
it('fetches file list from server and renders it when reload() is called', function() {
- FileList.reload();
+ fileList.reload();
expect(fakeServer.requests.length).toEqual(1);
var url = fakeServer.requests[0].url;
var query = url.substr(url.indexOf('?') + 1);
- expect(OC.parseQueryString(query)).toEqual({'dir': '/subdir'});
+ expect(OC.parseQueryString(query)).toEqual({'dir': '/subdir', sort: 'name', sortdirection: 'asc'});
fakeServer.respond();
expect($('#fileList tr').length).toEqual(4);
- expect(FileList.findFileEl('One.txt').length).toEqual(1);
+ expect(fileList.findFileEl('One.txt').length).toEqual(1);
});
it('switches dir and fetches file list when calling changeDirectory()', function() {
- FileList.changeDirectory('/anothersubdir');
- expect(FileList.getCurrentDirectory()).toEqual('/anothersubdir');
+ fileList.changeDirectory('/anothersubdir');
+ expect(fileList.getCurrentDirectory()).toEqual('/anothersubdir');
expect(fakeServer.requests.length).toEqual(1);
var url = fakeServer.requests[0].url;
var query = url.substr(url.indexOf('?') + 1);
- expect(OC.parseQueryString(query)).toEqual({'dir': '/anothersubdir'});
+ expect(OC.parseQueryString(query)).toEqual({'dir': '/anothersubdir', sort: 'name', sortdirection: 'asc'});
fakeServer.respond();
});
it('switches to root dir when current directory does not exist', function() {
@@ -961,14 +1029,14 @@ describe('FileList tests', function() {
},
''
]);
- FileList.changeDirectory('/unexist');
+ fileList.changeDirectory('/unexist');
fakeServer.respond();
- expect(FileList.getCurrentDirectory()).toEqual('/');
+ expect(fileList.getCurrentDirectory()).toEqual('/');
});
it('shows mask before loading file list then hides it at the end', function() {
- var showMaskStub = sinon.stub(FileList, 'showMask');
- var hideMaskStub = sinon.stub(FileList, 'hideMask');
- FileList.changeDirectory('/anothersubdir');
+ var showMaskStub = sinon.stub(fileList, 'showMask');
+ var hideMaskStub = sinon.stub(fileList, 'hideMask');
+ fileList.changeDirectory('/anothersubdir');
expect(showMaskStub.calledOnce).toEqual(true);
expect(hideMaskStub.calledOnce).toEqual(false);
fakeServer.respond();
@@ -977,18 +1045,23 @@ describe('FileList tests', function() {
showMaskStub.restore();
hideMaskStub.restore();
});
- it('changes URL to target dir', function() {
- FileList.changeDirectory('/somedir');
- expect(pushStateStub.calledOnce).toEqual(true);
- expect(pushStateStub.getCall(0).args[0]).toEqual({dir: '/somedir'});
- expect(pushStateStub.getCall(0).args[2]).toEqual(OC.webroot + '/index.php/apps/files?dir=/somedir');
+ it('triggers "changeDirectory" event when changing directory', function() {
+ var handler = sinon.stub();
+ $('#app-content-files').on('changeDirectory', handler);
+ fileList.changeDirectory('/somedir');
+ expect(handler.calledOnce).toEqual(true);
+ expect(handler.getCall(0).args[0].dir).toEqual('/somedir');
+ });
+ it('changes the directory when receiving "urlChanged" event', function() {
+ $('#app-content-files').trigger(new $.Event('urlChanged', {view: 'files', dir: '/somedir'}));
+ expect(fileList.getCurrentDirectory()).toEqual('/somedir');
});
it('refreshes breadcrumb after update', function() {
- var setDirSpy = sinon.spy(FileList.breadcrumb, 'setDirectory');
- FileList.changeDirectory('/anothersubdir');
+ var setDirSpy = sinon.spy(fileList.breadcrumb, 'setDirectory');
+ fileList.changeDirectory('/anothersubdir');
fakeServer.respond();
- expect(FileList.breadcrumb.setDirectory.calledOnce).toEqual(true);
- expect(FileList.breadcrumb.setDirectory.calledWith('/anothersubdir')).toEqual(true);
+ expect(fileList.breadcrumb.setDirectory.calledOnce).toEqual(true);
+ expect(fileList.breadcrumb.setDirectory.calledWith('/anothersubdir')).toEqual(true);
setDirSpy.restore();
});
});
@@ -1009,20 +1082,20 @@ describe('FileList tests', function() {
]);
});
it('clicking on root breadcrumb changes directory to root', function() {
- FileList.changeDirectory('/subdir/two/three with space/four/five');
+ fileList.changeDirectory('/subdir/two/three with space/four/five');
fakeServer.respond();
- var changeDirStub = sinon.stub(FileList, 'changeDirectory');
- FileList.breadcrumb.$el.find('.crumb:eq(0)').click();
+ var changeDirStub = sinon.stub(fileList, 'changeDirectory');
+ fileList.breadcrumb.$el.find('.crumb:eq(0)').click();
expect(changeDirStub.calledOnce).toEqual(true);
expect(changeDirStub.getCall(0).args[0]).toEqual('/');
changeDirStub.restore();
});
it('clicking on breadcrumb changes directory', function() {
- FileList.changeDirectory('/subdir/two/three with space/four/five');
+ fileList.changeDirectory('/subdir/two/three with space/four/five');
fakeServer.respond();
- var changeDirStub = sinon.stub(FileList, 'changeDirectory');
- FileList.breadcrumb.$el.find('.crumb:eq(3)').click();
+ var changeDirStub = sinon.stub(fileList, 'changeDirectory');
+ fileList.breadcrumb.$el.find('.crumb:eq(3)').click();
expect(changeDirStub.calledOnce).toEqual(true);
expect(changeDirStub.getCall(0).args[0]).toEqual('/subdir/two/three with space');
@@ -1030,9 +1103,9 @@ describe('FileList tests', function() {
});
it('dropping files on breadcrumb calls move operation', function() {
var request, query, testDir = '/subdir/two/three with space/four/five';
- FileList.changeDirectory(testDir);
+ fileList.changeDirectory(testDir);
fakeServer.respond();
- var $crumb = FileList.breadcrumb.$el.find('.crumb:eq(3)');
+ var $crumb = fileList.breadcrumb.$el.find('.crumb:eq(3)');
// no idea what this is but is required by the handler
var ui = {
helper: {
@@ -1045,7 +1118,7 @@ describe('FileList tests', function() {
$('<tr data-file="Two.jpg" data-dir="' + testDir + '"></tr>')
]);
// simulate drop event
- FileList._onDropOnBreadCrumb(new $.Event('drop', {target: $crumb}), ui);
+ fileList._onDropOnBreadCrumb(new $.Event('drop', {target: $crumb}), ui);
// will trigger two calls to move.php (first one was previous list.php)
expect(fakeServer.requests.length).toEqual(3);
@@ -1071,10 +1144,10 @@ describe('FileList tests', function() {
});
});
it('dropping files on same dir breadcrumb does nothing', function() {
- var request, query, testDir = '/subdir/two/three with space/four/five';
- FileList.changeDirectory(testDir);
+ var testDir = '/subdir/two/three with space/four/five';
+ fileList.changeDirectory(testDir);
fakeServer.respond();
- var $crumb = FileList.breadcrumb.$el.find('.crumb:last');
+ var $crumb = fileList.breadcrumb.$el.find('.crumb:last');
// no idea what this is but is required by the handler
var ui = {
helper: {
@@ -1087,7 +1160,7 @@ describe('FileList tests', function() {
$('<tr data-file="Two.jpg" data-dir="' + testDir + '"></tr>')
]);
// simulate drop event
- FileList._onDropOnBreadCrumb(new $.Event('drop', {target: $crumb}), ui);
+ fileList._onDropOnBreadCrumb(new $.Event('drop', {target: $crumb}), ui);
// no extra server request
expect(fakeServer.requests.length).toEqual(1);
@@ -1095,32 +1168,32 @@ describe('FileList tests', function() {
});
describe('Download Url', function() {
it('returns correct download URL for single files', function() {
- expect(Files.getDownloadUrl('some file.txt')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=some%20file.txt');
- expect(Files.getDownloadUrl('some file.txt', '/anotherpath/abc')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fanotherpath%2Fabc&files=some%20file.txt');
+ expect(fileList.getDownloadUrl('some file.txt')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=some%20file.txt');
+ expect(fileList.getDownloadUrl('some file.txt', '/anotherpath/abc')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fanotherpath%2Fabc&files=some%20file.txt');
$('#dir').val('/');
- expect(Files.getDownloadUrl('some file.txt')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2F&files=some%20file.txt');
+ expect(fileList.getDownloadUrl('some file.txt')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2F&files=some%20file.txt');
});
it('returns correct download URL for multiple files', function() {
- expect(Files.getDownloadUrl(['a b c.txt', 'd e f.txt'])).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=%5B%22a%20b%20c.txt%22%2C%22d%20e%20f.txt%22%5D');
+ expect(fileList.getDownloadUrl(['a b c.txt', 'd e f.txt'])).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=%5B%22a%20b%20c.txt%22%2C%22d%20e%20f.txt%22%5D');
});
it('returns the correct ajax URL', function() {
- expect(Files.getAjaxUrl('test', {a:1, b:'x y'})).toEqual(OC.webroot + '/index.php/apps/files/ajax/test.php?a=1&b=x%20y');
+ expect(fileList.getAjaxUrl('test', {a:1, b:'x y'})).toEqual(OC.webroot + '/index.php/apps/files/ajax/test.php?a=1&b=x%20y');
});
});
describe('File selection', function() {
beforeEach(function() {
- FileList.setFiles(testFiles);
+ fileList.setFiles(testFiles);
});
it('Selects a file when clicking its checkbox', function() {
- var $tr = FileList.findFileEl('One.txt');
+ var $tr = fileList.findFileEl('One.txt');
expect($tr.find('input:checkbox').prop('checked')).toEqual(false);
$tr.find('td.filename input:checkbox').click();
expect($tr.find('input:checkbox').prop('checked')).toEqual(true);
});
it('Selects/deselect a file when clicking on the name while holding Ctrl', function() {
- var $tr = FileList.findFileEl('One.txt');
- var $tr2 = FileList.findFileEl('Three.pdf');
+ var $tr = fileList.findFileEl('One.txt');
+ var $tr2 = fileList.findFileEl('Three.pdf');
var e;
expect($tr.find('input:checkbox').prop('checked')).toEqual(false);
expect($tr2.find('input:checkbox').prop('checked')).toEqual(false);
@@ -1138,7 +1211,7 @@ describe('FileList tests', function() {
expect($tr.find('input:checkbox').prop('checked')).toEqual(true);
expect($tr2.find('input:checkbox').prop('checked')).toEqual(true);
- expect(_.pluck(FileList.getSelectedFiles(), 'name')).toEqual(['One.txt', 'Three.pdf']);
+ expect(_.pluck(fileList.getSelectedFiles(), 'name')).toEqual(['One.txt', 'Three.pdf']);
// deselect now
e = new $.Event('click');
@@ -1146,11 +1219,11 @@ describe('FileList tests', function() {
$tr2.find('td.filename .name').trigger(e);
expect($tr.find('input:checkbox').prop('checked')).toEqual(true);
expect($tr2.find('input:checkbox').prop('checked')).toEqual(false);
- expect(_.pluck(FileList.getSelectedFiles(), 'name')).toEqual(['One.txt']);
+ expect(_.pluck(fileList.getSelectedFiles(), 'name')).toEqual(['One.txt']);
});
it('Selects a range when clicking on one file then Shift clicking on another one', function() {
- var $tr = FileList.findFileEl('One.txt');
- var $tr2 = FileList.findFileEl('Three.pdf');
+ var $tr = fileList.findFileEl('One.txt');
+ var $tr2 = fileList.findFileEl('Three.pdf');
var e;
$tr.find('td.filename input:checkbox').click();
e = new $.Event('click');
@@ -1159,16 +1232,16 @@ describe('FileList tests', function() {
expect($tr.find('input:checkbox').prop('checked')).toEqual(true);
expect($tr2.find('input:checkbox').prop('checked')).toEqual(true);
- expect(FileList.findFileEl('Two.jpg').find('input:checkbox').prop('checked')).toEqual(true);
- var selection = _.pluck(FileList.getSelectedFiles(), 'name');
+ expect(fileList.findFileEl('Two.jpg').find('input:checkbox').prop('checked')).toEqual(true);
+ var selection = _.pluck(fileList.getSelectedFiles(), 'name');
expect(selection.length).toEqual(3);
expect(selection).toContain('One.txt');
expect(selection).toContain('Two.jpg');
expect(selection).toContain('Three.pdf');
});
it('Selects a range when clicking on one file then Shift clicking on another one that is above the first one', function() {
- var $tr = FileList.findFileEl('One.txt');
- var $tr2 = FileList.findFileEl('Three.pdf');
+ var $tr = fileList.findFileEl('One.txt');
+ var $tr2 = fileList.findFileEl('Three.pdf');
var e;
$tr2.find('td.filename input:checkbox').click();
e = new $.Event('click');
@@ -1177,104 +1250,104 @@ describe('FileList tests', function() {
expect($tr.find('input:checkbox').prop('checked')).toEqual(true);
expect($tr2.find('input:checkbox').prop('checked')).toEqual(true);
- expect(FileList.findFileEl('Two.jpg').find('input:checkbox').prop('checked')).toEqual(true);
- var selection = _.pluck(FileList.getSelectedFiles(), 'name');
+ expect(fileList.findFileEl('Two.jpg').find('input:checkbox').prop('checked')).toEqual(true);
+ var selection = _.pluck(fileList.getSelectedFiles(), 'name');
expect(selection.length).toEqual(3);
expect(selection).toContain('One.txt');
expect(selection).toContain('Two.jpg');
expect(selection).toContain('Three.pdf');
});
it('Selecting all files will automatically check "select all" checkbox', function() {
- expect($('#select_all').prop('checked')).toEqual(false);
+ expect($('.select-all').prop('checked')).toEqual(false);
$('#fileList tr td.filename input:checkbox').click();
- expect($('#select_all').prop('checked')).toEqual(true);
+ expect($('.select-all').prop('checked')).toEqual(true);
});
it('Selecting all files on the first visible page will not automatically check "select all" checkbox', function() {
- FileList.setFiles(generateFiles(0, 41));
- expect($('#select_all').prop('checked')).toEqual(false);
+ fileList.setFiles(generateFiles(0, 41));
+ expect($('.select-all').prop('checked')).toEqual(false);
$('#fileList tr td.filename input:checkbox').click();
- expect($('#select_all').prop('checked')).toEqual(false);
+ expect($('.select-all').prop('checked')).toEqual(false);
});
it('Clicking "select all" will select/deselect all files', function() {
- FileList.setFiles(generateFiles(0, 41));
- $('#select_all').click();
- expect($('#select_all').prop('checked')).toEqual(true);
+ fileList.setFiles(generateFiles(0, 41));
+ $('.select-all').click();
+ expect($('.select-all').prop('checked')).toEqual(true);
$('#fileList tr input:checkbox').each(function() {
expect($(this).prop('checked')).toEqual(true);
});
- expect(_.pluck(FileList.getSelectedFiles(), 'name').length).toEqual(42);
+ expect(_.pluck(fileList.getSelectedFiles(), 'name').length).toEqual(42);
- $('#select_all').click();
- expect($('#select_all').prop('checked')).toEqual(false);
+ $('.select-all').click();
+ expect($('.select-all').prop('checked')).toEqual(false);
$('#fileList tr input:checkbox').each(function() {
expect($(this).prop('checked')).toEqual(false);
});
- expect(_.pluck(FileList.getSelectedFiles(), 'name').length).toEqual(0);
+ expect(_.pluck(fileList.getSelectedFiles(), 'name').length).toEqual(0);
});
it('Clicking "select all" then deselecting a file will uncheck "select all"', function() {
- $('#select_all').click();
- expect($('#select_all').prop('checked')).toEqual(true);
+ $('.select-all').click();
+ expect($('.select-all').prop('checked')).toEqual(true);
- var $tr = FileList.findFileEl('One.txt');
+ var $tr = fileList.findFileEl('One.txt');
$tr.find('input:checkbox').click();
- expect($('#select_all').prop('checked')).toEqual(false);
- expect(_.pluck(FileList.getSelectedFiles(), 'name').length).toEqual(3);
+ expect($('.select-all').prop('checked')).toEqual(false);
+ expect(_.pluck(fileList.getSelectedFiles(), 'name').length).toEqual(3);
});
it('Updates the selection summary when doing a few manipulations with "Select all"', function() {
- $('#select_all').click();
- expect($('#select_all').prop('checked')).toEqual(true);
+ $('.select-all').click();
+ expect($('.select-all').prop('checked')).toEqual(true);
- var $tr = FileList.findFileEl('One.txt');
+ var $tr = fileList.findFileEl('One.txt');
// unselect one
$tr.find('input:checkbox').click();
- expect($('#select_all').prop('checked')).toEqual(false);
- expect(_.pluck(FileList.getSelectedFiles(), 'name').length).toEqual(3);
+ expect($('.select-all').prop('checked')).toEqual(false);
+ expect(_.pluck(fileList.getSelectedFiles(), 'name').length).toEqual(3);
// select all
- $('#select_all').click();
- expect($('#select_all').prop('checked')).toEqual(true);
- expect(_.pluck(FileList.getSelectedFiles(), 'name').length).toEqual(4);
+ $('.select-all').click();
+ expect($('.select-all').prop('checked')).toEqual(true);
+ expect(_.pluck(fileList.getSelectedFiles(), 'name').length).toEqual(4);
// unselect one
$tr.find('input:checkbox').click();
- expect($('#select_all').prop('checked')).toEqual(false);
- expect(_.pluck(FileList.getSelectedFiles(), 'name').length).toEqual(3);
+ expect($('.select-all').prop('checked')).toEqual(false);
+ expect(_.pluck(fileList.getSelectedFiles(), 'name').length).toEqual(3);
// re-select it
$tr.find('input:checkbox').click();
- expect($('#select_all').prop('checked')).toEqual(true);
- expect(_.pluck(FileList.getSelectedFiles(), 'name').length).toEqual(4);
+ expect($('.select-all').prop('checked')).toEqual(true);
+ expect(_.pluck(fileList.getSelectedFiles(), 'name').length).toEqual(4);
});
it('Auto-selects files on next page when "select all" is checked', function() {
- FileList.setFiles(generateFiles(0, 41));
- $('#select_all').click();
+ fileList.setFiles(generateFiles(0, 41));
+ $('.select-all').click();
- expect(FileList.$fileList.find('tr input:checkbox:checked').length).toEqual(20);
- FileList._nextPage(true);
- expect(FileList.$fileList.find('tr input:checkbox:checked').length).toEqual(40);
- FileList._nextPage(true);
- expect(FileList.$fileList.find('tr input:checkbox:checked').length).toEqual(42);
- expect(_.pluck(FileList.getSelectedFiles(), 'name').length).toEqual(42);
+ expect(fileList.$fileList.find('tr input:checkbox:checked').length).toEqual(20);
+ fileList._nextPage(true);
+ expect(fileList.$fileList.find('tr input:checkbox:checked').length).toEqual(40);
+ fileList._nextPage(true);
+ expect(fileList.$fileList.find('tr input:checkbox:checked').length).toEqual(42);
+ expect(_.pluck(fileList.getSelectedFiles(), 'name').length).toEqual(42);
});
it('Selecting files updates selection summary', function() {
- var $summary = $('#headerName span.name');
+ var $summary = $('#headerName a.name>span:first');
expect($summary.text()).toEqual('Name');
- FileList.findFileEl('One.txt').find('input:checkbox').click();
- FileList.findFileEl('Three.pdf').find('input:checkbox').click();
- FileList.findFileEl('somedir').find('input:checkbox').click();
+ fileList.findFileEl('One.txt').find('input:checkbox').click();
+ fileList.findFileEl('Three.pdf').find('input:checkbox').click();
+ fileList.findFileEl('somedir').find('input:checkbox').click();
expect($summary.text()).toEqual('1 folder & 2 files');
});
it('Unselecting files hides selection summary', function() {
- var $summary = $('#headerName span.name');
- FileList.findFileEl('One.txt').find('input:checkbox').click().click();
+ var $summary = $('#headerName a.name>span:first');
+ fileList.findFileEl('One.txt').find('input:checkbox').click().click();
expect($summary.text()).toEqual('Name');
});
it('Select/deselect files shows/hides file actions', function() {
var $actions = $('#headerName .selectedActions');
- var $checkbox = FileList.findFileEl('One.txt').find('input:checkbox');
+ var $checkbox = fileList.findFileEl('One.txt').find('input:checkbox');
expect($actions.hasClass('hidden')).toEqual(true);
$checkbox.click();
expect($actions.hasClass('hidden')).toEqual(false);
@@ -1282,7 +1355,7 @@ describe('FileList tests', function() {
expect($actions.hasClass('hidden')).toEqual(true);
});
it('Selection is cleared when switching dirs', function() {
- $('#select_all').click();
+ $('.select-all').click();
var data = {
status: 'success',
data: {
@@ -1296,31 +1369,43 @@ describe('FileList tests', function() {
},
JSON.stringify(data)
]);
- FileList.changeDirectory('/');
+ fileList.changeDirectory('/');
fakeServer.respond();
- expect($('#select_all').prop('checked')).toEqual(false);
- expect(_.pluck(FileList.getSelectedFiles(), 'name')).toEqual([]);
+ expect($('.select-all').prop('checked')).toEqual(false);
+ expect(_.pluck(fileList.getSelectedFiles(), 'name')).toEqual([]);
});
it('getSelectedFiles returns the selected files even when they are on the next page', function() {
var selectedFiles;
- FileList.setFiles(generateFiles(0, 41));
- $('#select_all').click();
+ fileList.setFiles(generateFiles(0, 41));
+ $('.select-all').click();
// unselect one to not have the "allFiles" case
- FileList.$fileList.find('tr input:checkbox:first').click();
+ fileList.$fileList.find('tr input:checkbox:first').click();
// only 20 files visible, must still return all the selected ones
- selectedFiles = _.pluck(FileList.getSelectedFiles(), 'name');
+ selectedFiles = _.pluck(fileList.getSelectedFiles(), 'name');
expect(selectedFiles.length).toEqual(41);
});
+ describe('Selection overlay', function() {
+ it('show delete action according to directory permissions', function() {
+ fileList.setFiles(testFiles);
+ $('#permissions').val(OC.PERMISSION_READ | OC.PERMISSION_DELETE);
+ $('.select-all').click();
+ expect(fileList.$el.find('.delete-selected').hasClass('hidden')).toEqual(false);
+ $('.select-all').click();
+ $('#permissions').val(OC.PERMISSION_READ);
+ $('.select-all').click();
+ expect(fileList.$el.find('.delete-selected').hasClass('hidden')).toEqual(true);
+ });
+ });
describe('Actions', function() {
beforeEach(function() {
- FileList.findFileEl('One.txt').find('input:checkbox').click();
- FileList.findFileEl('Three.pdf').find('input:checkbox').click();
- FileList.findFileEl('somedir').find('input:checkbox').click();
+ fileList.findFileEl('One.txt').find('input:checkbox').click();
+ fileList.findFileEl('Three.pdf').find('input:checkbox').click();
+ fileList.findFileEl('somedir').find('input:checkbox').click();
});
it('getSelectedFiles returns the selected file data', function() {
- var files = FileList.getSelectedFiles();
+ var files = fileList.getSelectedFiles();
expect(files.length).toEqual(3);
expect(files[0]).toEqual({
id: 1,
@@ -1348,8 +1433,8 @@ describe('FileList tests', function() {
});
});
it('Removing a file removes it from the selection', function() {
- FileList.remove('Three.pdf');
- var files = FileList.getSelectedFiles();
+ fileList.remove('Three.pdf');
+ var files = fileList.getSelectedFiles();
expect(files.length).toEqual(2);
expect(files[0]).toEqual({
id: 1,
@@ -1378,7 +1463,7 @@ describe('FileList tests', function() {
});
it('Downloads root folder when all selected in root folder', function() {
$('#dir').val('/');
- $('#select_all').click();
+ $('.select-all').click();
var redirectStub = sinon.stub(OC, 'redirect');
$('.selectedActions .download').click();
expect(redirectStub.calledOnce).toEqual(true);
@@ -1386,7 +1471,7 @@ describe('FileList tests', function() {
redirectStub.restore();
});
it('Downloads parent folder when all selected in subfolder', function() {
- $('#select_all').click();
+ $('.select-all').click();
var redirectStub = sinon.stub(OC, 'redirect');
$('.selectedActions .download').click();
expect(redirectStub.calledOnce).toEqual(true);
@@ -1408,14 +1493,14 @@ describe('FileList tests', function() {
{ 'Content-Type': 'application/json' },
JSON.stringify({status: 'success'})
);
- expect(FileList.findFileEl('One.txt').length).toEqual(0);
- expect(FileList.findFileEl('Three.pdf').length).toEqual(0);
- expect(FileList.findFileEl('somedir').length).toEqual(0);
- expect(FileList.findFileEl('Two.jpg').length).toEqual(1);
+ expect(fileList.findFileEl('One.txt').length).toEqual(0);
+ expect(fileList.findFileEl('Three.pdf').length).toEqual(0);
+ expect(fileList.findFileEl('somedir').length).toEqual(0);
+ expect(fileList.findFileEl('Two.jpg').length).toEqual(1);
});
it('Deletes all files when all selected when "Delete" clicked', function() {
var request;
- $('#select_all').click();
+ $('.select-all').click();
$('.selectedActions .delete-selected').click();
expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0];
@@ -1427,9 +1512,315 @@ describe('FileList tests', function() {
{ 'Content-Type': 'application/json' },
JSON.stringify({status: 'success'})
);
- expect(FileList.isEmpty).toEqual(true);
+ expect(fileList.isEmpty).toEqual(true);
});
});
});
+ it('resets the file selection on reload', function() {
+ fileList.$el.find('.select-all').click();
+ fileList.reload();
+ expect(fileList.$el.find('.select-all').prop('checked')).toEqual(false);
+ expect(fileList.getSelectedFiles()).toEqual([]);
+ });
+ });
+ describe('File actions', function() {
+ it('Clicking on a file name will trigger default action', function() {
+ var actionStub = sinon.stub();
+ fileList.setFiles(testFiles);
+ fileList.fileActions.register(
+ 'text/plain',
+ 'Test',
+ OC.PERMISSION_ALL,
+ function() {
+ // Specify icon for hitory button
+ return OC.imagePath('core','actions/history');
+ },
+ actionStub
+ );
+ fileList.fileActions.setDefault('text/plain', 'Test');
+ var $tr = fileList.findFileEl('One.txt');
+ $tr.find('td.filename>a.name').click();
+ expect(actionStub.calledOnce).toEqual(true);
+ expect(actionStub.getCall(0).args[0]).toEqual('One.txt');
+ var context = actionStub.getCall(0).args[1];
+ expect(context.$file.is($tr)).toEqual(true);
+ expect(context.fileList).toBeDefined();
+ expect(context.fileActions).toBeDefined();
+ expect(context.dir).toEqual('/subdir');
+ });
+ });
+ describe('Sorting files', function() {
+ it('Sorts by name by default', function() {
+ fileList.reload();
+ expect(fakeServer.requests.length).toEqual(1);
+ var url = fakeServer.requests[0].url;
+ var query = OC.parseQueryString(url.substr(url.indexOf('?') + 1));
+ expect(query.sort).toEqual('name');
+ expect(query.sortdirection).toEqual('asc');
+ });
+ it('Reloads file list with a different sort when clicking on column header of unsorted column', function() {
+ fileList.$el.find('.column-size .columntitle').click();
+ expect(fakeServer.requests.length).toEqual(1);
+ var url = fakeServer.requests[0].url;
+ var query = OC.parseQueryString(url.substr(url.indexOf('?') + 1));
+ expect(query.sort).toEqual('size');
+ expect(query.sortdirection).toEqual('asc');
+ });
+ it('Toggles sort direction when clicking on already sorted column', function() {
+ fileList.$el.find('.column-name .columntitle').click();
+ expect(fakeServer.requests.length).toEqual(1);
+ var url = fakeServer.requests[0].url;
+ var query = OC.parseQueryString(url.substr(url.indexOf('?') + 1));
+ expect(query.sort).toEqual('name');
+ expect(query.sortdirection).toEqual('desc');
+ });
+ it('Toggles the sort indicator when clicking on a column header', function() {
+ var ASC_CLASS = fileList.SORT_INDICATOR_ASC_CLASS;
+ var DESC_CLASS = fileList.SORT_INDICATOR_DESC_CLASS;
+ fileList.$el.find('.column-size .columntitle').click();
+ // moves triangle to size column
+ expect(
+ fileList.$el.find('.column-name .sort-indicator').hasClass(ASC_CLASS + ' ' + DESC_CLASS)
+ ).toEqual(false);
+ expect(
+ fileList.$el.find('.column-size .sort-indicator').hasClass(ASC_CLASS)
+ ).toEqual(true);
+
+ // click again on size column, reverses direction
+ fileList.$el.find('.column-size .columntitle').click();
+ expect(
+ fileList.$el.find('.column-size .sort-indicator').hasClass(DESC_CLASS)
+ ).toEqual(true);
+
+ // click again on size column, reverses direction
+ fileList.$el.find('.column-size .columntitle').click();
+ expect(
+ fileList.$el.find('.column-size .sort-indicator').hasClass(ASC_CLASS)
+ ).toEqual(true);
+
+ // click on mtime column, moves indicator there
+ fileList.$el.find('.column-mtime .columntitle').click();
+ expect(
+ fileList.$el.find('.column-size .sort-indicator').hasClass(ASC_CLASS + ' ' + DESC_CLASS)
+ ).toEqual(false);
+ expect(
+ fileList.$el.find('.column-mtime .sort-indicator').hasClass(ASC_CLASS)
+ ).toEqual(true);
+ });
+ it('Uses correct sort comparator when inserting files', function() {
+ testFiles.sort(OCA.Files.FileList.Comparators.size);
+ // this will make it reload the testFiles with the correct sorting
+ fileList.$el.find('.column-size .columntitle').click();
+ expect(fakeServer.requests.length).toEqual(1);
+ fakeServer.requests[0].respond(
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify({
+ status: 'success',
+ data: {
+ files: testFiles,
+ permissions: 31
+ }
+ })
+ );
+ var newFileData = {
+ id: 999,
+ type: 'file',
+ name: 'new file.txt',
+ mimetype: 'text/plain',
+ size: 40001,
+ etag: '999'
+ };
+ fileList.add(newFileData);
+ expect(fileList.files.length).toEqual(5);
+ expect(fileList.$fileList.find('tr').length).toEqual(5);
+ expect(fileList.findFileEl('One.txt').index()).toEqual(0);
+ expect(fileList.findFileEl('somedir').index()).toEqual(1);
+ expect(fileList.findFileEl('Two.jpg').index()).toEqual(2);
+ expect(fileList.findFileEl('new file.txt').index()).toEqual(3);
+ expect(fileList.findFileEl('Three.pdf').index()).toEqual(4);
+ });
+ it('Uses correct reversed sort comparator when inserting files', function() {
+ testFiles.sort(OCA.Files.FileList.Comparators.size);
+ testFiles.reverse();
+ // this will make it reload the testFiles with the correct sorting
+ fileList.$el.find('.column-size .columntitle').click();
+ expect(fakeServer.requests.length).toEqual(1);
+ fakeServer.requests[0].respond(
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify({
+ status: 'success',
+ data: {
+ files: testFiles,
+ permissions: 31
+ }
+ })
+ );
+ // reverse sort
+ fileList.$el.find('.column-size .columntitle').click();
+ fakeServer.requests[1].respond(
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify({
+ status: 'success',
+ data: {
+ files: testFiles,
+ permissions: 31
+ }
+ })
+ );
+ var newFileData = {
+ id: 999,
+ type: 'file',
+ name: 'new file.txt',
+ mimetype: 'text/plain',
+ size: 40001,
+ etag: '999'
+ };
+ fileList.add(newFileData);
+ expect(fileList.files.length).toEqual(5);
+ expect(fileList.$fileList.find('tr').length).toEqual(5);
+ expect(fileList.findFileEl('One.txt').index()).toEqual(4);
+ expect(fileList.findFileEl('somedir').index()).toEqual(3);
+ expect(fileList.findFileEl('Two.jpg').index()).toEqual(2);
+ expect(fileList.findFileEl('new file.txt').index()).toEqual(1);
+ expect(fileList.findFileEl('Three.pdf').index()).toEqual(0);
+ });
+ });
+ /**
+ * Test upload mostly by testing the code inside the event handlers
+ * that were registered on the magic upload object
+ */
+ describe('file upload', function() {
+ var $uploader;
+
+ beforeEach(function() {
+ // note: this isn't the real blueimp file uploader from jquery.fileupload
+ // but it makes it possible to simulate the event triggering to
+ // test the response of the handlers
+ $uploader = $('#file_upload_start');
+ fileList.setupUploadEvents();
+ fileList.setFiles(testFiles);
+ });
+
+ afterEach(function() {
+ $uploader = null;
+ });
+
+ describe('dropping external files', function() {
+ var uploadData;
+
+ /**
+ * Simulate drop event on the given target
+ *
+ * @param $target target element to drop on
+ * @return event object including the result
+ */
+ function dropOn($target, data) {
+ var eventData = {
+ originalEvent: {
+ target: $target
+ }
+ };
+ var ev = new $.Event('fileuploaddrop', eventData);
+ // using triggerHandler instead of trigger so we can pass
+ // extra data
+ $uploader.triggerHandler(ev, data || {});
+ return ev;
+ }
+
+ /**
+ * Convert form data to a flat list
+ *
+ * @param formData form data array as used by jquery.upload
+ * @return map based on the array's key values
+ */
+ function decodeFormData(data) {
+ var map = {};
+ _.each(data.formData(), function(entry) {
+ map[entry.name] = entry.value;
+ });
+ return map;
+ }
+
+ beforeEach(function() {
+ // simulate data structure from jquery.upload
+ uploadData = {
+ files: [{
+ relativePath: 'fileToUpload.txt'
+ }]
+ };
+ });
+ afterEach(function() {
+ uploadData = null;
+ });
+ it('drop on a tr or crumb outside file list does not trigger upload', function() {
+ var $anotherTable = $('<table><tbody><tr><td>outside<div class="crumb">crumb</div></td></tr></table>');
+ var ev;
+ $('#testArea').append($anotherTable);
+ ev = dropOn($anotherTable.find('tr'), uploadData);
+ expect(ev.result).toEqual(false);
+
+ ev = dropOn($anotherTable.find('.crumb'));
+ expect(ev.result).toEqual(false);
+ });
+ it('drop on an element outside file list container does not trigger upload', function() {
+ var $anotherEl = $('<div>outside</div>');
+ var ev;
+ $('#testArea').append($anotherEl);
+ ev = dropOn($anotherEl);
+
+ expect(ev.result).toEqual(false);
+ });
+ it('drop on an element inside the table triggers upload', function() {
+ var ev;
+ ev = dropOn(fileList.$fileList.find('th:first'), uploadData);
+
+ expect(ev.result).not.toEqual(false);
+ });
+ it('drop on an element on the table container triggers upload', function() {
+ var ev;
+ ev = dropOn($('#app-content-files'), uploadData);
+
+ expect(ev.result).not.toEqual(false);
+ });
+ it('drop on an element inside the table does not trigger upload if no upload permission', function() {
+ $('#permissions').val(0);
+ var ev;
+ ev = dropOn(fileList.$fileList.find('th:first'));
+
+ expect(ev.result).toEqual(false);
+ });
+ it('drop on a file row inside the table triggers upload to current folder', function() {
+ var ev;
+ ev = dropOn(fileList.findFileEl('One.txt').find('td:first'), uploadData);
+
+ expect(ev.result).not.toEqual(false);
+ });
+ it('drop on a folder row inside the table triggers upload to target folder', function() {
+ var ev, formData;
+ ev = dropOn(fileList.findFileEl('somedir').find('td:eq(2)'), uploadData);
+
+ expect(ev.result).not.toEqual(false);
+ expect(uploadData.formData).toBeDefined();
+ formData = decodeFormData(uploadData);
+ expect(formData.dir).toEqual('/subdir/somedir');
+ expect(formData.file_directory).toEqual('fileToUpload.txt');
+ expect(formData.requesttoken).toBeDefined();
+ });
+ it('drop on a breadcrumb inside the table triggers upload to target folder', function() {
+ var ev, formData;
+ fileList.changeDirectory('a/b/c/d');
+ ev = dropOn(fileList.$el.find('.crumb:eq(2)'), uploadData);
+
+ expect(ev.result).not.toEqual(false);
+ expect(uploadData.formData).toBeDefined();
+ formData = decodeFormData(uploadData);
+ expect(formData.dir).toEqual('/a/b');
+ expect(formData.file_directory).toEqual('fileToUpload.txt');
+ expect(formData.requesttoken).toBeDefined();
+ });
+ });
});
});
diff --git a/apps/files/tests/js/filesSpec.js b/apps/files/tests/js/filesSpec.js
index 7f8848619f500c57b795439783d3d29237a3a689..4f8d5a29318ee97776c7ef880d9053a0d08e472c 100644
--- a/apps/files/tests/js/filesSpec.js
+++ b/apps/files/tests/js/filesSpec.js
@@ -19,8 +19,9 @@
*
*/
-/* global OC, Files */
-describe('Files tests', function() {
+describe('OCA.Files.Files tests', function() {
+ var Files = OCA.Files.Files;
+
describe('File name validation', function() {
it('Validates correct file names', function() {
var fileNames = [
@@ -83,18 +84,6 @@ describe('Files tests', function() {
});
});
describe('getDownloadUrl', function() {
- var curDirStub;
- beforeEach(function() {
- curDirStub = sinon.stub(FileList, 'getCurrentDirectory');
- });
- afterEach(function() {
- curDirStub.restore();
- });
- it('returns the ajax download URL when only filename specified', function() {
- curDirStub.returns('/subdir');
- var url = Files.getDownloadUrl('test file.txt');
- expect(url).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=test%20file.txt');
- });
it('returns the ajax download URL when filename and dir specified', function() {
var url = Files.getDownloadUrl('test file.txt', '/subdir');
expect(url).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=test%20file.txt');
diff --git a/apps/files/tests/js/filesummarySpec.js b/apps/files/tests/js/filesummarySpec.js
index c493700de3801d2d361092bdec90d8519c6c413e..5e39dd1d23282374a7cb396f4cf1655b3ee842f3 100644
--- a/apps/files/tests/js/filesummarySpec.js
+++ b/apps/files/tests/js/filesummarySpec.js
@@ -20,7 +20,8 @@
*/
/* global FileSummary */
-describe('FileSummary tests', function() {
+describe('OCA.Files.FileSummary tests', function() {
+ var FileSummary = OCA.Files.FileSummary;
var $container;
beforeEach(function() {
diff --git a/apps/files/triggerupdate.php b/apps/files/triggerupdate.php
index a37b9823add43ac72061790d987a9ec7610c8ab8..3f85da9913b04b1cd3d8955a508091d42caf991f 100644
--- a/apps/files/triggerupdate.php
+++ b/apps/files/triggerupdate.php
@@ -6,7 +6,7 @@ if (OC::$CLI) {
if (count($argv) === 2) {
$file = $argv[1];
list(, $user) = explode('/', $file);
- OCP\JSON::checkUserExists($owner);
+ OCP\JSON::checkUserExists($user);
OC_Util::setupFS($user);
$view = new \OC\Files\View('');
/**
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
index 61e43acc2c33141401c53df32649988705242727..303ba0e16e12dd9b71aa49ee163e8aaa99f0ddad 100644
--- a/apps/files_encryption/ajax/adminrecovery.php
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -5,7 +5,7 @@
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*
- * @brief Script to handle admin settings for encrypted key recovery
+ * Script to handle admin settings for encrypted key recovery
*/
use OCA\Encryption;
diff --git a/apps/files_encryption/ajax/changeRecoveryPassword.php b/apps/files_encryption/ajax/changeRecoveryPassword.php
index 945f054ea844832c41de2ef90c9fe6e9b1535f91..0cb010d3b566be84dd1d9fae6a03b0786aef6587 100644
--- a/apps/files_encryption/ajax/changeRecoveryPassword.php
+++ b/apps/files_encryption/ajax/changeRecoveryPassword.php
@@ -5,7 +5,7 @@
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*
- * @brief Script to change recovery key password
+ * Script to change recovery key password
*
*/
@@ -23,7 +23,7 @@ $oldPassword = $_POST['oldPassword'];
$newPassword = $_POST['newPassword'];
$view = new \OC\Files\View('/');
-$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+$util = new \OCA\Encryption\Util(new \OC\Files\View('/'), \OCP\User::getUser());
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
diff --git a/apps/files_encryption/ajax/getMigrationStatus.php b/apps/files_encryption/ajax/getMigrationStatus.php
index 7c9e0dcc51c51d7ecc54bfda8879b806da44be09..adceb949044efafab7fb346775924c841d9168f7 100644
--- a/apps/files_encryption/ajax/getMigrationStatus.php
+++ b/apps/files_encryption/ajax/getMigrationStatus.php
@@ -4,7 +4,7 @@
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*
- * @brief check migration status
+ * check migration status
*/
use OCA\Encryption\Util;
@@ -18,7 +18,7 @@ $migrationStatus = Util::MIGRATION_COMPLETED;
if ($loginname !== '' && $password !== '') {
$username = \OCP\User::checkPassword($loginname, $password);
if ($username) {
- $util = new Util(new \OC_FilesystemView('/'), $username);
+ $util = new Util(new \OC\Files\View('/'), $username);
$migrationStatus = $util->getMigrationStatus();
}
}
diff --git a/apps/files_encryption/ajax/updatePrivateKeyPassword.php b/apps/files_encryption/ajax/updatePrivateKeyPassword.php
index 29c72952ae9de4457cc5d63340c4caef9658615f..f7d20c486cf41f200652b1e4fbfe5abae81ce0a9 100644
--- a/apps/files_encryption/ajax/updatePrivateKeyPassword.php
+++ b/apps/files_encryption/ajax/updatePrivateKeyPassword.php
@@ -5,7 +5,7 @@
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*
- * @brief Script to change recovery key password
+ * Script to change recovery key password
*
*/
diff --git a/apps/files_encryption/ajax/userrecovery.php b/apps/files_encryption/ajax/userrecovery.php
index d6c94bde81e5501981f13a084982d00b7932c515..0f3b973d69ab8be1938a0fcff07833f957b22b35 100644
--- a/apps/files_encryption/ajax/userrecovery.php
+++ b/apps/files_encryption/ajax/userrecovery.php
@@ -4,7 +4,7 @@
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*
- * @brief Script to handle admin settings for encrypted key recovery
+ * Script to handle admin settings for encrypted key recovery
*/
use OCA\Encryption;
@@ -19,7 +19,7 @@ if (
) {
$userId = \OCP\USER::getUser();
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
$util = new \OCA\Encryption\Util($view, $userId);
// Save recovery preference to DB
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 21de421c1956efebd98a391bbf3db4dd6cc36aba..104e8568caa62f022f865f36b3e6bca25d749904 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -40,7 +40,7 @@ if (!OC_Config::getValue('maintenance', false)) {
\OC_Util::setupFS();
}
- $view = new OC_FilesystemView('/');
+ $view = new OC\Files\View('/');
$sessionReady = OCA\Encryption\Helper::checkRequirements();
if($sessionReady) {
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 15a09a29f51da5b99edfb72bae10fa2b53fc3644..b11272f63e7a2bde47baafecb3bb086882d74fb6 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -5,7 +5,7 @@
<description>The ownCloud files encryption system provides server side-encryption. After the app is enabled you need to re-login to initialize your encryption keys. Please note that server side encryption requires that the ownCloud server admin can be trusted. The main purpose of this app is the encryption of files that are stored on externally mounted storages.</description>
<licence>AGPL</licence>
<author>Sam Tuke, Bjoern Schiessle, Florin Peter</author>
- <require>4</require>
+ <requiremin>4</requiremin>
<shipped>true</shipped>
<documentation>
<user>http://doc.owncloud.org/server/6.0/user_manual/files/encryption.html</user>
diff --git a/apps/files_encryption/files/error.php b/apps/files_encryption/files/error.php
index 317cea05a128cc8a8cc930c3066c12a266486dc4..f925442612d632928a1c0b674f4eef16f06a8e42 100644
--- a/apps/files_encryption/files/error.php
+++ b/apps/files_encryption/files/error.php
@@ -19,12 +19,12 @@ if (!isset($_)) { //also provide standalone error page
$errorMsg = $l->t('Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');
break;
default:
- $errorMsg = $l->t("Unknown error please check your system settings or contact your administrator");
+ $errorMsg = $l->t("Unknown error. Please check your system settings or contact your administrator");
break;
}
} else {
$errorCode = \OCA\Encryption\Crypt::ENCRYPTION_UNKNOWN_ERROR;
- $errorMsg = $l->t("Unknown error please check your system settings or contact your administrator");
+ $errorMsg = $l->t("Unknown error. Please check your system settings or contact your administrator");
}
if (isset($_GET['p']) && $_GET['p'] === '1') {
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 5f0494e62ca38361e2b0b39c42b2218fef5b5536..f2096c3956e3b6e5f2ef49e58f065e644c6e0792 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -36,7 +36,7 @@ class Hooks {
private static $deleteFiles = array();
/**
- * @brief Startup encryption backend upon user login
+ * Startup encryption backend upon user login
* @note This method should never be called for users using client side encryption
*/
public static function login($params) {
@@ -48,7 +48,7 @@ class Hooks {
$l = new \OC_L10N('files_encryption');
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
// ensure filesystem is loaded
if(!\OC\Files\Filesystem::$loaded) {
@@ -81,7 +81,7 @@ class Hooks {
// Check if first-run file migration has already been performed
$ready = false;
$migrationStatus = $util->getMigrationStatus();
- if ($migrationStatus === Util::MIGRATION_OPEN) {
+ if ($migrationStatus === Util::MIGRATION_OPEN && $session !== false) {
$ready = $util->beginMigration();
} elseif ($migrationStatus === Util::MIGRATION_IN_PROGRESS) {
// refuse login as long as the initial encryption is running
@@ -93,7 +93,7 @@ class Hooks {
// If migration not yet done
if ($ready) {
- $userView = new \OC_FilesystemView('/' . $params['uid']);
+ $userView = new \OC\Files\View('/' . $params['uid']);
// Set legacy encryption key if it exists, to support
// depreciated encryption system
@@ -136,26 +136,26 @@ class Hooks {
}
/**
- * @brief setup encryption backend upon user created
+ * setup encryption backend upon user created
* @note This method should never be called for users using client side encryption
*/
public static function postCreateUser($params) {
if (\OCP\App::isEnabled('files_encryption')) {
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
$util = new Util($view, $params['uid']);
Helper::setupUser($util, $params['password']);
}
}
/**
- * @brief cleanup encryption backend upon user deleted
+ * cleanup encryption backend upon user deleted
* @note This method should never be called for users using client side encryption
*/
public static function postDeleteUser($params) {
if (\OCP\App::isEnabled('files_encryption')) {
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
// cleanup public key
$publicKey = '/public-keys/' . $params['uid'] . '.public.key';
@@ -171,7 +171,7 @@ class Hooks {
}
/**
- * @brief If the password can't be changed within ownCloud, than update the key password in advance.
+ * If the password can't be changed within ownCloud, than update the key password in advance.
*/
public static function preSetPassphrase($params) {
if (\OCP\App::isEnabled('files_encryption')) {
@@ -182,7 +182,7 @@ class Hooks {
}
/**
- * @brief Change a user's encryption passphrase
+ * Change a user's encryption passphrase
* @param array $params keys: uid, password
*/
public static function setPassphrase($params) {
@@ -196,7 +196,7 @@ class Hooks {
// the necessary keys)
if (Crypt::mode() === 'server') {
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
if ($params['uid'] === \OCP\User::getUser()) {
@@ -222,10 +222,14 @@ class Hooks {
$util = new Util($view, $user);
$recoveryPassword = isset($params['recoveryPassword']) ? $params['recoveryPassword'] : null;
+ // we generate new keys if...
+ // ...we have a recovery password and the user enabled the recovery key
+ // ...encryption was activated for the first time (no keys exists)
+ // ...the user doesn't have any files
if (($util->recoveryEnabledForUser() && $recoveryPassword)
- || !$util->userKeysExists()) {
+ || !$util->userKeysExists()
+ || !$view->file_exists($user . '/files')) {
- $recoveryPassword = $params['recoveryPassword'];
$newUserPassword = $params['password'];
// make sure that the users home is mounted
@@ -259,10 +263,10 @@ class Hooks {
}
/*
- * @brief check if files can be encrypted to every user.
+ * check if files can be encrypted to every user.
*/
/**
- * @param $params
+ * @param array $params
*/
public static function preShared($params) {
@@ -308,7 +312,7 @@ class Hooks {
if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
$session = new \OCA\Encryption\Session($view);
$userId = \OCP\User::getUser();
$util = new Util($view, $userId);
@@ -316,14 +320,9 @@ class Hooks {
$sharingEnabled = \OCP\Share::isEnabled();
- // get the path including mount point only if not a shared folder
- list($storage, ) = \OC\Files\Filesystem::resolvePath('/' . $userId . '/files' . $path);
-
- if (!($storage instanceof \OC\Files\Storage\Local)) {
- $mountPoint = 'files' . $storage->getMountPoint();
- } else {
- $mountPoint = '';
- }
+ $mountManager = \OC\Files\Filesystem::getMountManager();
+ $mount = $mountManager->find('/' . $userId . '/files' . $path);
+ $mountPoint = $mount->getMountPoint();
// if a folder was shared, get a list of all (sub-)folders
if ($params['itemType'] === 'folder') {
@@ -350,7 +349,7 @@ class Hooks {
if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
$userId = \OCP\User::getUser();
$util = new Util($view, $userId);
$path = \OC\Files\Filesystem::getPath($params['fileSource']);
@@ -366,14 +365,9 @@ class Hooks {
}
}
- // get the path including mount point only if not a shared folder
- list($storage, ) = \OC\Files\Filesystem::resolvePath('/' . $userId . '/files' . $path);
-
- if (!($storage instanceof \OC\Files\Storage\Local)) {
- $mountPoint = 'files' . $storage->getMountPoint();
- } else {
- $mountPoint = '';
- }
+ $mountManager = \OC\Files\Filesystem::getMountManager();
+ $mount = $mountManager->find('/' . $userId . '/files' . $path);
+ $mountPoint = $mount->getMountPoint();
// if we unshare a folder we need a list of all (sub-)files
if ($params['itemType'] === 'folder') {
@@ -398,12 +392,12 @@ class Hooks {
}
/**
- * @brief mark file as renamed so that we know the original source after the file was renamed
+ * mark file as renamed so that we know the original source after the file was renamed
* @param array $params with the old path and the new path
*/
public static function preRename($params) {
$user = \OCP\User::getUser();
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
$util = new Util($view, $user);
list($ownerOld, $pathOld) = $util->getUidAndFilename($params['oldpath']);
@@ -421,8 +415,8 @@ class Hooks {
}
/**
- * @brief after a file is renamed, rename its keyfile and share-keys also fix the file size and fix also the sharing
- * @param array with oldpath and newpath
+ * after a file is renamed, rename its keyfile and share-keys also fix the file size and fix also the sharing
+ * @param array $params array with oldpath and newpath
*
* This function is connected to the rename signal of OC_Filesystem and adjust the name and location
* of the stored versions along the actual file
@@ -437,7 +431,7 @@ class Hooks {
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
$session = new \OCA\Encryption\Session($view);
$userId = \OCP\User::getUser();
$util = new Util($view, $userId);
@@ -557,7 +551,7 @@ class Hooks {
}
/**
- * @brief if the file was really deleted we remove the encryption keys
+ * if the file was really deleted we remove the encryption keys
* @param array $params
* @return boolean|null
*/
@@ -597,7 +591,7 @@ class Hooks {
}
/**
- * @brief remember the file which should be deleted and it's owner
+ * remember the file which should be deleted and it's owner
* @param array $params
* @return boolean|null
*/
@@ -610,7 +604,7 @@ class Hooks {
return true;
}
- $util = new Util(new \OC_FilesystemView('/'), \OCP\USER::getUser());
+ $util = new Util(new \OC\Files\View('/'), \OCP\USER::getUser());
list($owner, $ownerPath) = $util->getUidAndFilename($path);
self::$deleteFiles[$params[\OC\Files\Filesystem::signal_param_path]] = array(
diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php
index 345c01a0d4a67c14641aca49504e04e5ae7edb1e..fbe0ecfe9f606c6859701d40bd3dbfd223318305 100644
--- a/apps/files_encryption/l10n/ar.php
+++ b/apps/files_encryption/l10n/ar.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "برنامج التشÙير لم يتم تهيئتة ! من الممكن ان برنامج التشÙير تم اعادة تÙعيلة خلال الجلسة. يرجى تسجيل الخروج ومن ثم تسجيل الدخول مجددا لتهيئة برنامج التشÙير.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ù…ÙتاØÙƒ الخاص غير صالØ! ربما تم تغيير كلمة المرور خارج %s (مثل:مجلد شركتك). يمكنك تØديث كلمة المرور ÙÙŠ الاعدادات الشخصية لإستعادة الوصول الى ملÙاتك المشÙرة.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "لا يمكن ÙÙƒ التشÙير من هذا الملÙ, من الممكن ان يكون هذا المل٠مÙشارك. يرجى سؤال صاØب المل٠لإعادة مشاركتة معك.",
-"Unknown error please check your system settings or contact your administrator" => "خطا غير معرو٠يرجى التاكد من اعدادات نظامك او تواصل مع المدير.",
"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." => "يرجى التاكد من ان اصدار PHP 5.3.3 او اØدث , مثبت Ùˆ التاكد من ان OpenSSL Ù…Ùعل Ùˆ مهيئ بشكل صØÙŠØ. Øتى الان برنامج التتشÙير تم تعطيلة.",
"Following users are not set up for encryption:" => "المستخدمين التاليين لم يتم تعيين لهم التشÙيير:",
diff --git a/apps/files_encryption/l10n/ast.php b/apps/files_encryption/l10n/ast.php
index 7e08e073095487247c93f3b6da960ee610c49b57..04a4a93fcc9d5587a9b00c2bb11b1b8d7a35ee54 100644
--- a/apps/files_encryption/l10n/ast.php
+++ b/apps/files_encryption/l10n/ast.php
@@ -1,13 +1,43 @@
<?php
$TRANSLATIONS = array(
-"Password successfully changed." => "Contraseña camudada esitosamente.",
-"Could not change the password. Maybe the old password was not correct." => "Nun pue camudase la contraseña. Quiciabes la contraseña vieya nun fore correuta.",
-"personal settings" => "axustes personales",
+"Recovery key successfully enabled" => "Habilitóse la recuperación de ficheros",
+"Could not enable recovery key. Please check your recovery key password!" => "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña.",
+"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
+"Could not disable recovery key. Please check your recovery key password!" => "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!",
+"Password successfully changed." => "Camudóse la contraseña",
+"Could not change the password. Maybe the old password was not correct." => "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
+"Private key password successfully updated." => "Contraseña de clave privada anovada correchamente.",
+"Could not update the private key password. Maybe the old password was not correct." => "Nun pudo camudase la contraseña. Pue que la contraseña antigua nun seya correuta.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡L'aplicación de cifráu nun s'anició! Seique se restableciera mentanto la sesión. Por favor intenta zarrar la sesión y volver a aniciala p'aniciar l'aplicación de cifráu.",
+"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡La clave privada nun ye válida! Seique la contraseña se camudase dende fuera de %s (Ex:El to direutoriu corporativu). Pues anovar la contraseña de la clave privada nes tos opciones personales pa recuperar l'accesu a los ficheros.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartÃu. Solicita al propietariu del mesmu que vuelva a compartilu contigo.",
+"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úrate de que PHP 5.3.3 o postreru ta instaláu y que la estensión OpenSSL de PHP ta habilitada y configurada correutamente. Pel momentu, l'aplicación de cifráu deshabilitóse.",
+"Following users are not set up for encryption:" => "Los siguientes usuarios nun se configuraron pal cifráu:",
+"Initial encryption started... This can take some time. Please wait." => "Cifráu aniciáu..... Esto pue llevar un tiempu. Por favor espera.",
+"Initial encryption running... Please try again later." => "Cifráu inicial en cursu... Inténtalo dempués.",
+"Go directly to your " => "Dir direutamente a",
+"personal settings" => "opciones personales",
"Encryption" => "Cifráu",
-"Enabled" => "Habilitáu",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar la clave de recuperación (permite recuperar los ficheros del usuariu en casu de perda de la contraseña);",
+"Recovery key password" => "Contraseña de clave de recuperación",
+"Repeat Recovery key password" => "Repeti la contraseña de clave de recuperación",
+"Enabled" => "Habilitar",
"Disabled" => "Deshabilitáu",
-"Change Password" => "Camudar conseña",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Si nun recuerdes la to contraseña vieya pues entrugar al to alministrador pa recuperar los tos ficheros.",
-"Could not update file recovery" => "Nun pue anovase'l ficheru de recuperación"
+"Change recovery key password:" => "Camudar la contraseña de la clave de recuperación",
+"Old Recovery key password" => "Clave de recuperación vieya",
+"New Recovery key password" => "Clave de recuperación nueva",
+"Repeat New Recovery key password" => "Repetir la clave de recuperación nueva",
+"Change Password" => "Camudar contraseña",
+"Your private key password no longer match your log-in password:" => "La to contraseña de clave privada yá nun concasa cola contraseña d'accesu:",
+"Set your old private key password to your current log-in password." => "Afitar la contraseña de la to clave privada vieya a la to contraseña actual d'accesu.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros.",
+"Old log-in password" => "Contraseña d'accesu vieya",
+"Current log-in password" => "Contraseña d'accesu actual",
+"Update Private Key Password" => "Anovar Contraseña de Clave Privada",
+"Enable password recovery:" => "Habilitar la recuperación de contraseña:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña",
+"File recovery settings updated" => "Opciones de recuperación de ficheros anovada",
+"Could not update file recovery" => "Nun pudo anovase la recuperación de ficheros"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 3414796f62bcf91315efc34b9d0adba1a5a069b7..766a8205f7cfe67291081c5ec3efd18d6f07b720 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "L'aplicació d'encriptació no està inicialitzada! Potser l'aplicació d'encriptació ha estat reiniciada durant la sessió. Intenteu sortir i acreditar-vos de nou per reinicialitzar l'aplicació d'encriptació.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La clau privada no és và lida! Probablement la contrasenya va ser canviada des de fora de %s (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "No es pot desencriptar aquest fitxer, probablement és un fitxer compartit. Demaneu al propietari del fitxer que el comparteixi de nou amb vós.",
-"Unknown error please check your system settings or contact your administrator" => "Error desconegut. Comproveu l'arranjament del sistema o contacteu amb l'administrador",
"Missing requirements." => "Manca de requisits.",
"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." => "Assegureu-vos que teniu instal·lat PHP 5.3.3 o una versió superior i que està activat Open SSL i habilitada i configurada correctament l'extensió de PHP. De moment, l'aplicació d'encriptació s'ha desactivat.",
"Following users are not set up for encryption:" => "Els usuaris següents no estan configurats per a l'encriptació:",
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index cdeaf5b192bf7c7598cdeb638a0b9fadb92c2c44..629353b2c4a76d4ba354c17e645f43b41581a9ff 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Aplikace pro Å¡ifrovánà nenà inicializována! Je možné, že aplikace byla znovu aktivována bÄ›hem vaÅ¡eho pÅ™ihlášenÃ. Zkuste se prosÃm odhlásit a znovu pÅ™ihlásit pro provedenà inicializace Å¡ifrovacà aplikace.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš soukromý klÃÄ nenà platný! PravdÄ›podobnÄ› bylo vaÅ¡e heslo zmÄ›nÄ›no vnÄ› systému %s (napÅ™. ve vaÅ¡em firemnÃm adresáři). Heslo vaÅ¡eho soukromého klÃÄe můžete zmÄ›nit ve svém osobnÃm nastavenà pro obnovenà pÅ™Ãstupu k vaÅ¡im zaÅ¡ifrovaným souborům.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Tento soubor se nepodaÅ™ilo deÅ¡ifrovat, pravdÄ›podobnÄ› je sdÃlený. Požádejte prosÃm majitele souboru, aby jej s vámi znovu sdÃlel.",
-"Unknown error please check your system settings or contact your administrator" => "Neznámá chyba, zkontrolujte vaše systémová nastavenà nebo kontaktujte vašeho správce",
"Missing requirements." => "Nesplněné závislosti.",
"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." => "UjistÄ›te se prosÃm, že máte nainstalované PHP 5.3.3 nebo novÄ›jÅ¡Ã a že máte povolené a správnÄ› nakonfigurované OpenSSL vÄetnÄ› jeho rozÅ¡ÃÅ™enà pro PHP. ProzatÃm byla aplikace pro Å¡ifrovánà vypnuta.",
"Following users are not set up for encryption:" => "NásledujÃcà uživatelé nemajà nastavené Å¡ifrovánÃ:",
diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
index f0f1580049831d1822027c0bc753790042b2cd32..982f5302af618912e799dc52f46ce69fc054bf44 100644
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din private nøgle er ikke gyldig. Sandsynligvis er dit kodeord blevet ændret uden for %s (f.eks dit firmas adressebog). Du kan opdatere din private nøglekode i dine personlige indstillinger for at genskabe adgang til dine krypterede filer.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Kan ikke kryptere denne fil, sandsynligvis fordi felen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
-"Unknown error please check your system settings or contact your administrator" => "Ukendt fejl. Kontroller venligst dit system eller kontakt din administrator",
"Missing requirements." => "Manglende betingelser.",
"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." => "Sørg for at PHP 5.3.3 eller nyere er installeret og at OpenSSL sammen med PHP-udvidelsen er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret.",
"Following users are not set up for encryption:" => "Følgende brugere er ikke sat op til kryptering:",
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index 38bfa7f0249f050af0068db83de99480c456ca71..6bcb50aef5f6ba6efaed5284594fb95c4ecaa932 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuche Dich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Dein Passwort geändert (z.B. in Deinem gemeinsamen Verzeichnis). Du kannst das Passwort Deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Deine Dateien zu gelangen.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte frage den Dateibesitzer, ob er die Datei nochmals mit Dir teilt.",
-"Unknown error please check your system settings or contact your administrator" => "Unbekannter Fehler, bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator",
+"Unknown error. Please check your system settings or contact your administrator" => "Unbekannter Fehler. Bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator",
"Missing requirements." => "Fehlende Vorraussetzungen",
"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 stelle 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:",
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 13f7718b93c4bb24c974b2425dab788f773cfb62..f5a6683f615f3074a9f173f41a0aaceddfbfbd9c 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuchen Sie sich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
"Your private key is not valid! Likely your password was changed outside of %s (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 außerhalb von %s 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.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte fragen Sie den Datei-Besitzer, dass er die Datei nochmals mit Ihnen teilt.",
-"Unknown error please check your system settings or contact your administrator" => "Unbekannter Fehler, bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator",
+"Unknown error. Please check your system settings or contact your administrator" => "Unbekannter Fehler. Bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator",
"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:",
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 972d7d7138c82fda189fb30b05e03e6eb8115a12..e72090c916a317467220655cc5a99ddd56cc8a77 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Η εφαÏμογή κÏυπτογÏάφησης δεν Îχει εκκινήσει! Ίσως η εφαÏμογή κÏυπτογÏάφησης επανενεÏγοποιήθηκε κατά τη διάÏκεια της Ï„ÏÎχουσας σÏνδεσής σας. ΠαÏακαλώ Ï€Ïοσπαθήστε να αποσυνδεθείτε και να ξανασυνδεθείτε για να εκκινήσετε την εφαÏμογή κÏυπτογÏάφησης.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Το Ï€Ïοσωπικό σας κλειδί δεν είναι ÎγκυÏο! Πιθανόν ο κωδικός σας να άλλαξε Îξω από το %s (Ï€.χ. τη λίστα διευθÏνσεων της εταιÏείας σας). ΜποÏείτε να ενημεÏώσετε το Ï€Ïοσωπικό σας κλειδί επαναφοÏάς ÎºÏ‰Î´Î¹ÎºÎ¿Ï ÏƒÏ„Î¹Ï‚ Ï€ÏοσωπικÎÏ‚ σας Ïυθμίσεις για να επανακτήσετε Ï€Ïόσβαση στα κÏυπτογÏαφημÎνα σας αÏχεία.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Δεν ήταν δυνατό να αποκÏυπτογÏαφηθεί αυτό το αÏχείο, πιθανόν Ï€Ïόκειται για κοινόχÏηστο αÏχείο. ΠαÏακαλώ ζητήστε από τον ιδιοκτήτη του αÏχείου να το ξαναμοιÏαστεί μαζί σας.",
-"Unknown error please check your system settings or contact your administrator" => "Άγνωστο σφάλμα, παÏακαλώ ελÎγξτε τις Ïυθμίσεις συστήματος ή επικοινωνήστε με τον διαχειÏιστή σας ",
+"Unknown error. Please check your system settings or contact your administrator" => "Άγνωστο σφάλμα. ΠαÏακαλώ ελÎγξτε τις Ïυθμίσεις του συστήματό σας ή επικοινωνήστε με τον διαχειÏιστή συστημάτων σας",
"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." => "ΠαÏακαλώ επιβεβαιώστε ότι η PHP 5.3.3 ή νεότεÏη είναι εγκατεστημÎνη και ότι το OpenSSL μαζί με το PHP extension είναι ενεÏγοποιήμÎνο και Îχει Ïυθμιστεί σωστά. Î Ïος το παÏόν, η εφαÏμογή κÏυπτογÏάφησης είναι απενεÏγοποιημÎνη.",
"Following users are not set up for encryption:" => "Οι κάτωθι χÏήστες δεν Îχουν Ïυθμιστεί για κÏυπογÏάφηση:",
diff --git a/apps/files_encryption/l10n/en_GB.php b/apps/files_encryption/l10n/en_GB.php
index 2087ea4b8b103f63fe3fc96fca8fd4b2af8fc125..78b1bccba62c2bfcaf9a46423e9c50845f4e9612 100644
--- a/apps/files_encryption/l10n/en_GB.php
+++ b/apps/files_encryption/l10n/en_GB.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Encryption app not initialised! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialise the encryption app.",
"Your private key is not valid! Likely your password was changed outside of %s (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 of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.",
-"Unknown error please check your system settings or contact your administrator" => "Unknown error. Please check your system settings or contact your administrator",
+"Unknown error. Please check your system settings or contact your administrator" => "Unknown error. Please check your system settings or contact your administrator",
"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:",
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index cf45437c0e23e47426e9d9d28c8f02722eeec638..080db0bdc74beb7d13645a3b61f08c5cfc72c307 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
"Your private key is not valid! Likely your password was changed outside of %s (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. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
-"Unknown error please check your system settings or contact your administrator" => "Error desconocido. Verifique la configuración de su sistema o póngase en contacto con su administrador",
+"Unknown error. Please check your system settings or contact your administrator" => "Error desconocido. Revise la configuración de su sistema o contacte a su administrador",
"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:",
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index b885716f89b5b8aa67cd5f75d1b1b1cf315aa061..0209c5894938f41b1f2d01670c6025b075aab045 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡La aplicación de encriptación no está inicializada! Es probable que la aplicación fue re-habilitada durante tu sesión. Intenta salir y iniciar sesión para volverla a iniciar.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Tu llave privada no es válida! Aparenta que tu clave fue cambiada fuera de %s (de tus directorios). Puedes actualizar la contraseña de tu clave privadaen las configuraciones personales para recobrar el acceso a tus archivos encriptados.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "No se puede descibrar este archivo, probablemente sea un archivo compartido. Por favor pÃdele al dueño que recomparta el archivo contigo.",
-"Unknown error please check your system settings or contact your administrator" => "Error desconocido, por favor chequea la configuración de tu sistema o contacte a su administrador",
"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:",
diff --git a/apps/files_encryption/l10n/es_MX.php b/apps/files_encryption/l10n/es_MX.php
index e2915f8e7158554f403a27f2310d8bc4693d06f9..b3ac75e082df092633b7707b3f630820b3affca2 100644
--- a/apps/files_encryption/l10n/es_MX.php
+++ b/apps/files_encryption/l10n/es_MX.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
"Your private key is not valid! Likely your password was changed outside of %s (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. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
-"Unknown error please check your system settings or contact your administrator" => "Error desconocido. Verifique la configuración de su sistema o póngase en contacto con su administrador",
"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:",
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index f82f9df9279d0c76fbe2f25dccdd65e3c7ba8765..2bc29283d63effea4d75d4f56a7b5bb7fcbeabb3 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krüpteerimise rakend pole käivitatud. Võib-olla krüpteerimise rakend taaskäivitati sinu sessiooni kestel. Palun proovi logida välja ning uuesti sisse käivitamaks krüpteerimise rakendit.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sinu provaatne võti pole kehtiv! Tõenäoliselt mudueti parooli väljaspool kausta %s (nt. sinu ettevõtte kaust). Sa saad uuendada oma privaatse võtme parooli oma isiklikes seadetes, et taastada ligipääs sinu krüpteeritud failidele.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Sa ei saa seda faili dekrüpteerida, see on tõenäoliselt jagatud fail. Palun lase omanikul seda faili sinuga uuesti jagada.",
-"Unknown error please check your system settings or contact your administrator" => "Tundmatu tõrge. Palun kontrolli süsteemi seadeid või võta ühendust oma süsteemi administraatoriga",
+"Unknown error. Please check your system settings or contact your administrator" => "Tundmatu viga. Palun võta ühendust oma administraatoriga.",
"Missing requirements." => "Nõutavad on puudu.",
"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." => "Palun veendu, et on paigaldatud PHP 5.3.3 või uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krüpteerimise rakendus on peatatud.",
"Following users are not set up for encryption:" => "Järgmised kasutajad pole seadistatud krüpteeringuks:",
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 9d51ebba2bf29ce873af8c134afba884895525c6..472c8a71b1bcb1a8662e17cede5d9545047d3a07 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Enkriptazio aplikazioa ez dago hasieratuta! Agian aplikazioa birgaitu egin da zure saioa bitartean. Mesdez atear eta sartu berriz enkriptazio aplikazioa hasierarazteko.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Zure gako pribatua ez da egokia! Seguruaski zure pasahitza %s-tik kanpo aldatu da (adb. zure direktorio korporatiboa). Zure gako pribatuaren pasahitza eguneratu dezakezu zure ezarpen pertsonaletan zure enkriptatutako fitxategiak berreskuratzeko.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Ezin izan da fitxategi hau deszifratu, ziurrenik elkarbanatutako fitxategi bat da. Mesdez, eskatu fitxategiaren jabeari fitxategia zurekin berriz elkarbana dezan.",
-"Unknown error please check your system settings or contact your administrator" => "Errore ezezaguna mesedez egiaztatu zure sistemaren ezarpenak edo harremanetan jarri zure administradorearekin",
"Missing requirements." => "Eskakizun batzuk ez dira betetzen.",
"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." => "Mesedez ziurtatu PHP 5.3.3 edo berriago bat instalatuta dagoela eta OpenSSL PHP hedapenarekin gaitua eta ongi konfiguratuta dagoela. Oraingoz, enkriptazio aplikazioa desgaituta dago.",
"Following users are not set up for encryption:" => "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:",
diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php
index 3f8d631e1067a885bceb3ab039c04eb5decae9b6..420fd7423f8448b09f356a505341b778963bb1be 100644
--- a/apps/files_encryption/l10n/fa.php
+++ b/apps/files_encryption/l10n/fa.php
@@ -9,6 +9,7 @@ $TRANSLATIONS = array(
"Private key password successfully updated." => "رمزعبور کلید خصوصی با موÙقیت به روز شد.",
"Could not update the private key password. Maybe the old password was not correct." => "رمزعبور کلید خصوصی را نمی تواند به روز کند. شاید رمزعبور قدیمی صØÛŒØ Ù†Ù…ÛŒ باشد.",
"Missing requirements." => "نیازمندی های گمشده",
+"Following users are not set up for encryption:" => "کاربران زیر برای رمزنگاری تنظیم نشده اند",
"personal settings" => "تنظیمات شخصی",
"Encryption" => "رمزگذاری",
"Enable recovery key (allow to recover users files in case of password loss):" => "Ùعال کردن کلید بازیابی(اجازه بازیابی Ùایل های کاربران در صورت از دست دادن رمزعبور):",
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index 6a0025cd980c1e229d1e732f354f1733b1b46c38..7f3e55a5bc18a096f24e6a364ccb85388c480a32 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -4,7 +4,10 @@ $TRANSLATIONS = array(
"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.",
"Private key password successfully updated." => "Yksityisen avaimen salasana päivitetty onnistuneesti.",
+"Unknown error. Please check your system settings or contact your administrator" => "Tuntematon virhe. Tarkista järjestelmän asetukset tai ole yhteydessä ylläpitäjään.",
"Following users are not set up for encryption:" => "Seuraavat käyttäjät eivät ole määrittäneet salausta:",
+"Initial encryption started... This can take some time. Please wait." => "Ensimmäinen salauskerta käynnistetty... Tämä saattaa kestää hetken.",
+"Initial encryption running... Please try again later." => "Ensimmäinen salauskerta on meneillään... Yritä myöhemmin uudelleen.",
"personal settings" => "henkilökohtaiset asetukset",
"Encryption" => "Salaus",
"Recovery key password" => "Palautusavaimen salasana",
@@ -14,8 +17,12 @@ $TRANSLATIONS = array(
"Old Recovery key password" => "Vanha palautusavaimen salasana",
"New Recovery key password" => "Uusi palautusavaimen salasana",
"Change Password" => "Vaihda salasana",
+"Your private key password no longer match your log-in password:" => "Yksityisen avaimesi salasana ei enää täsmää kirjautumisen salasanaasi:",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.",
"Old log-in password" => "Vanha kirjautumis-salasana",
"Current log-in password" => "Nykyinen kirjautumis-salasana",
-"Enable password recovery:" => "Ota salasanan palautus käyttöön:"
+"Update Private Key Password" => "Päivitä yksityisen avaimen salasana",
+"Enable password recovery:" => "Ota salasanan palautus käyttöön:",
+"File recovery settings updated" => "Tiedostopalautuksen asetukset päivitetty"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index a68b6a71326f48f69ebf6431dad1349b370ee6cb..a7aa064cfb98c976bbbb3e5cfbbd45f20537afb3 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "L'application de chiffrement n'est pas initialisée ! Peut-être que cette application a été réactivée pendant votre session. Veuillez essayer de vous déconnecter et ensuite de vous reconnecter pour initialiser l'application de chiffrement.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Votre clef privée est invalide ! Votre mot de passe a probablement été modifié hors de %s (ex. votre annuaire d'entreprise). Vous pouvez mettre à jour le mot de passe de votre clef privée dans les paramètres personnels pour pouvoir récupérer l'accès à vos fichiers chiffrés.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Impossible de déchiffrer ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire de ce fichier de le repartager avec vous.",
-"Unknown error please check your system settings or contact your administrator" => "Erreur inconnue. Veuillez vérifier vos paramètres système ou contacter votre administrateur.",
+"Unknown error. Please check your system settings or contact your administrator" => "Erreur inconnue. Veuillez vérifier vos paramètres système ou contacter un administrateur.",
"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 :",
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index 08567ef27635f3a891c11274721a8f9c920f542e..f5fce3260843b70d5d27dc2b3f1bac7545650b1e 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Non se iniciou o aplicativo de cifrado! Quizais volva a activarse durante a sesión. Tente pechar a sesión e volver iniciala que tamén se inicie o aplicativo de cifrado.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior do %s (p.ex. o seu directorio corporativo). Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Non foi posÃbel descifrar o ficheiro, probabelmente tratase dun ficheiro compartido. Pidalle ao propietario do ficheiro que volva compartir o ficheiro con vostede.",
-"Unknown error please check your system settings or contact your administrator" => "Produciuse un erro descoñecido. Comprobe os axustes do sistema ou póñase en contacto co administrador",
+"Unknown error. Please check your system settings or contact your administrator" => "Produciuse un erro descoñecido. Comprobe os axustes do sistema ou contacte co administrador",
"Missing requirements." => "Non se cumpren os requisitos.",
"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." => "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de o OpenSSL xunto coa extensión PHP estean activados e configurados correctamente. Polo de agora foi desactivado o aplicativo de cifrado.",
"Following users are not set up for encryption:" => "Os seguintes usuarios non teñen configuración para o cifrado:",
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
index 22c1fa989bd6b16e8981bccb4304ee2a276b1c2a..278aa3cc0bfa1d8c9021fe65afecde89f877442a 100644
--- a/apps/files_encryption/l10n/hu_HU.php
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "A titkosÃtási modul nincs elindÃtva! Talán a munkafolyamat közben került engedélyezésre. Kérjük jelentkezzen ki majd ismét jelentkezzen be, hogy a titkosÃtási modul megfelelÅ‘en elinduljon!",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Az állományok titkosÃtásához használt titkos kulcsa érvénytelen. ValószÃnűleg a %s rendszeren kÃvül változtatta meg a jelszavát (pl. a munkahelyi cÃmtárban). A személyes beállÃtásoknál frissÃtheti a titkos kulcsát, hogy ismét elérhesse a titkosÃtott állományait.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Az állományt nem sikerült dekódolni, valószÃnűleg ez egy megosztott fájl. Kérje meg az állomány tulajdonosát, hogy újra ossza meg Önnel ezt az állományt!",
-"Unknown error please check your system settings or contact your administrator" => "Ismeretlen hiba. EllenÅ‘rizze a rendszer beállÃtásait vagy forduljon a rendszergazdához!",
"Missing requirements." => "Hiányzó követelmények.",
"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érem gondoskodjon arról, hogy PHP 5.3.3 vagy annál frissebb legyen telepÃtve, továbbá az OpenSSL a megfelelÅ‘ PHP-bÅ‘vÃtménnyel együtt rendelkezésre álljon és helyesen legyen konfigurálva! A titkosÃtó modul egyelÅ‘re kikapcsolásra került.",
"Following users are not set up for encryption:" => "A következÅ‘ felhasználók nem állÃtották be a titkosÃtást:",
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index a4c3ae547c28ab27a7e4c20f4a3d89c8ab80c811..1d2642b8f2e402e8220efae1a2bf5f2f56613bbe 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -9,7 +9,6 @@ $TRANSLATIONS = array(
"Private key password successfully updated." => "Sandi kunci privat berhasil diperbarui.",
"Could not update the private key password. Maybe the old password was not correct." => "Tidak dapat memperbarui sandi kunci privat. Kemungkinan sandi lama yang Anda masukkan salah.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Tidak dapat mendekripsi berkas ini, mungkin ini adalah berkas bersama. Silakan meminta pemilik berkas ini untuk membagikan kembali dengan Anda.",
-"Unknown error please check your system settings or contact your administrator" => "Kesalahan tak dikenal, silakan periksa pengaturan sistem Anda atau hubungi admin.",
"Missing requirements." => "Persyaratan yang hilang.",
"Following users are not set up for encryption:" => "Pengguna berikut belum diatur untuk enkripsi:",
"Initial encryption started... This can take some time. Please wait." => "Inisial enskripsi dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 42ee846a7686aa278a8a09425a260446dc1f1b30..b969b08105d74fbddd037dfcee2559384e55a893 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Applicazione di cifratura non inizializzata. Forse l'applicazione è stata riabilitata durante la tua sessione. Prova a disconnetterti e ad effettuare nuovamente l'accesso per inizializzarla.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La tua chiave privata non è valida! Forse la password è stata cambiata al di fuori di %s (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file cifrati.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
-"Unknown error please check your system settings or contact your administrator" => "Errore sconosciuto, controlla le impostazioni di sistema o contatta il tuo amministratore",
+"Unknown error. Please check your system settings or contact your administrator" => "Errore sconosciuto. Controlla le impostazioni di sistema o contatta il tuo amministratore",
"Missing requirements." => "Requisiti mancanti.",
"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." => "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata.",
"Following users are not set up for encryption:" => "I seguenti utenti non sono configurati per la cifratura:",
diff --git a/apps/files_encryption/l10n/ja.php b/apps/files_encryption/l10n/ja.php
index 476566e00f49bd876e8342d5a299007edd827f79..fa1d4c3da4029ab3150934cd48dca0dae899751b 100644
--- a/apps/files_encryption/l10n/ja.php
+++ b/apps/files_encryption/l10n/ja.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "セッションä¸ã«æš—å·åŒ–アプリをå†åº¦æœ‰åŠ¹ã«ã•ã‚ŒãŸãŸã‚ã€æš—å·åŒ–アプリãŒåˆæœŸåŒ–ã•ã‚Œã¦ã„ã¾ã›ã‚“。暗å·åŒ–アプリをåˆæœŸåŒ–ã™ã‚‹ãŸã‚ã€ãƒã‚°ã‚¢ã‚¦ãƒˆã—ã¦ãƒã‚°ã‚¤ãƒ³ã—ãªãŠã—ã¦ãã ã•ã„。",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "プライベートã‚ーãŒæœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“ï¼ãƒ‘スワードãŒ%sã®å¤–部ã§å¤‰æ›´ã•ã‚ŒãŸ(例: å…±åŒãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª)ã¨æ€ã‚ã‚Œã¾ã™ã€‚個人è¨å®šã§ãƒ—ライベートã‚ーã®ãƒ‘スワードを更新ã—ã¦ã€æš—å·åŒ–ファイルã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’回復ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’復å·åŒ–ã§ãã¾ã›ã‚“ã€å…±æœ‰ãƒ•ã‚¡ã‚¤ãƒ«ã®å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ファイルã®æ‰€æœ‰è€…ã«ãŠé¡˜ã„ã—ã¦ã€ãƒ•ã‚¡ã‚¤ãƒ«ã‚’共有ã—ãªãŠã—ã¦ã‚‚らã£ã¦ãã ã•ã„。",
-"Unknown error please check your system settings or contact your administrator" => "ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ã§ã™ã€‚システムè¨å®šã‚’確èªã™ã‚‹ã‹ã€ç®¡ç†è€…ã«å•ã„åˆã‚ã›ã¦ãã ã•ã„。",
"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." => "å¿…ãšã€PHP 5.3.3ã‚‚ã—ãã¯ãれ以上をインストールã—ã€åŒæ™‚ã«OpenSSLã®PHP拡張を有効ã«ã—ãŸä¸Šã§OpenSSLã‚‚åŒæ§˜ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã€é©åˆ‡ã«è¨å®šã—ã¦ãã ã•ã„。ç¾æ™‚点ã§ã¯æš—å·åŒ–アプリã¯ç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚",
"Following users are not set up for encryption:" => "以下ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯ã€æš—å·åŒ–è¨å®šãŒã•ã‚Œã¦ã„ã¾ã›ã‚“：",
diff --git a/apps/files_encryption/l10n/ko.php b/apps/files_encryption/l10n/ko.php
index 41168a340c09cda44cf8b448268b1326d6ed0e95..3526635e8572ce120caf17b6cc34ec47d6aa66e2 100644
--- a/apps/files_encryption/l10n/ko.php
+++ b/apps/files_encryption/l10n/ko.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "암호화 ì•±ì´ ì´ˆê¸°í™”ë˜ì§€ 않았습니다! 암호화 ì•±ì´ ë‹¤ì‹œ í™œì„±í™”ëœ ê²ƒ 같습니다. 암호화 ì•±ì„ ì´ˆê¸°í™”í•˜ë ¤ë©´ 로그아웃했다 다시 로그ì¸í•˜ì‹ì‹œì˜¤.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "ê°œì¸ í‚¤ê°€ 올바르지 않습니다! 암호가 %s(예: 회사 ë””ë ‰í„°ë¦¬) 외부ì—ì„œ ë³€ê²½ëœ ê²ƒ 같습니다. ì•”í˜¸í™”ëœ íŒŒì¼ì— 다시 ì ‘ê·¼í•˜ë ¤ë©´ ê°œì¸ ì„¤ì •ì—ì„œ ê°œì¸ í‚¤ 암호를 ìˆ˜ì •í•˜ì‹ì‹œì˜¤.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "ì´ íŒŒì¼ì„ ë³µí˜¸í™”í• ìˆ˜ 없습니다. ê³µìœ ëœ íŒŒì¼ì¼ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. íŒŒì¼ ì†Œìœ ìžì—게 ê³µìœ ë¥¼ 다시 ìš”ì²í•˜ì‹ì‹œì˜¤.",
-"Unknown error please check your system settings or contact your administrator" => "ì•Œ 수 없는 오류. 시스템 ì„¤ì •ì„ í™•ì¸í•˜ê±°ë‚˜ 관리ìžì—게 문ì˜í•˜ì‹ì‹œì˜¤.",
"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." => "PHP 5.3.3 ì´ìƒ 설치 여부, PHPì˜ OpenSSL 확장 기능 활성화 ë° ì„¤ì • 여부를 확ì¸í•˜ì‹ì‹œì˜¤. 암호화 ì•±ì´ ë¹„í™œì„±í™” ë˜ì—ˆìŠµë‹ˆë‹¤.",
"Following users are not set up for encryption:" => "ë‹¤ìŒ ì‚¬ìš©ìžëŠ” 암호화를 ì‚¬ìš©í• ìˆ˜ 없습니다:",
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index dd8a0d7633cb52766265f459a6d8a133ec1c69f1..29d9afbaa831cc3a706bb5454faf8b70f879533d 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Šifravimo programa nepaleista! Galbūt šifravimo programa buvo įjungta dar kartą Jūsų sesijos metu. Prašome atsijungti ir vėl prisijungti, kad paleisti šifravimo programą.",
"Your private key is not valid! Likely your password was changed outside of %s (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 už %s (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Failo iššifruoti nepavyko, gali būti jog jis yra pasidalintas su jumis. Paprašykite failo savininko, kad jums iš naujo pateiktų šį failą.",
-"Unknown error please check your system settings or contact your administrator" => "Neatpažinta klaida, patikrinkite sistemos nustatymus arba kreipkitės į savo sistemos aministratorių",
"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:",
diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
index f7484c0e1543af6f957c42f3c9a3c697fbb01bb6..47f60a227f72aaf0c71b27de447d51cb26f08072 100644
--- a/apps/files_encryption/l10n/nb_NO.php
+++ b/apps/files_encryption/l10n/nb_NO.php
@@ -11,11 +11,12 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krypterings-app ikke initialisert! Kanskje krypterings-appen ble aktivert på nytt i løpet av økten din. Prøv å logge ut og logge inn igjen for å initialisere krypterings-appen.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din private nøkkel er ikke gyldig! Sannsynligvis ble passordet ditt endret utenfor %s. (f.eks. din bedriftskatalog). Du kan oppdatere passordet for din private nøkkel i dine personlige innstillinger for å gjenvinne tilgang til de krypterte filene dine.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Kan ikke dekryptere denne filen. Dette er sannsynligvis en delt fil. Spør eieren av filen om å dele den med deg på nytt.",
-"Unknown error please check your system settings or contact your administrator" => "Ukjent feil. Sjekk systeminnstillingene dine eller kontakt administratoren",
+"Unknown error. Please check your system settings or contact your administrator" => "Ukjent feil. Sjekk systeminnstillingene eller kontakt administratoren.",
"Missing requirements." => "Manglende krav.",
"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." => "Vennligst se til at PHP 5.3.3 eller nyere er installert og at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Enn så lenge er krypterings-appen deaktivert.",
"Following users are not set up for encryption:" => "Følgende brukere er ikke satt opp for kryptering:",
"Initial encryption started... This can take some time. Please wait." => "Første gangs kryptering startet... Dette kan ta litt tid. Vennligst vent.",
+"Initial encryption running... Please try again later." => "Førstegangs kryptering kjører... Prøv igjen senere.",
"Go directly to your " => "GÃ¥ direkte til din",
"personal settings" => "personlige innstillinger",
"Encryption" => "Kryptering",
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index e878fc6c12eba4208223d0b7b67c8ea7ea3bd4d0..598806a8dbbda406874782192d5dec0f52ff9407 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Crypto app niet geïnitialiseerd. Misschien werd de crypto app geheractiveerd tijdens de sessie. Log uit en log daarna opnieuw in om de crypto app te initialiseren.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Uw privésleutel is niet geldig! Waarschijnlijk is uw wachtwoord gewijzigd buiten %s (bijv. uw corporate directory). U kunt uw privésleutel wachtwoord in uw persoonlijke instellingen bijwerken om toegang te krijgen tot uw versleutelde bestanden.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met u te delen.",
-"Unknown error please check your system settings or contact your administrator" => "Onbekende fout, Controleer uw systeeminstellingen of neem contact op met uw systeembeheerder",
+"Unknown error. Please check your system settings or contact your administrator" => "Onbekende fout. Controleer uw systeeminstellingen of neem contact op met de beheerder",
"Missing requirements." => "Missende benodigdheden.",
"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." => "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld.",
"Following users are not set up for encryption:" => "De volgende gebruikers hebben geen configuratie voor encryptie:",
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index db2a02cec9a78bea5fd84d92f9a126eb219d952f..e756ab4d03946348d901855ade3abf79969401ab 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Szyfrowanie aplikacja nie została zainicjowane! Może szyfrowanie aplikacji zostało ponownie włączone podczas tej sesji. Spróbuj się wylogować i zalogować ponownie aby zainicjować szyfrowanie aplikacji.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Klucz prywatny nie jest poprawny! Prawdopodobnie Twoje hasło zostało zmienione poza %s (np. w katalogu firmy). Aby odzyskać dostęp do zaszyfrowanych plików można zaktualizować hasło klucza prywatnego w ustawieniach osobistych.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Nie można odszyfrować tego pliku, prawdopodobnie jest to plik udostępniony. Poproś właściciela pliku o ponowne udostępnianie pliku Tobie.",
-"Unknown error please check your system settings or contact your administrator" => "Nieznany błąd proszę sprawdzić ustawienia systemu lub skontaktuj się z administratorem",
"Missing requirements." => "Brak wymagań.",
"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." => "Proszę upewnić się, że PHP 5.3.3 lub nowszy jest zainstalowany i że OpenSSL oraz rozszerzenie PHP jest włączone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostało wyłączone.",
"Following users are not set up for encryption:" => "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:",
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index 204311658ac5fc19a0e97d95ebfa6e2deae38f8d..b034996a523b2ef71dbc13f55b76854785b5c565 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Aplicativo de criptografia não foi inicializado! Talvez o aplicativo de criptografia tenha sido reativado durante essa sessão. Por favor, tente fazer logoff e login novamente para inicializar o aplicativo de criptografia.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora de %s (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Este arquivo não pode ser decriptado, provavelmente este é um arquivo compartilhado. Poe favoe peça ao dono do arquivo para compartilha-lo com você.",
-"Unknown error please check your system settings or contact your administrator" => "Erro desconhecido, por favor verifique suas configurações ou faça contato com o administrador",
+"Unknown error. Please check your system settings or contact your administrator" => "Erro desconhecido. Por favor, verifique as configurações do sistema ou entre em contato com o administrador",
"Missing requirements." => "Requisitos não encontrados.",
"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, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.",
"Following users are not set up for encryption:" => "Seguintes usuários não estão configurados para criptografia:",
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index 9a1963953e3427e2b07dd7c6afb60b19c11c9bc0..0827fb51b0cdad1859870919ef80a0c55aed72ae 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -8,19 +8,22 @@ $TRANSLATIONS = array(
"Could not change the password. Maybe the old password was not correct." => "Não foi possivel alterar a password. Possivelmente a password antiga não está correcta.",
"Could not update the private key password. Maybe the old password was not correct." => "Não foi possÃvel alterar a chave. Possivelmente a password antiga não está correcta.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Não foi possÃvel desencriptar este ficheiro, possivelmente é um ficheiro partilhado. Peça ao proprietário do ficheiro para voltar a partilhar o ficheiro consigo.",
-"Unknown error please check your system settings or contact your administrator" => "Erro desconhecido. Verifique por favor as definições do sistema ou contacte o seu administrador",
"Missing requirements." => "Faltam alguns requisitos.",
+"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, certifique-se que PHP 5.3.3 ou mais recente está instalado e que OpenSSL juntamente com a extensão PHP está ativada e corretamente configurada. Por agora, a aplicação de encriptação está desactivada.",
"Following users are not set up for encryption:" => "Os utilizadores seguintes não estão marcados para cifragem:",
+"Initial encryption started... This can take some time. Please wait." => "A encriptação inicial começou... Pode demorar algum tempo. Aguarde, por favor.",
"Go directly to your " => "Ir directamente para o seu",
"personal settings" => "configurações personalizadas ",
"Encryption" => "Encriptação",
"Enable recovery key (allow to recover users files in case of password loss):" => "Active a chave de recuperação (permite recuperar os ficheiros no caso de perda da password):",
"Recovery key password" => "Chave de recuperação da conta",
+"Repeat Recovery key password" => "Repetir a chave de recuperação da conta",
"Enabled" => "Activado",
"Disabled" => "Desactivado",
"Change recovery key password:" => "Alterar a chave de recuperação:",
"Old Recovery key password" => "Chave anterior de recuperação da conta",
"New Recovery key password" => "Nova chave de recuperação da conta",
+"Repeat New Recovery key password" => "Repetir a nova chave de recuperação da conta",
"Change Password" => "Mudar a Password",
"Old log-in password" => "Password anterior da conta",
"Current log-in password" => "Password actual da conta",
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index ba98486893200cf01f125805184b6ecf976fa17a..bc031dda51724f43f21c282dd2b4585ad57f9543 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Приложение шифрации не инициализированно! Возможно приложение шифрации было реактивировано во Ð²Ñ€ÐµÐ¼Ñ Ð²Ð°ÑˆÐµÐ¹ ÑеÑÑии. ПожалуйÑта, попробуйте выйти и войти Ñнова чтобы проинициализировать приложение шифрации.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ваш Ñекретный ключ не дейÑтвителен! ВероÑтно, ваш пароль был изменен вне %s (например, корпоративный каталог). Ð’Ñ‹ можете обновить Ñекретный ключ в личных наÑтройках на Ñтранице воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð¾Ñтупа к зашифрованным файлам. ",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Ðе могу раÑшифровать файл, возможно Ñто опубликованный файл. ПожалуйÑта, попроÑите владельца файла поделитьÑÑ Ð¸Ð¼ Ñ Ð²Ð°Ð¼Ð¸ еще раз.",
-"Unknown error please check your system settings or contact your administrator" => "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°, пожалуйÑта, проверьте ÑиÑтемные наÑтройки или ÑвÑжитеÑÑŒ Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором",
+"Unknown error. Please check your system settings or contact your administrator" => "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°. ПожалуйÑта, проверьте ÑиÑтемные наÑтройки или ÑвÑжитеÑÑŒ Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором",
"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." => "ПожалуйÑта, убедитеÑÑŒ, что верÑÐ¸Ñ PHP 5.3.3 или новее, а также, что OpenSSL и ÑоответÑтвующее раÑширение PHP включены и правильно наÑтроены. Ðа данный момент приложение ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾.",
"Following users are not set up for encryption:" => "Ð”Ð»Ñ Ñледующих пользователей шифрование не наÑтроено:",
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index 53ee2bc0303dc43c6674b8a843fb7ac595dae0f4..9b93cee6f802160181c2c700a405f75b213a9cbd 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Å ifrovacia aplikácia nie je inicializovaná. Je možné, že aplikácia bola znova aktivovaná poÄas vášho prihlasovania. Pokúste sa odhlásiÅ¥ a znova prihlásiÅ¥ pre inicializáciu Å¡ifrovania.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš súkromný kÄ¾ÃºÄ nie je platný! Možno bolo vaÅ¡e heslo zmenené mimo %s (napr. firemný prieÄinok). Môžete si aktualizovaÅ¥ heslo svojho ​​súkromného kľúÄa vo vaÅ¡om osobnom nastavenÃ, ak si chcete obnoviÅ¥ prÃstup k Å¡ifrovaným súborom.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Tento súbor sa nepodarilo dešifrovať, pravdepodobne je zdieľaný. Požiadajte majiteľa súboru, aby ho s vami znovu vyzdieľal.",
-"Unknown error please check your system settings or contact your administrator" => "Neznáma chyba, skontrolujte si vaše systémové nastavenia alebo kontaktujte administrátora",
"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:",
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index e581f9323c2a701c0f01128e559b42b42dbd5818..5f72b54fee9a533c2f0f80fd1f12f1e0d27396d0 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Program za Å¡ifriranje ni zaÄet. Morda je bil program ponovno omogoÄen Å¡ele med zagonom trenutne seje. Odjavite se in se nato prijavite nazaj. S tem morda razreÅ¡ite napako.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Zasebni kljuÄ ni veljaven. Najverjetneje je bilo geslo spremenjeno izven %s (najverjetneje je to poslovna mapa). Geslo lahko posodobite med osebnimi nastavitvami in s tem obnovite dostop do Å¡ifriranih datotek.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Te datoteke ni mogoÄe Å¡ifrirati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.",
-"Unknown error please check your system settings or contact your administrator" => "Prišlo je do neznane napake. Preverite nastavitve sistema ali pa stopite v stik s skrbnikom sistema.",
"Missing requirements." => "ManjkajoÄe zahteve",
"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." => "Preverite, ali je na strežniku nameÅ¡Äen paket PHP 5.3.3 ali novejÅ¡i, da je omogoÄen in pravilno nastavljen PHP OpenSSL. Z obstojeÄimi možnostmi Å¡ifriranje ni mogoÄe.",
"Following users are not set up for encryption:" => "Navedeni uporabniki Å¡e nimajo nastavljenega Å¡ifriranja:",
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index b17740f25410cb2449d2965b06b01ee7c510623d..02efa85dfbe0349ee248201c230f636b5d703c9a 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krypteringsprogrammet kunde inte initieras! Möjligen blev krypteringsprogrammet återaktiverad under din session. Försök med att logga ut och in igen för att initiera krypteringsprogrammet.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din privata lösenordsnyckel är inte giltig! Troligen har ditt lösenord ändrats utanför %s (t.ex. i företagets katalogtjänst). Du kan uppdatera den privata lösenordsnyckeln under dina personliga inställningar för att återfå tillgång till dina filer.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Kan ej dekryptera denna fil, förmodligen är det en delad fil. Be ägaren av filen att dela den med dig.",
-"Unknown error please check your system settings or contact your administrator" => "Oväntat fel, kolla dina system inställningar eller kontakta din administratör",
+"Unknown error. Please check your system settings or contact your administrator" => "Okänt fel. Kontrollera dina systeminställningar eller kontakta din administratör",
"Missing requirements." => "Krav som saknas",
"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." => "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och korrekt konfigurerad. Kryptering är tillsvidare inaktiverad.",
"Following users are not set up for encryption:" => "Följande användare har inte aktiverat kryptering:",
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 85e35f5dddf93ad177c59f3132ac8d0899913d42..d0ab2061db2cc88b3de99b11c5b314f7e719172f 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -6,29 +6,29 @@ $TRANSLATIONS = array(
"Could not disable recovery key. Please check your recovery key password!" => "Kurtarma anahtarı devre dışı bırakılamadı. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
"Password successfully changed." => "Parola başarıyla değiştirildi.",
"Could not change the password. Maybe the old password was not correct." => "Parola değiştirilemedi. Eski parolanız doğru olmayabilir.",
-"Private key password successfully updated." => "Gizli anahtar parolası başarıyla güncellendi",
-"Could not update the private key password. Maybe the old password was not correct." => "Gizli anahtar parolası güncellenemedi. Eski parola hatalı olabilir.",
+"Private key password successfully updated." => "Özel anahtar parolası başarıyla güncellendi.",
+"Could not update the private key password. Maybe the old password was not correct." => "Özel anahtar parolası güncellenemedi. Eski parola hatalı olabilir.",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Şifreleme uygulaması başlatılamadı! Oturumunuz sırasında şifreleme uygulaması tekrar etkinleştirilmiş olabilir. Lütfen şifreleme uygulamasını başlatmak için oturumu kapatıp yeniden oturum açmayı deneyin.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Gizli anahtarınız geçerli değil! Muhtemelen parolanız ownCloud sistemi %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz.",
-"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifresi çözülemiyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
-"Unknown error please check your system settings or contact your administrator" => "Bilinmeyen hata. Lütfen sistem ayarlarınızı denetleyin veya yöneticiniz ile iletişime geçin",
+"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Özel anahtarınız geçerli değil! Muhtemelen parolanız %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifrelemesi kaldırılamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
+"Unknown error. Please check your system settings or contact your administrator" => "Bilinmeyen hata. Lütfen sistem ayarlarınızı denetleyin veya yöneticiniz ile iletişime geçin",
"Missing requirements." => "Gereklilikler eksik.",
-"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." => "PHP 5.3.3 veya daha sürümü ile birlikte OpenSSL ve OpenSSL PHP uzantısının birlikte etkin olduğunu ve doğru bir şekilde yapılandırıldığından emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı",
-"Following users are not set up for encryption:" => "Aşağıdaki kullanıcılar şifreleme için ayarlanmadılar:",
+"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." => "PHP 5.3.3 veya daha sürümü ile birlikte OpenSSL ve OpenSSL PHP uzantısının birlikte etkin olduğundan ve doğru bir şekilde yapılandırıldığından emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı.",
+"Following users are not set up for encryption:" => "Aşağıdaki kullanıcılar şifreleme için ayarlanmamış:",
"Initial encryption started... This can take some time. Please wait." => "İlk şifreleme başladı... Bu biraz zaman alabilir. Lütfen bekleyin.",
"Initial encryption running... Please try again later." => "İlk şifreleme çalışıyor... Lütfen daha sonra tekrar deneyin.",
-"Go directly to your " => "DoÄŸrudan ÅŸuraya gidin:",
-"personal settings" => "kiÅŸisel ayarlar",
+"Go directly to your " => "DoÄŸrudan ",
+"personal settings" => "kişisel ayarlarınıza gidin",
"Encryption" => "Åžifreleme",
"Enable recovery key (allow to recover users files in case of password loss):" => "Kurtarma anahtarını etkinleştir (parola kaybı durumunda kullanıcı dosyalarının kurtarılmasına izin verir):",
"Recovery key password" => "Kurtarma anahtarı parolası",
-"Repeat Recovery key password" => "Kurtarma anahtarı parolasını yenileyin",
-"Enabled" => "EtkinleÅŸtirildi",
-"Disabled" => "Devre dışı",
+"Repeat Recovery key password" => "Kurtarma anahtarı parolasını yineleyin",
+"Enabled" => "Etkin",
+"Disabled" => "Devre Dışı",
"Change recovery key password:" => "Kurtarma anahtarı parolasını değiştir:",
-"Old Recovery key password" => "Eski Kurtarma anahtar parolası",
-"New Recovery key password" => "Yeni Kurtarma anahtar parolası",
-"Repeat New Recovery key password" => "Yeni Kurtarma anahtarı parolasını yenileyin",
+"Old Recovery key password" => "Eski Kurtarma anahtarı parolası",
+"New Recovery key password" => "Yeni Kurtarma anahtarı parolası",
+"Repeat New Recovery key password" => "Yeni Kurtarma anahtarı parolasını yineleyin",
"Change Password" => "Parola DeÄŸiÅŸtir",
"Your private key password no longer match your log-in password:" => "Özel anahtar parolanız artık oturum açma parolanızla eşleşmiyor:",
"Set your old private key password to your current log-in password." => "Eski özel anahtar parolanızı geçerli oturum açma parolanız olarak ayarlayın.",
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index 84146437ac0b590b794cc54a9e3cb4f329d79e9c..e4954443cc656900dec71f0bc2b7d6759e27c42e 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "åŠ å¯†åŠŸèƒ½æœªåˆå§‹åŒ–!å¯èƒ½åŠ 密功能需è¦é‡æ–°å•Ÿç”¨åœ¨ç¾åœ¨çš„連線上。請試著登出å†ç™»å…¥ä¾†åˆå§‹åŒ–åŠ å¯†åŠŸèƒ½ã€‚",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "您的ç§äººé‡‘é‘°ä¸æ£ç¢º!å¯èƒ½æ‚¨çš„密碼已經變更在外部的 %s (例如:您的ä¼æ¥ç›®éŒ„)。您å¯ä»¥åœ¨æ‚¨çš„個人è¨å®šä¸æ›´æ–°ç§äººé‡‘鑰密碼來還原å˜å–æ‚¨çš„åŠ å¯†æª”æ¡ˆã€‚",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "無法解密這個檔案，也許這是分享的檔案。請詢å•æª”案所有人é‡æ–°åˆ†äº«æª”案給您。",
-"Unknown error please check your system settings or contact your administrator" => "未知錯誤請檢查您的系統è¨å®šæˆ–是è¯çµ¡æ‚¨çš„管ç†å“¡",
"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." => "請確èªå·²å®‰è£ PHP 5.3.3 æˆ–æ˜¯æ›´æ–°çš„ç‰ˆæœ¬ä»¥åŠ OpenSSL 也一併安è£åœ¨ PHP extension 裡é¢ä¸¦å•Ÿç”¨åŠè¨ç½®å®Œæˆã€‚ç¾åœ¨ï¼ŒåŠ 密功能是åœç”¨çš„。",
"Following users are not set up for encryption:" => "以下的使用者無法è¨å®šåŠ 密:",
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index a4f7bd35497543c000c43358b0118a6c482ef6e6..ec7b3bc92e47c20994769c97804cb4232a9914dc 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -40,7 +40,7 @@ class Crypt {
/**
- * @brief return encryption mode client or server side encryption
+ * return encryption mode client or server side encryption
* @param string $user name (use system wide setting if name=null)
* @return string 'client' or 'server'
*/
@@ -51,7 +51,7 @@ class Crypt {
}
/**
- * @brief Create a new encryption keypair
+ * Create a new encryption keypair
* @return array publicKey, privatekey
*/
public static function createKeypair() {
@@ -85,7 +85,7 @@ class Crypt {
}
/**
- * @brief Add arbitrary padding to encrypted data
+ * Add arbitrary padding to encrypted data
* @param string $data data to be padded
* @return string padded data
* @note In order to end up with data exactly 8192 bytes long we must
@@ -102,7 +102,7 @@ class Crypt {
}
/**
- * @brief Remove arbitrary padding to encrypted data
+ * Remove arbitrary padding to encrypted data
* @param string $padded padded data to remove padding from
* @return string unpadded data on success, false on error
*/
@@ -124,8 +124,8 @@ class Crypt {
}
/**
- * @brief Check if a file's contents contains an IV and is symmetrically encrypted
- * @param $content
+ * Check if a file's contents contains an IV and is symmetrically encrypted
+ * @param string $content
* @return boolean
* @note see also OCA\Encryption\Util->isEncryptedPath()
*/
@@ -178,11 +178,10 @@ class Crypt {
}
/**
- * @brief Check if a file is encrypted via legacy system
- * @param $data
+ * Check if a file is encrypted via legacy system
+ * @param boolean $isCatFileContent
* @param string $relPath The path of the file, relative to user/data;
* e.g. filename or /Docs/filename, NOT admin/files/filename
- * @param boolean $isCatFileContent
* @return boolean
*/
public static function isLegacyEncryptedContent($isCatFileContent, $relPath) {
@@ -209,7 +208,7 @@ class Crypt {
}
/**
- * @brief Symmetrically encrypt a string
+ * Symmetrically encrypt a string
* @param string $plainContent
* @param string $iv
* @param string $passphrase
@@ -229,7 +228,7 @@ class Crypt {
}
/**
- * @brief Symmetrically decrypt a string
+ * Symmetrically decrypt a string
* @param string $encryptedContent
* @param string $iv
* @param string $passphrase
@@ -251,10 +250,10 @@ class Crypt {
}
/**
- * @brief Concatenate encrypted data with its IV and padding
+ * Concatenate encrypted data with its IV and padding
* @param string $content content to be concatenated
* @param string $iv IV to be concatenated
- * @returns string concatenated content
+ * @return string concatenated content
*/
private static function concatIv($content, $iv) {
@@ -265,9 +264,9 @@ class Crypt {
}
/**
- * @brief Split concatenated data and IV into respective parts
+ * Split concatenated data and IV into respective parts
* @param string $catFile concatenated data to be split
- * @returns array keys: encrypted, iv
+ * @return array keys: encrypted, iv
*/
private static function splitIv($catFile) {
@@ -290,7 +289,7 @@ class Crypt {
}
/**
- * @brief Symmetrically encrypts a string and returns keyfile content
+ * Symmetrically encrypts a string and returns keyfile content
* @param string $plainContent content to be encrypted in keyfile
* @param string $passphrase
* @return false|string encrypted content combined with IV
@@ -322,15 +321,15 @@ class Crypt {
/**
- * @brief Symmetrically decrypts keyfile content
- * @param $keyfileContent
+ * Symmetrically decrypts keyfile content
+ * @param string $keyfileContent
* @param string $passphrase
* @throws \Exception
* @return string|false
* @internal param string $source
* @internal param string $target
* @internal param string $key the decryption key
- * @returns string decrypted content
+ * @return string decrypted content
*
* This function decrypts a file
*/
@@ -359,10 +358,10 @@ class Crypt {
}
/**
- * @brief Decrypt private key and check if the result is a valid keyfile
+ * Decrypt private key and check if the result is a valid keyfile
* @param string $encryptedKey encrypted keyfile
* @param string $passphrase to decrypt keyfile
- * @returns encrypted private key or false
+ * @return string|false encrypted private key or false
*
* This function decrypts a file
*/
@@ -386,10 +385,10 @@ class Crypt {
}
/**
- * @brief Create asymmetrically encrypted keyfile content using a generated key
+ * Create asymmetrically encrypted keyfile content using a generated key
* @param string $plainContent content to be encrypted
* @param array $publicKeys array keys must be the userId of corresponding user
- * @returns array keys: keys (array, key = userId), data
+ * @return array keys: keys (array, key = userId), data
* @note symmetricDecryptFileContent() can decrypt files created using this method
*/
public static function multiKeyEncrypt($plainContent, array $publicKeys) {
@@ -434,13 +433,13 @@ class Crypt {
}
/**
- * @brief Asymmetrically encrypt a file using multiple public keys
- * @param $encryptedContent
- * @param $shareKey
- * @param $privateKey
+ * Asymmetrically encrypt a file using multiple public keys
+ * @param string $encryptedContent
+ * @param string $shareKey
+ * @param mixed $privateKey
* @return false|string
* @internal param string $plainContent content to be encrypted
- * @returns string $plainContent decrypted string
+ * @return string $plainContent decrypted string
* @note symmetricDecryptFileContent() can be used to decrypt files created using this method
*
* This function decrypts a file
@@ -468,7 +467,7 @@ class Crypt {
}
/**
- * @brief Generates a pseudo random initialisation vector
+ * Generates a pseudo random initialisation vector
* @return String $iv generated IV
*/
private static function generateIv() {
@@ -497,8 +496,8 @@ class Crypt {
}
/**
- * @brief Generate a pseudo random 256-bit ASCII key, used as file key
- * @returns $key Generated key
+ * Generate a pseudo random 256-bit ASCII key, used as file key
+ * @return string|false Generated key
*/
public static function generateKey() {
@@ -523,8 +522,8 @@ class Crypt {
}
/**
- * @brief Get the blowfish encryption handler for a key
- * @param $key string (optional)
+ * Get the blowfish encryption handler for a key
+ * @param string $key (optional)
* @return \Crypt_Blowfish blowfish object
*
* if the key is left out, the default handler will be used
@@ -544,7 +543,7 @@ class Crypt {
}
/**
- * @brief decrypts content using legacy blowfish system
+ * decrypts content using legacy blowfish system
* @param string $content the cleartext message you want to decrypt
* @param string $passphrase
* @return string cleartext content
@@ -561,7 +560,7 @@ class Crypt {
}
/**
- * @param $data
+ * @param string $data
* @param string $key
* @param int $maxLength
* @return string
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 8cbbe8a45a6ef62f638a675414d392f486887ba4..564e97e0592765dcea1878b25dd45e6b66d65837 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -24,7 +24,7 @@
namespace OCA\Encryption;
/**
- * @brief Class to manage registration of hooks an various helper methods
+ * Class to manage registration of hooks an various helper methods
* @package OCA\Encryption
*/
class Helper {
@@ -32,7 +32,7 @@ class Helper {
private static $tmpFileMapping; // Map tmp files to files in data/user/files
/**
- * @brief register share related hooks
+ * register share related hooks
*
*/
public static function registerShareHooks() {
@@ -43,7 +43,7 @@ class Helper {
}
/**
- * @brief register user related hooks
+ * register user related hooks
*
*/
public static function registerUserHooks() {
@@ -56,7 +56,7 @@ class Helper {
}
/**
- * @brief register filesystem related hooks
+ * register filesystem related hooks
*
*/
public static function registerFilesystemHooks() {
@@ -68,7 +68,7 @@ class Helper {
}
/**
- * @brief register app management related hooks
+ * register app management related hooks
*
*/
public static function registerAppHooks() {
@@ -78,7 +78,7 @@ class Helper {
}
/**
- * @brief setup user for files_encryption
+ * setup user for files_encryption
*
* @param Util $util
* @param string $password
@@ -100,9 +100,9 @@ class Helper {
}
/**
- * @brief enable recovery
+ * enable recovery
*
- * @param $recoveryKeyId
+ * @param string $recoveryKeyId
* @param string $recoveryPassword
* @internal param \OCA\Encryption\Util $util
* @internal param string $password
@@ -153,7 +153,7 @@ class Helper {
$return = true;
} else { // get recovery key and check the password
- $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+ $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), \OCP\User::getUser());
$return = $util->checkRecoveryPassword($recoveryPassword);
if ($return) {
$appConfig->setValue('files_encryption', 'recoveryAdminEnabled', 1);
@@ -164,7 +164,7 @@ class Helper {
}
/**
- * @brief Check if a path is a .part file
+ * Check if a path is a .part file
* @param string $path Path that may identify a .part file
* @return bool
*/
@@ -181,7 +181,7 @@ class Helper {
/**
- * @brief Remove .path extension from a file path
+ * Remove .path extension from a file path
* @param string $path Path that may identify a .part file
* @return string File path without .part extension
* @note this is needed for reusing keys
@@ -208,13 +208,13 @@ class Helper {
}
/**
- * @brief disable recovery
+ * disable recovery
*
* @param string $recoveryPassword
* @return bool
*/
public static function adminDisableRecovery($recoveryPassword) {
- $util = new Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+ $util = new Util(new \OC\Files\View('/'), \OCP\User::getUser());
$return = $util->checkRecoveryPassword($recoveryPassword);
if ($return) {
@@ -227,7 +227,7 @@ class Helper {
/**
- * @brief checks if access is public/anonymous user
+ * checks if access is public/anonymous user
* @return bool
*/
public static function isPublicAccess() {
@@ -239,7 +239,7 @@ class Helper {
}
/**
- * @brief Format a path to be relative to the /user/files/ directory
+ * Format a path to be relative to the /user/files/ directory
* @param string $path the absolute path
* @return string e.g. turns '/admin/files/test.txt' into 'test.txt'
*/
@@ -259,7 +259,7 @@ class Helper {
}
/**
- * @brief try to get the user from the path if no user is logged in
+ * try to get the user from the path if no user is logged in
* @param string $path
* @return mixed user or false if we couldn't determine a user
*/
@@ -294,7 +294,7 @@ class Helper {
}
/**
- * @brief get path to the corresponding file in data/user/files if path points
+ * get path to the corresponding file in data/user/files if path points
* to a version or to a file in cache
* @param string $path path to a version or a file in the trash
* @return string path to corresponding file relative to data/user/files
@@ -327,12 +327,12 @@ class Helper {
}
/**
- * @brief create directory recursively
+ * create directory recursively
* @param string $path
* @param \OC\Files\View $view
*/
public static function mkdirr($path, $view) {
- $dirname = \OC_Filesystem::normalizePath(dirname($path));
+ $dirname = \OC\Files\Filesystem::normalizePath(dirname($path));
$dirParts = explode('/', $dirname);
$dir = "";
foreach ($dirParts as $part) {
@@ -344,7 +344,7 @@ class Helper {
}
/**
- * @brief redirect to a error page
+ * redirect to a error page
* @param Session $session
*/
public static function redirectToErrorPage($session, $errorCode = null) {
@@ -428,7 +428,7 @@ class Helper {
}
/**
- * @brief glob uses different pattern than regular expressions, escape glob pattern only
+ * glob uses different pattern than regular expressions, escape glob pattern only
* @param string $path unescaped path
* @return string path
*/
@@ -437,7 +437,7 @@ class Helper {
}
/**
- * @brief remember from which file the tmp file (getLocalFile() call) was created
+ * remember from which file the tmp file (getLocalFile() call) was created
* @param string $tmpFile path of tmp file
* @param string $originalFile path of the original file relative to data/
*/
@@ -446,7 +446,7 @@ class Helper {
}
/**
- * @brief get the path of the original file
+ * get the path of the original file
* @param string $tmpFile path of the tmp file
* @return string|false path of the original file or false
*/
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index cb9f5e64af37aa3e54f64a0b18ddfa959a61fbc9..3c51c5efba20759d6ceab8fbb157528aedbc2d81 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -24,20 +24,20 @@
namespace OCA\Encryption;
/**
- * @brief Class to manage storage and retrieval of encryption keys
+ * Class to manage storage and retrieval of encryption keys
* @note Where a method requires a view object, it's root must be '/'
*/
class Keymanager {
/**
- * @brief retrieve the ENCRYPTED private key from a user
+ * retrieve the ENCRYPTED private key from a user
*
- * @param \OC_FilesystemView $view
+ * @param \OC\Files\View $view
* @param string $user
* @return string private key or false (hopefully)
* @note the key returned by this method must be decrypted before use
*/
- public static function getPrivateKey(\OC_FilesystemView $view, $user) {
+ public static function getPrivateKey(\OC\Files\View $view, $user) {
$path = '/' . $user . '/' . 'files_encryption' . '/' . $user . '.private.key';
$key = false;
@@ -55,12 +55,12 @@ class Keymanager {
}
/**
- * @brief retrieve public key for a specified user
- * @param \OC_FilesystemView $view
- * @param $userId
+ * retrieve public key for a specified user
+ * @param \OC\Files\View $view
+ * @param string $userId
* @return string public key or false
*/
- public static function getPublicKey(\OC_FilesystemView $view, $userId) {
+ public static function getPublicKey(\OC\Files\View $view, $userId) {
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -74,12 +74,12 @@ class Keymanager {
}
/**
- * @brief Retrieve a user's public and private key
- * @param \OC_FilesystemView $view
- * @param $userId
+ * Retrieve a user's public and private key
+ * @param \OC\Files\View $view
+ * @param string $userId
* @return array keys: privateKey, publicKey
*/
- public static function getUserKeys(\OC_FilesystemView $view, $userId) {
+ public static function getUserKeys(\OC\Files\View $view, $userId) {
return array(
'publicKey' => self::getPublicKey($view, $userId),
@@ -89,12 +89,12 @@ class Keymanager {
}
/**
- * @brief Retrieve public keys for given users
- * @param \OC_FilesystemView $view
+ * Retrieve public keys for given users
+ * @param \OC\Files\View $view
* @param array $userIds
* @return array of public keys for the specified users
*/
- public static function getPublicKeys(\OC_FilesystemView $view, array $userIds) {
+ public static function getPublicKeys(\OC\Files\View $view, array $userIds) {
$keys = array();
@@ -109,9 +109,9 @@ class Keymanager {
}
/**
- * @brief store file encryption key
+ * store file encryption key
*
- * @param \OC_FilesystemView $view
+ * @param \OC\Files\View $view
* @param \OCA\Encryption\Util $util
* @param string $path relative path of the file, including filename
* @param string $catfile keyfile content
@@ -119,7 +119,7 @@ class Keymanager {
* @note The keyfile is not encrypted here. Client code must
* asymmetrically encrypt the keyfile before passing it to this method
*/
- public static function setFileKey(\OC_FilesystemView $view, $util, $path, $catfile) {
+ public static function setFileKey(\OC\Files\View $view, $util, $path, $catfile) {
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -167,8 +167,8 @@ class Keymanager {
}
/**
- * @brief retrieve keyfile for an encrypted file
- * @param \OC_FilesystemView $view
+ * retrieve keyfile for an encrypted file
+ * @param \OC\Files\View $view
* @param \OCA\Encryption\Util $util
* @param string|false $filePath
* @internal param \OCA\Encryption\file $string name
@@ -210,9 +210,9 @@ class Keymanager {
}
/**
- * @brief Delete a keyfile
+ * Delete a keyfile
*
- * @param \OC_FilesystemView $view
+ * @param \OC\Files\View $view
* @param string $path path of the file the key belongs to
* @param string $userId the user to whom the file belongs
* @return bool Outcome of unlink operation
@@ -266,7 +266,7 @@ class Keymanager {
}
/**
- * @brief store private key from the user
+ * store private key from the user
* @param string $key
* @return bool
* @note Encryption of the private key must be performed by client code
@@ -276,7 +276,7 @@ class Keymanager {
$user = \OCP\User::getUser();
- $view = new \OC_FilesystemView('/' . $user . '/files_encryption');
+ $view = new \OC\Files\View('/' . $user . '/files_encryption');
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -293,16 +293,16 @@ class Keymanager {
}
/**
- * @brief store share key
+ * store share key
*
- * @param \OC_FilesystemView $view
+ * @param \OC\Files\View $view
* @param string $path where the share key is stored
- * @param $shareKey
+ * @param string $shareKey
* @return bool true/false
* @note The keyfile is not encrypted here. Client code must
* asymmetrically encrypt the keyfile before passing it to this method
*/
- private static function setShareKey(\OC_FilesystemView $view, $path, $shareKey) {
+ private static function setShareKey(\OC\Files\View $view, $path, $shareKey) {
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -319,14 +319,14 @@ class Keymanager {
}
/**
- * @brief store multiple share keys for a single file
- * @param \OC_FilesystemView $view
+ * store multiple share keys for a single file
+ * @param \OC\Files\View $view
* @param \OCA\Encryption\Util $util
* @param string $path
* @param array $shareKeys
* @return bool
*/
- public static function setShareKeys(\OC_FilesystemView $view, $util, $path, array $shareKeys) {
+ public static function setShareKeys(\OC\Files\View $view, $util, $path, array $shareKeys) {
// $shareKeys must be an array with the following format:
// [userId] => [encrypted key]
@@ -365,8 +365,8 @@ class Keymanager {
}
/**
- * @brief retrieve shareKey for an encrypted file
- * @param \OC_FilesystemView $view
+ * retrieve shareKey for an encrypted file
+ * @param \OC\Files\View $view
* @param string $userId
* @param \OCA\Encryption\Util $util
* @param string $filePath
@@ -374,7 +374,7 @@ class Keymanager {
* @note The sharekey returned is encrypted. Decryption
* of the keyfile must be performed by client code
*/
- public static function getShareKey(\OC_FilesystemView $view, $userId, $util, $filePath) {
+ public static function getShareKey(\OC\Files\View $view, $userId, $util, $filePath) {
// try reusing key file if part file
$proxyStatus = \OC_FileProxy::$enabled;
@@ -406,8 +406,8 @@ class Keymanager {
}
/**
- * @brief delete all share keys of a given file
- * @param \OC_FilesystemView $view
+ * delete all share keys of a given file
+ * @param \OC\Files\View $view
* @param string $userId owner of the file
* @param string $filePath path to the file, relative to the owners file dir
*/
@@ -445,9 +445,9 @@ class Keymanager {
}
/**
- * @brief Delete a single user's shareKey for a single file
+ * Delete a single user's shareKey for a single file
*/
- public static function delShareKey(\OC_FilesystemView $view, $userIds, $filePath) {
+ public static function delShareKey(\OC\Files\View $view, $userIds, $filePath) {
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -486,7 +486,7 @@ class Keymanager {
}
/**
- * @brief recursively delete share keys from given users
+ * recursively delete share keys from given users
*
* @param string $dir directory
* @param array $userIds user ids for which the share keys should be deleted
@@ -512,11 +512,11 @@ class Keymanager {
}
/**
- * @brief Make preparations to vars and filesystem for saving a keyfile
+ * Make preparations to vars and filesystem for saving a keyfile
* @param string|boolean $path
* @param string $basePath
*/
- public static function keySetPreparation(\OC_FilesystemView $view, $path, $basePath, $userId) {
+ public static function keySetPreparation(\OC\Files\View $view, $path, $basePath, $userId) {
$targetPath = ltrim($path, '/');
@@ -542,7 +542,7 @@ class Keymanager {
}
/**
- * @brief extract filename from share key name
+ * extract filename from share key name
* @param string $shareKey (filename.userid.sharekey)
* @return string|false filename or false
*/
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 7be82c313e494805129809658341399777f74d13..ae3df834e9f417394a65f732b0338c4a736b5a57 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -24,7 +24,7 @@
*/
/**
- * @brief Encryption proxy which handles filesystem operations before and after
+ * Encryption proxy which handles filesystem operations before and after
* execution and encrypts, and handles keyfiles accordingly. Used for
* webui.
*/
@@ -65,7 +65,7 @@ class Proxy extends \OC_FileProxy {
return false;
}
- $view = new \OC_FilesystemView('');
+ $view = new \OC\Files\View('');
$util = new Util($view, $userId);
// for write operation we always encrypt the files, for read operations
@@ -79,8 +79,8 @@ class Proxy extends \OC_FileProxy {
}
/**
- * @param $path
- * @param $data
+ * @param string $path
+ * @param string $data
* @return bool
*/
public function preFile_put_contents($path, &$data) {
@@ -90,7 +90,7 @@ class Proxy extends \OC_FileProxy {
if (!is_resource($data)) {
// get root view
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
// get relative path
$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
@@ -101,7 +101,7 @@ class Proxy extends \OC_FileProxy {
// create random cache folder
$cacheFolder = rand();
- $path_slices = explode('/', \OC_Filesystem::normalizePath($path));
+ $path_slices = explode('/', \OC\Files\Filesystem::normalizePath($path));
$path_slices[2] = "cache/".$cacheFolder;
$tmpPath = implode('/', $path_slices);
@@ -125,7 +125,7 @@ class Proxy extends \OC_FileProxy {
// in the post proxy
$tmpFileInfo = $view->getFileInfo($tmpPath);
if ( isset($tmpFileInfo['size']) ) {
- self::$unencryptedSizes[\OC_Filesystem::normalizePath($path)] = $tmpFileInfo['size'];
+ self::$unencryptedSizes[\OC\Files\Filesystem::normalizePath($path)] = $tmpFileInfo['size'];
}
// remove our temp file
@@ -144,15 +144,15 @@ class Proxy extends \OC_FileProxy {
}
/**
- * @brief update file cache with the new unencrypted size after file was written
+ * update file cache with the new unencrypted size after file was written
* @param string $path
* @param mixed $result
* @return mixed
*/
public function postFile_put_contents($path, $result) {
- $normalizedPath = \OC_Filesystem::normalizePath($path);
+ $normalizedPath = \OC\Files\Filesystem::normalizePath($path);
if ( isset(self::$unencryptedSizes[$normalizedPath]) ) {
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
$view->putFileInfo($normalizedPath,
array('encrypted' => true, 'unencrypted_size' => self::$unencryptedSizes[$normalizedPath]));
unset(self::$unencryptedSizes[$normalizedPath]);
@@ -168,7 +168,7 @@ class Proxy extends \OC_FileProxy {
public function postFile_get_contents($path, $data) {
$plainData = null;
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
// init session
$session = new \OCA\Encryption\Session($view);
@@ -212,7 +212,7 @@ class Proxy extends \OC_FileProxy {
}
/**
- * @brief remember initial fopen mode because sometimes it gets changed during the request
+ * remember initial fopen mode because sometimes it gets changed during the request
* @param string $path path
* @param string $mode type of access
*/
@@ -225,8 +225,8 @@ class Proxy extends \OC_FileProxy {
/**
- * @param $path
- * @param $result
+ * @param string $path
+ * @param resource $result
* @return resource
*/
public function postFopen($path, &$result) {
@@ -261,8 +261,8 @@ class Proxy extends \OC_FileProxy {
}
/**
- * @param $path
- * @param $data
+ * @param string $path
+ * @param array $data
* @return array
*/
public function postGetFileInfo($path, $data) {
@@ -285,13 +285,13 @@ class Proxy extends \OC_FileProxy {
}
/**
- * @param $path
- * @param $size
- * @return bool
+ * @param string $path
+ * @param int $size
+ * @return int|bool
*/
public function postFileSize($path, $size) {
- $view = new \OC_FilesystemView('/');
+ $view = new \OC\Files\View('/');
$userId = Helper::getUser($path);
$util = new Util($view, $userId);
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 3daaa06425faf30dcbb5b65c7a6334780bb75f06..93be6691f96bbc0d0e6db2db632f7b8a1357782a 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -36,8 +36,8 @@ class Session {
/**
- * @brief if session is started, check if ownCloud key pair is set up, if not create it
- * @param \OC_FilesystemView $view
+ * if session is started, check if ownCloud key pair is set up, if not create it
+ * @param \OC\Files\View $view
*
* @note The ownCloud key pair is used to allow public link sharing even if encryption is enabled
*/
@@ -105,7 +105,7 @@ class Session {
}
/**
- * @brief Sets user private key to session
+ * Sets user private key to session
* @param string $privateKey
* @return bool
*
@@ -120,8 +120,8 @@ class Session {
}
/**
- * @brief Sets status of encryption app
- * @param string $init INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INOITIALIZED
+ * Sets status of encryption app
+ * @param string $init INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INITIALIZED
* @return bool
*
* @note this doesn not indicate of the init was successful, we just remeber the try!
@@ -135,7 +135,7 @@ class Session {
}
/**
- * @brief remove encryption keys and init status from session
+ * remove encryption keys and init status from session
*/
public function closeSession() {
\OC::$session->remove('encryptionInitialized');
@@ -144,8 +144,8 @@ class Session {
/**
- * @brief Gets status if we already tried to initialize the encryption app
- * @returns init status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INOITIALIZED
+ * Gets status if we already tried to initialize the encryption app
+ * @return string init status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INITIALIZED
*
* @note this doesn not indicate of the init was successful, we just remeber the try!
*/
@@ -158,8 +158,8 @@ class Session {
}
/**
- * @brief Gets user or public share private key from session
- * @returns string $privateKey The user's plaintext private key
+ * Gets user or public share private key from session
+ * @return string $privateKey The user's plaintext private key
*
*/
public function getPrivateKey() {
@@ -176,7 +176,7 @@ class Session {
}
/**
- * @brief Sets public user private key to session
+ * Sets public user private key to session
* @param string $privateKey
* @return bool
*/
@@ -189,8 +189,8 @@ class Session {
}
/**
- * @brief Gets public share private key from session
- * @returns string $privateKey
+ * Gets public share private key from session
+ * @return string $privateKey
*
*/
public function getPublicSharePrivateKey() {
@@ -204,7 +204,7 @@ class Session {
/**
- * @brief Sets user legacy key to session
+ * Sets user legacy key to session
* @param string $legacyKey
* @return bool
*/
@@ -216,8 +216,8 @@ class Session {
}
/**
- * @brief Gets user legacy key from session
- * @returns string $legacyKey The user's plaintext legacy key
+ * Gets user legacy key from session
+ * @return string $legacyKey The user's plaintext legacy key
*
*/
public function getLegacyKey() {
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index df5de558867867f41c38d1c9b2548ada7264d1b6..341114214d50227ff7c39dea15b5e53056e335f8 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -31,7 +31,7 @@
namespace OCA\Encryption;
/**
- * @brief Provides 'crypt://' stream wrapper protocol.
+ * Provides 'crypt://' stream wrapper protocol.
* @note We use a stream wrapper because it is the most secure way to handle
* decrypted content transfers. There is no safe way to decrypt the entire file
* somewhere on the server, so we have to encrypt and decrypt blocks on the fly.
@@ -79,10 +79,10 @@ class Stream {
private $privateKey;
/**
- * @param $path raw path relative to data/
- * @param $mode
- * @param $options
- * @param $opened_path
+ * @param string $path raw path relative to data/
+ * @param string $mode
+ * @param int $options
+ * @param string $opened_path
* @return bool
*/
public function stream_open($path, $mode, $options, &$opened_path) {
@@ -91,7 +91,7 @@ class Stream {
$this->newFile = false;
if (!isset($this->rootView)) {
- $this->rootView = new \OC_FilesystemView('/');
+ $this->rootView = new \OC\Files\View('/');
}
$this->session = new \OCA\Encryption\Session($this->rootView);
@@ -179,15 +179,15 @@ class Stream {
}
/**
- * @brief Returns the current position of the file pointer
- * @return int position of the file pointer
+ * Returns the current position of the file pointer
+ * @return int position of the file pointer
*/
public function stream_tell() {
return ftell($this->handle);
}
/**
- * @param $offset
+ * @param int $offset
* @param int $whence
* @return bool true if fseek was successful, otherwise false
*/
@@ -202,7 +202,7 @@ class Stream {
}
/**
- * @param $count
+ * @param int $count
* @return bool|string
* @throws \Exception
*/
@@ -246,7 +246,7 @@ class Stream {
}
/**
- * @brief Encrypt and pad data ready for writing to disk
+ * Encrypt and pad data ready for writing to disk
* @param string $plainData data to be encrypted
* @param string $key key to use for encryption
* @return string encrypted data on success, false on failure
@@ -267,7 +267,7 @@ class Stream {
}
/**
- * @brief Fetch the plain encryption key for the file and set it as plainKey property
+ * Fetch the plain encryption key for the file and set it as plainKey property
* @internal param bool $generate if true, a new key will be generated if none can be found
* @return bool true on key found and set, false on key not found and new key generated and set
*/
@@ -318,7 +318,7 @@ class Stream {
}
/**
- * @brief Handle plain data from the stream, and write it in 8192 byte blocks
+ * Handle plain data from the stream, and write it in 8192 byte blocks
* @param string $data data to be written to disk
* @note the data will be written to the path stored in the stream handle, set in stream_open()
* @note $data is only ever be a maximum of 8192 bytes long. This is set by PHP internally. stream_write() is called multiple times in a loop on data larger than 8192 bytes
@@ -426,9 +426,9 @@ class Stream {
/**
- * @param $option
- * @param $arg1
- * @param $arg2
+ * @param int $option
+ * @param int $arg1
+ * @param int|null $arg2
*/
public function stream_set_option($option, $arg1, $arg2) {
$return = false;
@@ -454,7 +454,7 @@ class Stream {
}
/**
- * @param $mode
+ * @param int $mode
*/
public function stream_lock($mode) {
return flock($this->handle, $mode);
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 6372ab31b6ec1c2e111825f26dc0926cd2ad4dd3..991960b7fa9ad88ab9f345598f0e3ae3edd5b768 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -25,8 +25,8 @@
namespace OCA\Encryption;
/**
- * @brief Class for utilities relating to encrypted file storage system
- * @param \OC_FilesystemView $view expected to have OC '/' as root path
+ * Class for utilities relating to encrypted file storage system
+ * @param \OC\Files\View $view expected to have OC '/' as root path
* @param string $userId ID of the logged in user
* @param int $client indicating status of client side encryption. Currently
* unused, likely to become obsolete shortly
@@ -38,7 +38,7 @@ class Util {
const MIGRATION_IN_PROGRESS = -1; // migration is running
const MIGRATION_OPEN = 0; // user still needs to be migrated
- private $view; // OC_FilesystemView object for filesystem operations
+ private $view; // OC\Files\View object for filesystem operations
private $userId; // ID of the user we use to encrypt/decrypt files
private $keyId; // ID of the key we want to manipulate
private $client; // Client side encryption mode flag
@@ -53,8 +53,8 @@ class Util {
private $isPublic;
/**
- * @param \OC_FilesystemView $view
- * @param $userId
+ * @param \OC\Files\View $view
+ * @param string $userId
* @param bool $client
*/
public function __construct($view, $userId, $client = false) {
@@ -111,7 +111,7 @@ class Util {
}
/**
- * @brief check if the users private & public key exists
+ * check if the users private & public key exists
* @return boolean
*/
public function userKeysExists() {
@@ -125,7 +125,7 @@ class Util {
}
/**
- * @brief Sets up user folders and keys for serverside encryption
+ * Sets up user folders and keys for serverside encryption
*
* @param string $passphrase to encrypt server-stored private key with
* @return bool
@@ -222,7 +222,7 @@ class Util {
}
/**
- * @brief Check whether pwd recovery is enabled for a given user
+ * Check whether pwd recovery is enabled for a given user
* @return bool 1 = yes, 0 = no, false = no record
*
* @note If records are not being returned, check for a hidden space
@@ -264,7 +264,7 @@ class Util {
}
/**
- * @brief Enable / disable pwd recovery for a given user
+ * Enable / disable pwd recovery for a given user
* @param bool $enabled Whether to enable or disable recovery
* @return bool
*/
@@ -300,7 +300,7 @@ class Util {
}
/**
- * @brief Find all files and their encryption status within a directory
+ * Find all files and their encryption status within a directory
* @param string $directory The path of the parent directory to search
* @param bool $found the founded files if called again
* @return mixed false if 0 found, array on success. Keys: name, path
@@ -421,7 +421,7 @@ class Util {
}
/**
- * @brief Check if a given path identifies an encrypted file
+ * Check if a given path identifies an encrypted file
* @param string $path
* @return boolean
*/
@@ -463,7 +463,7 @@ class Util {
}
/**
- * @brief get the file size of the unencrypted file
+ * get the file size of the unencrypted file
* @param string $path absolute path
* @return bool
*/
@@ -537,7 +537,7 @@ class Util {
}
/**
- * @brief fix the file size of the encrypted file
+ * fix the file size of the encrypted file
* @param string $path absolute path
* @return boolean true / false if file is encrypted
*/
@@ -594,7 +594,7 @@ class Util {
}
/**
- * @brief encrypt versions from given file
+ * encrypt versions from given file
* @param array $filelist list of encrypted files, relative to data/user/files
* @return boolean
*/
@@ -640,7 +640,7 @@ class Util {
}
/**
- * @brief decrypt versions from given file
+ * decrypt versions from given file
* @param string $filelist list of decrypted files, relative to data/user/files
* @return boolean
*/
@@ -686,7 +686,7 @@ class Util {
}
/**
- * @brief Decrypt all files
+ * Decrypt all files
* @return bool
*/
public function decryptAll() {
@@ -788,8 +788,8 @@ class Util {
}
if ($successful) {
- $this->view->deleteAll($this->keyfilesPath);
- $this->view->deleteAll($this->shareKeysPath);
+ $this->view->rename($this->keyfilesPath, $this->keyfilesPath . '.backup');
+ $this->view->rename($this->shareKeysPath, $this->shareKeysPath . '.backup');
}
\OC_FileProxy::$enabled = true;
@@ -799,7 +799,7 @@ class Util {
}
/**
- * @brief Encrypt all files in a directory
+ * Encrypt all files in a directory
* @param string $dirPath the directory whose files will be encrypted
* @param null $legacyPassphrase
* @param null $newPassphrase
@@ -926,7 +926,7 @@ class Util {
}
/**
- * @brief Return important encryption related paths
+ * Return important encryption related paths
* @param string $pathName Name of the directory to return the path of
* @return string path
*/
@@ -970,7 +970,7 @@ class Util {
}
/**
- * @brief Filter an array of UIDs to return only ones ready for sharing
+ * Filter an array of UIDs to return only ones ready for sharing
* @param array $unfilteredUsers users to be checked for sharing readiness
* @return array as multi-dimensional array. keys: ready, unready
*/
@@ -1017,7 +1017,7 @@ class Util {
}
/**
- * @brief Decrypt a keyfile
+ * Decrypt a keyfile
* @param string $filePath
* @param string $privateKey
* @return false|string
@@ -1036,7 +1036,7 @@ class Util {
}
/**
- * @brief Encrypt keyfile to multiple users
+ * Encrypt keyfile to multiple users
* @param Session $session
* @param array $users list of users which should be able to access the file
* @param string $filePath path of the file to be shared
@@ -1097,7 +1097,7 @@ class Util {
}
/**
- * @brief Find, sanitise and format users sharing a file
+ * Find, sanitise and format users sharing a file
* @note This wraps other methods into a portable bundle
* @param boolean $sharingEnabled
* @param string $filePath path relativ to current users files folder
@@ -1176,7 +1176,7 @@ class Util {
}
/**
- * @brief set migration status
+ * set migration status
* @param int $status
* @return boolean
*/
@@ -1199,7 +1199,7 @@ class Util {
}
/**
- * @brief start migration mode to initially encrypt users data
+ * start migration mode to initially encrypt users data
* @return boolean
*/
public function beginMigration() {
@@ -1221,7 +1221,7 @@ class Util {
}
/**
- * @brief close migration mode after users data has been encrypted successfully
+ * close migration mode after users data has been encrypted successfully
* @return boolean
*/
public function finishMigration() {
@@ -1237,8 +1237,8 @@ class Util {
}
/**
- * @brief check if files are already migrated to the encryption system
- * @return migration status, false = in case of no record
+ * check if files are already migrated to the encryption system
+ * @return int|false migration status, false = in case of no record
* @note If records are not being returned, check for a hidden space
* at the start of the uid in db
*/
@@ -1288,7 +1288,7 @@ class Util {
}
/**
- * @brief get uid of the owners of the file and the path to the file
+ * get uid of the owners of the file and the path to the file
* @param string $path Path of the file to check
* @throws \Exception
* @note $shareFilePath must be relative to data/UID/files. Files
@@ -1361,13 +1361,13 @@ class Util {
return array(
$fileOwnerUid,
- \OC_Filesystem::normalizePath($filename)
+ \OC\Files\Filesystem::normalizePath($filename)
);
}
}
/**
- * @brief go recursively through a dir and collect all files and sub files.
+ * go recursively through a dir and collect all files and sub files.
* @param string $dir relative to the users files folder
* @return array with list of files relative to the users files folder
*/
@@ -1384,10 +1384,11 @@ class Util {
// getDirectoryContent() returns the paths relative to the mount points, so we need
// to re-construct the complete path
$path = ($mountPoint !== '') ? $mountPoint . '/' . $c['path'] : $c['path'];
+ $path = \OC\Files\Filesystem::normalizePath($path);
if ($c['type'] === 'dir') {
- $dirList[] = substr($path, strlen("files"));
+ $dirList[] = substr($path, strlen('/' . \OCP\User::getUser() . "/files"));
} else {
- $result[] = substr($path, strlen("files"));
+ $result[] = substr($path, strlen('/' . \OCP\User::getUser() . "/files"));
}
}
@@ -1397,9 +1398,8 @@ class Util {
}
/**
- * @brief get owner of the shared files.
- * @param $id
- * @internal param int $Id of a share
+ * get owner of the shared files.
+ * @param int $id ID of a share
* @return string owner
*/
public function getOwnerFromSharedFile($id) {
@@ -1479,7 +1479,7 @@ class Util {
}
/**
- * @param $password
+ * @param string $password
* @return bool
*/
public function checkRecoveryPassword($password) {
@@ -1512,7 +1512,7 @@ class Util {
}
/**
- * @brief add recovery key to all encrypted files
+ * add recovery key to all encrypted files
*/
public function addRecoveryKeys($path = '/') {
$dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
@@ -1522,7 +1522,7 @@ class Util {
if ($item['type'] === 'dir') {
$this->addRecoveryKeys($filePath . '/');
} else {
- $session = new \OCA\Encryption\Session(new \OC_FilesystemView('/'));
+ $session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
$sharingEnabled = \OCP\Share::isEnabled();
// remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt'
$file = substr($filePath, 0, -4);
@@ -1533,7 +1533,7 @@ class Util {
}
/**
- * @brief remove recovery key to all encrypted files
+ * remove recovery key to all encrypted files
*/
public function removeRecoveryKeys($path = '/') {
$dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
@@ -1551,7 +1551,7 @@ class Util {
}
/**
- * @brief decrypt given file with recovery key and encrypt it again to the owner and his new key
+ * decrypt given file with recovery key and encrypt it again to the owner and his new key
* @param string $file
* @param string $privateKey recovery key to decrypt the file
*/
@@ -1599,7 +1599,7 @@ class Util {
}
/**
- * @brief collect all files and recover them one by one
+ * collect all files and recover them one by one
* @param string $path to look for files keys
* @param string $privateKey private recovery key which is used to decrypt the files
*/
@@ -1619,7 +1619,7 @@ class Util {
}
/**
- * @brief recover users files in case of password lost
+ * recover users files in case of password lost
* @param string $recoveryPassword
*/
public function recoverUsersFiles($recoveryPassword) {
@@ -1638,8 +1638,8 @@ class Util {
}
/**
- * @brief check if the file is stored on a system wide mount point
- * @param $path relative to /data/user with leading '/'
+ * check if the file is stored on a system wide mount point
+ * @param string $path relative to /data/user with leading '/'
* @return boolean
*/
public function isSystemWideMountPoint($path) {
@@ -1655,7 +1655,7 @@ class Util {
}
/**
- * @brief decrypt private key and add it to the current session
+ * decrypt private key and add it to the current session
* @param array $params with 'uid' and 'password'
* @return mixed session or false
*/
@@ -1683,7 +1683,7 @@ class Util {
}
/*
- * @brief remove encryption related keys from the session
+ * remove encryption related keys from the session
*/
public function closeEncryptionSession() {
$session = new \OCA\Encryption\Session($this->view);
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index 09e9df05352a9a121761f07d979534e95a826147..e9875518f67956b3f7227b735bac07eb7d51cbbd 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -12,7 +12,7 @@
$tmpl = new OCP\Template('files_encryption', 'settings-personal');
$user = \OCP\USER::getUser();
-$view = new \OC_FilesystemView('/');
+$view = new \OC\Files\View('/');
$util = new \OCA\Encryption\Util($view, $user);
$session = new \OCA\Encryption\Session($view);
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 123943ea26a9c6cca7593f508c38f7aebf587808..b22cd214eaaad1738e1b6590f8dc42ec5f05198d 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -34,7 +34,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
public $dataUrl;
public $dataShort;
/**
- * @var OC_FilesystemView
+ * @var OC\Files\View
*/
public $view;
public $legacyEncryptedData;
@@ -79,7 +79,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$this->genPublicKey = $keypair['publicKey'];
$this->genPrivateKey = $keypair['privateKey'];
- $this->view = new \OC_FilesystemView('/');
+ $this->view = new \OC\Files\View('/');
// remember files_trashbin state
$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
@@ -157,7 +157,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$filename = 'tmp-' . uniqid() . '.test';
- $util = new Encryption\Util(new \OC_FilesystemView(), $this->userId);
+ $util = new Encryption\Util(new \OC\Files\View(), $this->userId);
$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/'. $filename, $this->dataShort);
@@ -206,7 +206,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
/**
* @medium
- * @brief Test that data that is written by the crypto stream wrapper
+ * Test that data that is written by the crypto stream wrapper
* @note Encrypted data is manually prepared and decrypted here to avoid dependency on success of stream_read
* @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
* reassembly of its data
@@ -216,7 +216,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
// Generate a a random filename
$filename = 'tmp-' . uniqid() . '.test';
- $util = new Encryption\Util(new \OC_FilesystemView(), $this->userId);
+ $util = new Encryption\Util(new \OC\Files\View(), $this->userId);
// Save long data as encrypted file using stream wrapper
$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong . $this->dataLong);
@@ -293,7 +293,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
/**
* @medium
- * @brief Test that data that is read by the crypto stream wrapper
+ * Test that data that is read by the crypto stream wrapper
*/
function testSymmetricStreamDecryptShortFileContent() {
@@ -388,7 +388,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
/**
* @medium
- * @brief test decryption using legacy blowfish method
+ * test decryption using legacy blowfish method
*/
function testLegacyDecryptShort() {
@@ -402,7 +402,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
/**
* @medium
- * @brief test decryption using legacy blowfish method
+ * test decryption using legacy blowfish method
*/
function testLegacyDecryptLong() {
@@ -660,9 +660,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
/**
- * @brief encryption using legacy blowfish method
+ * encryption using legacy blowfish method
* @param string $data data to encrypt
- * @param $passwd string password
+ * @param string $passwd password
* @return string
*/
function legacyEncrypt($data, $passwd) {
diff --git a/apps/files_encryption/tests/hooks.php b/apps/files_encryption/tests/hooks.php
index 047084ca2c177713202d75b30fd402c067027e90..437034726183fe3665e8a1d356323a5926987420 100644
--- a/apps/files_encryption/tests/hooks.php
+++ b/apps/files_encryption/tests/hooks.php
@@ -32,7 +32,7 @@ use OCA\Encryption;
/**
* Class Test_Encryption_Hooks
- * @brief this class provide basic hook app tests
+ * this class provide basic hook app tests
*/
class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
@@ -40,7 +40,7 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
const TEST_ENCRYPTION_HOOKS_USER2 = "test-encryption-hooks-user2";
/**
- * @var \OC_FilesystemView
+ * @var \OC\Files\View
*/
public $user1View; // view on /data/user1/files
public $user2View; // view on /data/user2/files
@@ -83,9 +83,9 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
\OC_User::setUserId(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1);
// init filesystem view
- $this->user1View = new \OC_FilesystemView('/'. \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1 . '/files');
- $this->user2View = new \OC_FilesystemView('/'. \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '/files');
- $this->rootView = new \OC_FilesystemView('/');
+ $this->user1View = new \OC\Files\View('/'. \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1 . '/files');
+ $this->user2View = new \OC\Files\View('/'. \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '/files');
+ $this->rootView = new \OC\Files\View('/');
// init short data
$this->data = 'hats';
@@ -259,7 +259,7 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
}
/**
- * @brief test rename operation
+ * test rename operation
*/
function testRenameHook() {
@@ -311,4 +311,46 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
$this->rootView->unlink('/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files/' . $this->folder);
}
+ /**
+ * @brief replacing encryption keys during password change should be allowed
+ * until the user logged in for the first time
+ */
+ public function testSetPassphrase() {
+
+ $view = new \OC\Files\View();
+
+ // set user password for the first time
+ \OCA\Encryption\Hooks::postCreateUser(array('uid' => 'newUser', 'password' => 'newUserPassword'));
+
+ $this->assertTrue($view->file_exists('public-keys/newUser.public.key'));
+ $this->assertTrue($view->file_exists('newUser/files_encryption/newUser.private.key'));
+
+ // check if we are able to decrypt the private key
+ $encryptedKey = \OCA\Encryption\Keymanager::getPrivateKey($view, 'newUser');
+ $privateKey = \OCA\Encryption\Crypt::decryptPrivateKey($encryptedKey, 'newUserPassword');
+ $this->assertTrue(is_string($privateKey));
+
+ // change the password before the user logged-in for the first time,
+ // we can replace the encryption keys
+ \OCA\Encryption\Hooks::setPassphrase(array('uid' => 'newUser', 'password' => 'passwordChanged'));
+
+ $encryptedKey = \OCA\Encryption\Keymanager::getPrivateKey($view, 'newUser');
+ $privateKey = \OCA\Encryption\Crypt::decryptPrivateKey($encryptedKey, 'passwordChanged');
+ $this->assertTrue(is_string($privateKey));
+
+ // now create a files folder to simulate a already used account
+ $view->mkdir('/newUser/files');
+
+ // change the password after the user logged in, now the password should not change
+ \OCA\Encryption\Hooks::setPassphrase(array('uid' => 'newUser', 'password' => 'passwordChanged2'));
+
+ $encryptedKey = \OCA\Encryption\Keymanager::getPrivateKey($view, 'newUser');
+ $privateKey = \OCA\Encryption\Crypt::decryptPrivateKey($encryptedKey, 'passwordChanged2');
+ $this->assertFalse($privateKey);
+
+ $privateKey = \OCA\Encryption\Crypt::decryptPrivateKey($encryptedKey, 'passwordChanged');
+ $this->assertTrue(is_string($privateKey));
+
+ }
+
}
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 0caf12e91a3eb2eae92b83ce741208792ea80292..2bd2ddc8e68d13d5973e5a23748edc1750c4bcf4 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -29,7 +29,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
public $pass;
public $stateFilesTrashbin;
/**
- * @var OC_FilesystemView
+ * @var OC\Files\View
*/
public $view;
public $randomKey;
@@ -68,7 +68,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
$this->genPublicKey = $keypair['publicKey'];
$this->genPrivateKey = $keypair['privateKey'];
- $this->view = new \OC_FilesystemView('/');
+ $this->view = new \OC\Files\View('/');
\OC_User::setUserId(\Test_Encryption_Keymanager::TEST_USER);
$this->userId = \Test_Encryption_Keymanager::TEST_USER;
@@ -257,4 +257,4 @@ class TestProtectedKeymanagerMethods extends \OCA\Encryption\Keymanager {
public static function testGetFilenameFromShareKey($sharekey) {
return self::getFilenameFromShareKey($sharekey);
}
-}
\ No newline at end of file
+}
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index 647ee955eb1ac7d763f1504956c725459af475ce..8d6bc81b08d217b03e61ca09cb7cf62fa78f8469 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -33,7 +33,7 @@ use OCA\Encryption;
/**
* Class Test_Encryption_Proxy
- * @brief this class provide basic proxy app tests
+ * this class provide basic proxy app tests
*/
class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
@@ -42,7 +42,7 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
public $userId;
public $pass;
/**
- * @var \OC_FilesystemView
+ * @var \OC\Files\View
*/
public $view; // view in /data/user/files
public $rootView; // view on /data/user
@@ -75,8 +75,8 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
$this->pass = \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1;
// init filesystem view
- $this->view = new \OC_FilesystemView('/'. \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 . '/files');
- $this->rootView = new \OC_FilesystemView('/'. \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 );
+ $this->view = new \OC\Files\View('/'. \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 . '/files');
+ $this->rootView = new \OC\Files\View('/'. \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 );
// init short data
$this->data = 'hats';
@@ -91,7 +91,7 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
/**
* @medium
- * @brief test if postFileSize returns the unencrypted file size
+ * test if postFileSize returns the unencrypted file size
*/
function testPostFileSize() {
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 512671c5767b5140c7d93de0727751e4c07080c4..bb3d7505a5df6adc0b96e8a055c147204ef0da42 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -48,7 +48,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
public $filename;
public $dataShort;
/**
- * @var OC_FilesystemView
+ * @var OC\Files\View
*/
public $view;
public $folder1;
@@ -92,7 +92,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
function setUp() {
$this->dataShort = 'hats';
- $this->view = new \OC_FilesystemView('/');
+ $this->view = new \OC\Files\View('/');
$this->folder1 = '/folder1';
$this->subfolder = '/subfolder1';
@@ -669,7 +669,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
// login as admin
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
- $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+ $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
// check if recovery password match
$this->assertTrue($util->checkRecoveryPassword('test123'));
@@ -777,7 +777,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
// login as user2
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
- $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+ $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
// enable recovery for admin
$this->assertTrue($util->setRecoveryForUser(1));
@@ -959,7 +959,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
/**
- * @brief test moving a shared file out of the Shared folder
+ * test moving a shared file out of the Shared folder
*/
function testRename() {
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index fed2e7d89d10d8eacc6d3d3ef36a5ea53a9ac584..5df9cdbe1f1468c56232a90b368d6d31bd559448 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -33,7 +33,7 @@ use OCA\Encryption;
/**
* Class Test_Encryption_Stream
- * @brief this class provide basic stream tests
+ * this class provide basic stream tests
*/
class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
@@ -42,7 +42,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
public $userId;
public $pass;
/**
- * @var \OC_FilesystemView
+ * @var \OC\Files\View
*/
public $view;
public $dataShort;
@@ -71,7 +71,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
$this->pass = \Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1;
// init filesystem view
- $this->view = new \OC_FilesystemView('/');
+ $this->view = new \OC\Files\View('/');
// init short data
$this->dataShort = 'hats';
@@ -183,7 +183,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
/**
* @medium
- * @brief test if stream wrapper can read files outside from the data folder
+ * test if stream wrapper can read files outside from the data folder
*/
function testStreamFromLocalFile() {
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index 2f9ecfd9d5d1faab63f2b3d37d4a422a42aefed1..5d54b7db24f0b989f03bfad72e38b7ee4bdf5eda 100755
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -34,7 +34,7 @@ use OCA\Encryption;
/**
* Class Test_Encryption_Trashbin
- * @brief this class provide basic trashbin app tests
+ * this class provide basic trashbin app tests
*/
class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
@@ -43,7 +43,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
public $userId;
public $pass;
/**
- * @var \OC_FilesystemView
+ * @var \OC\Files\View
*/
public $view;
public $dataShort;
@@ -81,7 +81,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
$this->pass = \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1;
// init filesystem view
- $this->view = new \OC_FilesystemView('/');
+ $this->view = new \OC\Files\View('/');
// init short data
$this->dataShort = 'hats';
@@ -114,7 +114,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
/**
* @medium
- * @brief test delete file
+ * test delete file
*/
function testDeleteFile() {
@@ -186,7 +186,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
/**
* @medium
- * @brief test restore file
+ * test restore file
*
* @depends testDeleteFile
*/
@@ -218,7 +218,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
/**
* @medium
- * @brief test delete file forever
+ * test delete file forever
*/
function testPermanentDeleteFile() {
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 88ded7ec40a4b591bf5b5c9359e3ec5950a6b41a..a4dcc5cc8bdcffa26e86c55cbefec523e1df21e4 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -29,7 +29,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
public $publicKeyDir;
public $pass;
/**
- * @var OC_FilesystemView
+ * @var OC\Files\View
*/
public $view;
public $keyfilesPath;
@@ -92,7 +92,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
$this->privateKeyPath =
$this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
- $this->view = new \OC_FilesystemView('/');
+ $this->view = new \OC\Files\View('/');
$this->util = new Encryption\Util($this->view, $this->userId);
@@ -121,7 +121,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
/**
* @medium
- * @brief test that paths set during User construction are correct
+ * test that paths set during User construction are correct
*/
function testKeyPaths() {
$util = new Encryption\Util($this->view, $this->userId);
@@ -136,7 +136,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
/**
* @medium
- * @brief test detection of encrypted files
+ * test detection of encrypted files
*/
function testIsEncryptedPath() {
@@ -171,7 +171,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
/**
* @medium
- * @brief test setup of encryption directories
+ * test setup of encryption directories
*/
function testSetupServerSide() {
$this->assertEquals(true, $this->util->setupServerSide($this->pass));
@@ -179,14 +179,14 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
/**
* @medium
- * @brief test checking whether account is ready for encryption,
+ * test checking whether account is ready for encryption,
*/
function testUserIsReady() {
$this->assertEquals(true, $this->util->ready());
}
/**
- * @brief test checking whether account is not ready for encryption,
+ * test checking whether account is not ready for encryption,
*/
// function testUserIsNotReady() {
// $this->view->unlink($this->publicKeyDir);
@@ -200,12 +200,12 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
/**
* @medium
- * @brief test checking whether account is not ready for encryption,
+ * test checking whether account is not ready for encryption,
*/
function testIsLegacyUser() {
\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
- $userView = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+ $userView = new \OC\Files\View('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@@ -279,7 +279,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
}
/**
-< * @brief Test that data that is read by the crypto stream wrapper
+< * Test that data that is read by the crypto stream wrapper
*/
function testGetFileSize() {
\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
@@ -384,7 +384,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
$params = array('uid' => \OCP\User::getUser(),
'password' => \OCP\User::getUser());
- $view = new OC_FilesystemView('/');
+ $view = new OC\Files\View('/');
$util = new \OCA\Encryption\Util($view, \OCP\User::getUser());
$result = $util->initEncryption($params);
@@ -413,8 +413,16 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
// file should no longer be encrypted
$this->assertEquals(0, $fileInfoUnencrypted['encrypted']);
+ // check if the keys where moved to the backup location
+ $this->assertTrue($this->view->is_dir($this->userId . '/files_encryption/keyfiles.backup'));
+ $this->assertTrue($this->view->file_exists($this->userId . '/files_encryption/keyfiles.backup/' . $filename . '.key'));
+ $this->assertTrue($this->view->is_dir($this->userId . '/files_encryption/share-keys.backup'));
+ $this->assertTrue($this->view->file_exists($this->userId . '/files_encryption/share-keys.backup/' . $filename . '.' . $user . '.shareKey'));
+
// cleanup
$this->view->unlink($this->userId . '/files/' . $filename);
+ $this->view->deleteAll($this->userId . '/files_encryption/keyfiles.backup');
+ $this->view->deleteAll($this->userId . '/files_encryption/share-keys.backup');
OC_App::enable('files_encryption');
}
@@ -485,8 +493,11 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
$this->assertFalse($this->view->is_dir($this->userId . '/files_encryption/keyfiles/'));
$this->assertFalse($this->view->is_dir($this->userId . '/files_encryption/share-keys/'));
+ //cleanup
$this->view->unlink($this->userId . '/files/' . $file1);
$this->view->unlink($this->userId . '/files/' . $file2);
+ $this->view->deleteAll($this->userId . '/files_encryption/keyfiles.backup');
+ $this->view->deleteAll($this->userId . '/files_encryption/share-keys.backup');
}
@@ -496,8 +507,8 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
function testEncryptLegacyFiles() {
\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
- $userView = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
- $view = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER . '/files');
+ $userView = new \OC\Files\View('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+ $view = new \OC\Files\View('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER . '/files');
// Disable encryption proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@@ -543,7 +554,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
}
/**
- * @param $user
+ * @param string $user
* @param bool $create
* @param bool $password
*/
@@ -584,7 +595,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
* to be able to test the migration path
*
* @param integer $status needed migration status for test
- * @param $user for which user the status should be set
+ * @param string $user for which user the status should be set
* @return boolean
*/
private function setMigrationStatus($status, $user) {
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
index 1fe4c13d59e8bae7622d38848fd4281bfcf9d410..d33dc58cf920a80d1a016efdcfc35fec30be17af 100755
--- a/apps/files_encryption/tests/webdav.php
+++ b/apps/files_encryption/tests/webdav.php
@@ -34,7 +34,7 @@ use OCA\Encryption;
/**
* Class Test_Encryption_Webdav
*
- * @brief this class provide basic webdav tests for PUT,GET and DELETE
+ * this class provide basic webdav tests for PUT,GET and DELETE
*/
class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
@@ -43,7 +43,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
public $userId;
public $pass;
/**
- * @var \OC_FilesystemView
+ * @var \OC\Files\View
*/
public $view;
public $dataShort;
@@ -82,7 +82,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
$this->pass = \Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1;
// init filesystem view
- $this->view = new \OC_FilesystemView('/');
+ $this->view = new \OC\Files\View('/');
// init short data
$this->dataShort = 'hats';
@@ -112,7 +112,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
}
/**
- * @brief test webdav put random file
+ * test webdav put random file
*/
function testWebdavPUT() {
@@ -167,7 +167,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
}
/**
- * @brief test webdav get random file
+ * test webdav get random file
*
* @depends testWebdavPUT
*/
@@ -190,7 +190,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
}
/**
- * @brief test webdav delete random file
+ * test webdav delete random file
* @depends testWebdavGET
*/
function testWebdavDELETE($filename) {
@@ -216,7 +216,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
}
/**
- * @brief handle webdav request
+ * handle webdav request
*
* @param bool $body
*
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 003665486f810bff0f0fdc97ff7fd2eefbf5dd31..ca164784fb011724a4c3578a5367b8b1b11724ab 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -32,11 +32,13 @@ OCP\Util::connectHook('OC_User', 'post_login', 'OC\Files\Storage\SMB_OC', 'login
OC_Mount_Config::registerBackend('\OC\Files\Storage\Local', array(
'backend' => (string)$l->t('Local'),
+ 'priority' => 150,
'configuration' => array(
'datadir' => (string)$l->t('Location'))));
OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array(
'backend' => (string)$l->t('Amazon S3'),
+ 'priority' => 100,
'configuration' => array(
'key' => (string)$l->t('Key'),
'secret' => '*'.$l->t('Secret'),
@@ -45,6 +47,7 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array(
OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array(
'backend' => (string)$l->t('Amazon S3 and compliant'),
+ 'priority' => 100,
'configuration' => array(
'key' => (string)$l->t('Access Key'),
'secret' => '*'.$l->t('Secret Key'),
@@ -58,6 +61,7 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array(
OC_Mount_Config::registerBackend('\OC\Files\Storage\Dropbox', array(
'backend' => 'Dropbox',
+ 'priority' => 100,
'configuration' => array(
'configured' => '#configured',
'app_key' => (string)$l->t('App key'),
@@ -69,8 +73,9 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\Dropbox', array(
OC_Mount_Config::registerBackend('\OC\Files\Storage\FTP', array(
'backend' => 'FTP',
+ 'priority' => 100,
'configuration' => array(
- 'host' => (string)$l->t('URL'),
+ 'host' => (string)$l->t('Host'),
'user' => (string)$l->t('Username'),
'password' => '*'.$l->t('Password'),
'root' => '&'.$l->t('Root'),
@@ -79,6 +84,7 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\FTP', array(
OC_Mount_Config::registerBackend('\OC\Files\Storage\Google', array(
'backend' => 'Google Drive',
+ 'priority' => 100,
'configuration' => array(
'configured' => '#configured',
'client_id' => (string)$l->t('Client ID'),
@@ -90,6 +96,7 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\Google', array(
OC_Mount_Config::registerBackend('\OC\Files\Storage\Swift', array(
'backend' => (string)$l->t('OpenStack Object Storage'),
+ 'priority' => 100,
'configuration' => array(
'user' => (string)$l->t('Username (required)'),
'bucket' => (string)$l->t('Bucket (required)'),
@@ -107,8 +114,9 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\Swift', array(
if (!OC_Util::runningOnWindows()) {
OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB', array(
'backend' => 'SMB / CIFS',
+ 'priority' => 100,
'configuration' => array(
- 'host' => (string)$l->t('URL'),
+ 'host' => (string)$l->t('Host'),
'user' => (string)$l->t('Username'),
'password' => '*'.$l->t('Password'),
'share' => (string)$l->t('Share'),
@@ -117,8 +125,9 @@ if (!OC_Util::runningOnWindows()) {
OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB_OC', array(
'backend' => (string)$l->t('SMB / CIFS using OC login'),
+ 'priority' => 90,
'configuration' => array(
- 'host' => (string)$l->t('URL'),
+ 'host' => (string)$l->t('Host'),
'username_as_share' => '!'.$l->t('Username as share'),
'share' => '&'.$l->t('Share'),
'root' => '&'.$l->t('Root')),
@@ -127,6 +136,7 @@ if (!OC_Util::runningOnWindows()) {
OC_Mount_Config::registerBackend('\OC\Files\Storage\DAV', array(
'backend' => 'WebDAV',
+ 'priority' => 100,
'configuration' => array(
'host' => (string)$l->t('URL'),
'user' => (string)$l->t('Username'),
@@ -137,6 +147,7 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\DAV', array(
OC_Mount_Config::registerBackend('\OC\Files\Storage\OwnCloud', array(
'backend' => 'ownCloud',
+ 'priority' => 100,
'configuration' => array(
'host' => (string)$l->t('URL'),
'user' => (string)$l->t('Username'),
@@ -147,8 +158,9 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\OwnCloud', array(
OC_Mount_Config::registerBackend('\OC\Files\Storage\SFTP', array(
'backend' => 'SFTP',
+ 'priority' => 100,
'configuration' => array(
- 'host' => (string)$l->t('URL'),
+ 'host' => (string)$l->t('Host'),
'user' => (string)$l->t('Username'),
'password' => '*'.$l->t('Password'),
'root' => '&'.$l->t('Root'))));
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index 0542b7b10a7afe831d0b917b9daf284949ab08f5..2698706c09084ba431a97e3c4e9afbc41c780e29 100644
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -4,8 +4,8 @@
<name>External storage support</name>
<description>Mount external storage sources</description>
<licence>AGPL</licence>
- <author>Robin Appelman, Michael Gapczynski</author>
- <require>4.93</require>
+ <author>Robin Appelman, Michael Gapczynski, Vincent Petry</author>
+ <requiremin>4.93</requiremin>
<shipped>true</shipped>
<types>
<filesystem/>
diff --git a/apps/files_external/l10n/ar.php b/apps/files_external/l10n/ar.php
index 5bef941c19ce2e53d4a49d9d5059a183c94df643..eb1150eb95ecfdc319362d21e1ba928a8aba9656 100644
--- a/apps/files_external/l10n/ar.php
+++ b/apps/files_external/l10n/ar.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "المكان",
-"URL" => "عنوان الموقع",
+"Host" => "المضيÙ",
"Username" => "إسم المستخدم",
"Password" => "كلمة السر",
"Share" => "شارك",
+"URL" => "عنوان الموقع",
"Saved" => "ØÙظ",
"Folder name" => "اسم المجلد",
"Options" => "خيارات",
diff --git a/apps/files_external/l10n/ast.php b/apps/files_external/l10n/ast.php
index add498191546d5628112ec34ac5f306bb1d3a252..faf0388dd91799c8ef82cab61f15be78c2c19410 100644
--- a/apps/files_external/l10n/ast.php
+++ b/apps/files_external/l10n/ast.php
@@ -2,16 +2,69 @@
$TRANSLATIONS = array(
"Local" => "Llocal",
"Location" => "Llocalización",
-"URL" => "URL",
+"Amazon S3" => "Amazon S3",
+"Key" => "Clave",
+"Secret" => "Secretu",
+"Bucket" => "Depósitu",
+"Amazon S3 and compliant" => "Amazon S3 y compatibilidá",
+"Access Key" => "Clave d'accesu",
+"Secret Key" => "Clave Secreta",
+"Hostname (optional)" => "Nome d'equipu (opcional)",
+"Port (optional)" => "Puertu (opcional)",
+"Region (optional)" => "Rexón (opcional)",
+"Enable SSL" => "Habilitar SSL",
+"Enable Path Style" => "Habilitar Estilu de ruta",
+"App key" => "App principal",
+"App secret" => "App secreta",
+"Host" => "Sirvidor",
"Username" => "Nome d'usuariu",
"Password" => "Contraseña",
+"Root" => "RaÃz",
+"Secure ftps://" => "Secure ftps://",
+"Client ID" => "ID de veceru",
+"Client secret" => "Veceru secretu",
+"OpenStack Object Storage" => "OpenStack Object Storage",
+"Username (required)" => "Nome d'usuariu (necesariu)",
+"Bucket (required)" => "Depósitu (necesariu)",
+"Region (optional for OpenStack Object Storage)" => "Rexón (opcional pa OpenStack Object Storage)",
+"API Key (required for Rackspace Cloud Files)" => "Clave API (necesaria pa Rackspace Cloud Files)",
+"Tenantname (required for OpenStack Object Storage)" => "Nome d'inquilÃn (necesariu pa OpenStack Object Storage)",
+"Password (required for OpenStack Object Storage)" => "Contraseña (necesaria pa OpenStack Object Storage)",
+"Service Name (required for OpenStack Object Storage)" => "Nome de Serviciu (necesariu pa OpenStack Object Storage)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)",
+"Timeout of HTTP requests in seconds (optional)" => "Tiempu d'espera de peticiones HTTP en segundos (opcional)",
"Share" => "Compartir",
+"SMB / CIFS using OC login" => "SMB / CIFS usando accesu OC",
+"Username as share" => "Nome d'usuariu como Compartición",
+"URL" => "URL",
+"Secure https://" => "Secure https://",
+"Remote subfolder" => "Subcarpeta remota",
+"Access granted" => "Accesu concedÃu",
+"Error configuring Dropbox storage" => "Fallu configurando l'almacenamientu de Dropbox",
+"Grant access" => "Conceder accesu",
+"Please provide a valid Dropbox app key and secret." => "Por favor, proporciona una clave válida de l'app Dropbox y una clave secreta.",
+"Error configuring Google Drive storage" => "Fallu configurando l'almacenamientu de Google Drive",
"Saved" => "Guardáu",
+"<b>Note:</b> " => "<b>Nota:</b> ",
+" and " => "y",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> El soporte de cURL en PHP nun ta activáu o instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> El soporte de FTP en PHP nun ta activáu o instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> \"%s\" nun ta instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale.",
+"External Storage" => "Almacenamientu esternu",
"Folder name" => "Nome de la carpeta",
+"External storage" => "Almacenamientu esternu",
"Configuration" => "Configuración",
"Options" => "Opciones",
+"Available for" => "Disponible pa",
+"Add storage" => "Amestar almacenamientu",
+"No user or group" => "Nengún usuariu o grupu",
+"All Users" => "Tolos usuarios",
"Groups" => "Grupos",
"Users" => "Usuarios",
-"Delete" => "Desaniciar"
+"Delete" => "Desaniciar",
+"Enable User External Storage" => "Habilitar almacenamientu esterno d'usuariu",
+"Allow users to mount the following external storage" => "Permitir a los usuarios montar el siguiente almacenamientu esternu",
+"SSL root certificates" => "Certificaos raÃz SSL",
+"Import Root Certificate" => "Importar certificáu raÃz"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/bg_BG.php b/apps/files_external/l10n/bg_BG.php
index 0969184383e1800c710e33437e258d2ac3327007..13e43314bda18ba584d5ad0d781f7f9a1f8df78c 100644
--- a/apps/files_external/l10n/bg_BG.php
+++ b/apps/files_external/l10n/bg_BG.php
@@ -1,10 +1,10 @@
<?php
$TRANSLATIONS = array(
"Location" => "ÐœÑÑто",
-"URL" => "Уеб адреÑ",
"Username" => "Потребител",
"Password" => "Парола",
"Share" => "СподелÑне",
+"URL" => "Уеб адреÑ",
"Access granted" => "ДоÑтъпът е даден",
"Grant access" => "Даване на доÑтъп",
"External Storage" => "Външно хранилище",
diff --git a/apps/files_external/l10n/bn_BD.php b/apps/files_external/l10n/bn_BD.php
index 3b1978a568c32cbea34ff25e363d73961b32db96..f1ada4b476d29753493f14347015915c371e277f 100644
--- a/apps/files_external/l10n/bn_BD.php
+++ b/apps/files_external/l10n/bn_BD.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "াবসà§à¦¥à¦¾à¦¨",
-"URL" => "URL",
+"Host" => "হোসà§à¦Ÿ",
"Username" => "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€",
"Password" => "কূটশবà§à¦¦",
"Share" => "à¦à¦¾à¦—াà¦à¦¾à¦—ি কর",
+"URL" => "URL",
"Access granted" => "অধিগমনের অনà§à¦®à¦¤à¦¿ পà§à¦°à¦¦à¦¾à¦¨ করা হলো",
"Error configuring Dropbox storage" => "Dropbox সংরকà§à¦·à¦£à¦¾à¦—ার নিরà§à¦§à¦¾à¦°à¦£ করতে সমসà§à¦¯à¦¾ ",
"Grant access" => "অধিগমনের অনà§à¦®à¦¤à¦¿ পà§à¦°à¦¦à¦¾à¦¨ কর",
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
index e49f26c353cdf745d123919cd5ed7165638ddf72..b478b721c5d47971f11bd5e8c375ba79ab95cb22 100644
--- a/apps/files_external/l10n/ca.php
+++ b/apps/files_external/l10n/ca.php
@@ -2,10 +2,23 @@
$TRANSLATIONS = array(
"Local" => "Local",
"Location" => "Ubicació",
-"URL" => "URL",
+"Amazon S3" => "Amazon S3",
+"Key" => "Clau",
+"Secret" => "Secret",
+"Access Key" => "Clau d'accés",
+"Secret Key" => "Clau secreta",
+"Enable SSL" => "Habilita SSL",
+"Host" => "Equip remot",
"Username" => "Nom d'usuari",
"Password" => "Contrasenya",
+"Secure ftps://" => "Protocol segur ftps://",
+"Client ID" => "Client ID",
+"Username (required)" => "Nom d'usuari (necessari)",
"Share" => "Comparteix",
+"Username as share" => "Nom d'usuari per compartir",
+"URL" => "URL",
+"Secure https://" => "Protocol segur https://",
+"Remote subfolder" => "Subcarpeta remota",
"Access granted" => "S'ha concedit l'accés",
"Error configuring Dropbox storage" => "Error en configurar l'emmagatzemament Dropbox",
"Grant access" => "Concedeix accés",
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index e953e19a9dd98f42540ed86f56fa33c248e0595c..2d1116ed0f66fbd3949049be2cc8545ddacd73fe 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -13,7 +13,7 @@ $TRANSLATIONS = array(
"Enable SSL" => "Povolit SSL",
"App key" => "KlÃÄ aplikace",
"App secret" => "Tajemstvà aplikace",
-"URL" => "URL",
+"Host" => "PoÄÃtaÄ",
"Username" => "Uživatelské jméno",
"Password" => "Heslo",
"Root" => "Root",
@@ -25,6 +25,7 @@ $TRANSLATIONS = array(
"Share" => "SdÃlet",
"SMB / CIFS using OC login" => "SMB / CIFS za použità OC loginu",
"Username as share" => "Uživatelské jméno jako sdÃlený adresář",
+"URL" => "URL",
"Secure https://" => "ZabezpeÄené https://",
"Remote subfolder" => "Vzdálený podadresář",
"Access granted" => "PÅ™Ãstup povolen",
diff --git a/apps/files_external/l10n/cy_GB.php b/apps/files_external/l10n/cy_GB.php
index 9b5d97a48a7c15be8b98891841d15b4732e4eb56..39822fcd3834062f638f928fdc49f50d07d0cea2 100644
--- a/apps/files_external/l10n/cy_GB.php
+++ b/apps/files_external/l10n/cy_GB.php
@@ -1,10 +1,10 @@
<?php
$TRANSLATIONS = array(
"Location" => "Lleoliad",
-"URL" => "URL",
"Username" => "Enw defnyddiwr",
"Password" => "Cyfrinair",
"Share" => "Rhannu",
+"URL" => "URL",
"Groups" => "Grwpiau",
"Users" => "Defnyddwyr",
"Delete" => "Dileu"
diff --git a/apps/files_external/l10n/da.php b/apps/files_external/l10n/da.php
index a0e8510789eb3b1eaffca3639e6b4f5c485175a3..2d235747ad9584d2a2ccfdc96dc7c0cbdd8ab77f 100644
--- a/apps/files_external/l10n/da.php
+++ b/apps/files_external/l10n/da.php
@@ -6,7 +6,7 @@ $TRANSLATIONS = array(
"Key" => "Nøgle",
"Secret" => "Hemmelighed",
"Secret Key" => "Hemmelig Nøgle ",
-"URL" => "URL",
+"Host" => "Host",
"Username" => "Brugernavn",
"Password" => "Kodeord",
"Root" => "Root",
@@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Client secret" => "Klient hemmelighed",
"OpenStack Object Storage" => "OpenStack Object Storage",
"Share" => "Del",
+"URL" => "URL",
"Secure https://" => "Sikker https://",
"Access granted" => "Adgang godkendt",
"Error configuring Dropbox storage" => "Fejl ved konfiguration af Dropbox plads",
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
index c41cef968f0700205bbec3022e37804e701671af..03f6f05abb98ab71cc78892fbee99179e2360d7e 100644
--- a/apps/files_external/l10n/de.php
+++ b/apps/files_external/l10n/de.php
@@ -16,7 +16,7 @@ $TRANSLATIONS = array(
"Enable Path Style" => "Pfad-Stil aktivieren",
"App key" => "App-Schlüssel",
"App secret" => "Geheime Zeichenkette der App",
-"URL" => "URL",
+"Host" => "Host",
"Username" => "Benutzername",
"Password" => "Passwort",
"Root" => "Root",
@@ -36,6 +36,7 @@ $TRANSLATIONS = array(
"Share" => "Teilen",
"SMB / CIFS using OC login" => "´",
"Username as share" => "Benutzername als Freigabe",
+"URL" => "URL",
"Secure https://" => "Sicherer HTTPS://",
"Remote subfolder" => "Remote-Unterordner:",
"Access granted" => "Zugriff gestattet",
diff --git a/apps/files_external/l10n/de_CH.php b/apps/files_external/l10n/de_CH.php
index 6d7366fe28443ff37f0aa2348f29639960455acc..4e0ac1f3a090795d2b16a69dd0a3e67b5f4666a6 100644
--- a/apps/files_external/l10n/de_CH.php
+++ b/apps/files_external/l10n/de_CH.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "Ort",
-"URL" => "URL",
+"Host" => "Host",
"Username" => "Benutzername",
"Password" => "Passwort",
"Share" => "Freigeben",
+"URL" => "URL",
"Access granted" => "Zugriff gestattet",
"Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
"Grant access" => "Zugriff gestatten",
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
index 1119a0f8755881d33c39debbfaab4d3a39479e9c..286250f86899a5bf47a48029e75ef1b4010a4077 100644
--- a/apps/files_external/l10n/de_DE.php
+++ b/apps/files_external/l10n/de_DE.php
@@ -16,7 +16,7 @@ $TRANSLATIONS = array(
"Enable Path Style" => "Pfad-Stil aktivieren",
"App key" => "App-Schlüssel",
"App secret" => "Geheime Zeichenkette der App",
-"URL" => "URL",
+"Host" => "Host",
"Username" => "Benutzername",
"Password" => "Passwort",
"Root" => "Root",
@@ -36,6 +36,7 @@ $TRANSLATIONS = array(
"Share" => "Teilen",
"SMB / CIFS using OC login" => "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)",
"Username as share" => "Benutzername als Freigabe",
+"URL" => "URL",
"Secure https://" => "Sicherer HTTPS://",
"Remote subfolder" => "Remote-Unterordner:",
"Access granted" => "Zugriff gestattet",
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index 351468a36dc975232e9d5b0eaae13835ba9ac008..18e6574dd28e84ebee25d8609f22e27766f06f64 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -2,23 +2,58 @@
$TRANSLATIONS = array(
"Local" => "Τοπικός",
"Location" => "Τοποθεσία",
-"URL" => "URL",
+"Amazon S3" => "Amazon S3",
+"Key" => "Κλειδί",
+"Secret" => "Μυστικό",
+"Bucket" => "Κάδος",
+"Access Key" => "Κλειδί Ï€Ïόσβασης",
+"Secret Key" => "Μυστικό κλειδί",
+"Hostname (optional)" => "Όνομα μηχανήματος (Ï€ÏοαιÏετικά)",
+"Port (optional)" => "Î ÏŒÏτα (Ï€ÏοαιÏετικά)",
+"Region (optional)" => "ΠεÏιοχή (Ï€ÏοαιÏετικά)",
+"Enable SSL" => "ΕνεÏγοποίηση SSL",
+"Enable Path Style" => "ΕνεÏγοποίηση μοÏφής διαδÏομής",
+"App key" => "Κλειδί εφαÏμογής",
+"App secret" => "Μυστικό εφαÏμογής",
+"Host" => "Διακομιστής",
"Username" => "Όνομα χÏήστη",
"Password" => "Κωδικός Ï€Ïόσβασης",
+"Root" => "Root",
+"Secure ftps://" => "Ασφαλής ftps://",
+"Client ID" => "ID πελάτη",
+"Client secret" => "Μυστικό πελάτη",
+"OpenStack Object Storage" => "Αποθήκη αντικειμÎνων OpenStack",
"Username (required)" => "Όνομα χÏήστη (απαιτείται)",
+"Bucket (required)" => "Κάδος (απαιτείται)",
+"Region (optional for OpenStack Object Storage)" => "ΠεÏιοχή (Ï€ÏοαιÏετικά για την αποθήκευση αντικειμÎνων OpenStack)",
+"API Key (required for Rackspace Cloud Files)" => "Κλειδί API (απαιτείται για αÏχεία Rackspace Cloud)",
+"Password (required for OpenStack Object Storage)" => "Μυστικός κωδικός (απαιτείται για την αποθήκευση αντικειμÎνων OpenStack)",
+"Service Name (required for OpenStack Object Storage)" => "Όνομα υπηÏεσίας (απαιτείται για την αποθήκευση αντικειμÎνων OpenStack)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "ΔιεÏθυνση URL της ταυτότητας Ï„ÎµÎ»Î¹ÎºÎ¿Ï ÏƒÎ·Î¼ÎµÎ¯Î¿Ï… (απαιτείται για την αποθήκευση αντικειμÎνων OpenStack)",
+"Timeout of HTTP requests in seconds (optional)" => "ΧÏονικό ÏŒÏιο των αιτήσεων HTTP σε δευτεÏόλεπτα (Ï€ÏοαιÏετικά)",
"Share" => "ΔιαμοιÏάστε",
+"SMB / CIFS using OC login" => "SMB / CIFS χÏησιμοποιώντας λογαÏιασμό OC",
+"Username as share" => "Όνομα χÏήστη ως διαμοιÏαζόμενος φάκελος",
+"URL" => "URL",
+"Secure https://" => "Ασφαλής σÏνδεση https://",
+"Remote subfolder" => "ΑπομακÏυσμÎνος υποφάκελος",
"Access granted" => "Î Ïοσβαση παÏασχÎθηκε",
"Error configuring Dropbox storage" => "Σφάλμα Ïυθμίζωντας αποθήκευση Dropbox ",
"Grant access" => "ΠαÏοχή Ï€Ïόσβασης",
"Please provide a valid Dropbox app key and secret." => "ΠαÏακαλοÏμε δώστε ÎγκυÏο κλειδί Dropbox και μυστικό.",
"Error configuring Google Drive storage" => "Σφάλμα Ïυθμίζωντας αποθήκευση Google Drive ",
"Saved" => "ΑποθηκεÏτηκαν",
+"<b>Note:</b> " => "<b>Σημείωση:</b> ",
" and " => "και",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Σημείωση:</b> Η υποστήÏιξη cURL στην PHP δεν είναι ενεÏγοποιημÎνη ή εγκατεστημÎνη. Η Ï€ÏοσάÏτηση του %s δεν είναι δυνατή. ΠαÏακαλώ ζητήστε από τον διαχειÏιστή συστημάτων σας να την εγκαταστήσει.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Σημείωση:</b> Η υποστήÏιξη FTP στην PHP δεν είναι ενεÏγοποιημÎνη ή εγκατεστημÎνη. Δεν είναι δυνατή η Ï€ÏοσάÏτηση του %s. ΠαÏακαλώ ζητήστε από τον διαχειÏιστή συστημάτων σας να την εγκαταστήσει.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Σημείωση:</b> Η επÎκταση \"%s\" δεν είναι εγκατεστημÎνη. Δεν είναι δυνατή η Ï€ÏοσάÏτηση %s. ΠαÏακαλώ ζητήστε από τον διαχειÏιστή συστημάτων σας να την εγκαταστήσει.",
"External Storage" => "ΕξωτεÏικό Αποθηκευτικό ÎœÎσο",
"Folder name" => "Όνομα φακÎλου",
"External storage" => "ΕξωτεÏική αποθήκευση",
"Configuration" => "Ρυθμίσεις",
"Options" => "ΕπιλογÎÏ‚",
+"Available for" => "ΔιαθÎσιμο για",
"Add storage" => "Î Ïοσθηκη αποθηκευσης",
"No user or group" => "Μη διαθÎσιμος χÏήστης ή ομάδα",
"All Users" => "Όλοι οι ΧÏήστες",
diff --git a/apps/files_external/l10n/en_GB.php b/apps/files_external/l10n/en_GB.php
index 5a0e2456ac09fb8bdaf493fb8854d251a7742180..d4229c607ef895008b6f3c0642df42e487867b16 100644
--- a/apps/files_external/l10n/en_GB.php
+++ b/apps/files_external/l10n/en_GB.php
@@ -16,7 +16,7 @@ $TRANSLATIONS = array(
"Enable Path Style" => "Enable Path Style",
"App key" => "App key",
"App secret" => "App secret",
-"URL" => "URL",
+"Host" => "Host",
"Username" => "Username",
"Password" => "Password",
"Root" => "Root",
@@ -36,6 +36,7 @@ $TRANSLATIONS = array(
"Share" => "Share",
"SMB / CIFS using OC login" => "SMB / CIFS using OC login",
"Username as share" => "Username as share",
+"URL" => "URL",
"Secure https://" => "Secure https://",
"Remote subfolder" => "Remote subfolder",
"Access granted" => "Access granted",
diff --git a/apps/files_external/l10n/eo.php b/apps/files_external/l10n/eo.php
index d8915b49b025b107a4265967f80c83009de10bca..3cded77cbdef41cee320b0623d65675451424f2a 100644
--- a/apps/files_external/l10n/eo.php
+++ b/apps/files_external/l10n/eo.php
@@ -1,24 +1,57 @@
<?php
$TRANSLATIONS = array(
+"Local" => "Loka",
"Location" => "Loko",
-"URL" => "URL",
+"Amazon S3" => "Amazon S3",
+"Key" => "Klavo",
+"Secret" => "Sekreto",
+"Access Key" => "Aliroklavo",
+"Secret Key" => "Sekretoklavo",
+"Hostname (optional)" => "Gastigonomo (malnepra)",
+"Port (optional)" => "Pordo (malnepra)",
+"Region (optional)" => "Regiono (malnepra)",
+"Enable SSL" => "Kapabligi SSL-on",
+"App key" => "Aplikaĵoklavo",
+"App secret" => "Aplikaĵosekreto",
+"Host" => "Gastigo",
"Username" => "Uzantonomo",
"Password" => "Pasvorto",
+"Root" => "Radiko",
+"Secure ftps://" => "Sekura ftps://",
+"Client ID" => "Klientidentigilo",
+"Client secret" => "Klientosekreto",
+"OpenStack Object Storage" => "OpenStack Object Storage",
+"Username (required)" => "Uzantonomo (nepra)",
+"Region (optional for OpenStack Object Storage)" => "Regiono (malnepra por OpenStack Object Storage)",
+"API Key (required for Rackspace Cloud Files)" => "API-klavo (nepra por Rackspace Cloud Files)",
+"Password (required for OpenStack Object Storage)" => "Pasvorto (nepra por OpenStack Object Storage)",
+"Service Name (required for OpenStack Object Storage)" => "Servonomo (nepra por OpenStack Object Storage)",
"Share" => "Kunhavigi",
+"URL" => "URL",
+"Secure https://" => "Sekura https://",
+"Remote subfolder" => "Malloka subdosierujo",
"Access granted" => "Alirpermeso donita",
"Error configuring Dropbox storage" => "Eraro dum agordado de la memorservo Dropbox",
"Grant access" => "Doni alirpermeson",
"Please provide a valid Dropbox app key and secret." => "Bonvolu provizi Ålosilon de la aplikaĵo Dropbox validan kaj sekretan.",
"Error configuring Google Drive storage" => "Eraro dum agordado de la memorservo Google Drive",
+"Saved" => "Konservita",
+"<b>Note:</b> " => "<b>Noto:</b>",
+" and " => "kaj",
"External Storage" => "Malena memorilo",
"Folder name" => "Dosierujnomo",
+"External storage" => "Malena memorilo",
"Configuration" => "Agordo",
"Options" => "Malneproj",
+"Available for" => "Disponebla por",
+"Add storage" => "Aldoni memorilon",
+"No user or group" => "Neniu uzanto aÅ grupo",
"All Users" => "Ĉiuj uzantoj",
"Groups" => "Grupoj",
"Users" => "Uzantoj",
"Delete" => "Forigi",
"Enable User External Storage" => "Kapabligi malenan memorilon de uzanto",
+"Allow users to mount the following external storage" => "Permesi uzantojn munti la jenajn malenajn memorilojn",
"SSL root certificates" => "Radikaj SSL-atestoj",
"Import Root Certificate" => "Enporti radikan ateston"
);
diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php
index 3c18b18057e8e7ee72beaa1816c39321c20543ee..bbbe0a8c6130e5925bb785678ded2f2064d0df22 100644
--- a/apps/files_external/l10n/es.php
+++ b/apps/files_external/l10n/es.php
@@ -16,7 +16,7 @@ $TRANSLATIONS = array(
"Enable Path Style" => "Habilitar Estilo de Ruta",
"App key" => "App principal",
"App secret" => "App secreta",
-"URL" => "URL",
+"Host" => "Servidor",
"Username" => "Nombre de usuario",
"Password" => "Contraseña",
"Root" => "RaÃz",
@@ -36,6 +36,7 @@ $TRANSLATIONS = array(
"Share" => "Compartir",
"SMB / CIFS using OC login" => "SMB / CIFS usando acceso OC",
"Username as share" => "Nombre de Usuario como compartir",
+"URL" => "URL",
"Secure https://" => "Secure https://",
"Remote subfolder" => "Subcarpeta remota",
"Access granted" => "Acceso concedido",
diff --git a/apps/files_external/l10n/es_AR.php b/apps/files_external/l10n/es_AR.php
index c380c6d0d91e93110e5bd0e2e0015f079ba8657e..dfb53d9a78485dba9add5506ec5ba4e7fad447a0 100644
--- a/apps/files_external/l10n/es_AR.php
+++ b/apps/files_external/l10n/es_AR.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "Ubicación",
-"URL" => "URL",
+"Host" => "Servidor",
"Username" => "Nombre de usuario",
"Password" => "Contraseña",
"Share" => "Compartir",
+"URL" => "URL",
"Access granted" => "Acceso permitido",
"Error configuring Dropbox storage" => "Error al configurar el almacenamiento de Dropbox",
"Grant access" => "Permitir acceso",
diff --git a/apps/files_external/l10n/es_MX.php b/apps/files_external/l10n/es_MX.php
index 73ce83591047769facf64411b4bebeb951c2ca0d..7e28798f58ad85ae7f2be8fafa35975aa86fcf07 100644
--- a/apps/files_external/l10n/es_MX.php
+++ b/apps/files_external/l10n/es_MX.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "Ubicación",
-"URL" => "URL",
+"Host" => "Servidor",
"Username" => "Nombre de usuario",
"Password" => "Contraseña",
"Share" => "Compartir",
+"URL" => "URL",
"Access granted" => "Acceso concedido",
"Error configuring Dropbox storage" => "Error configurando el almacenamiento de Dropbox",
"Grant access" => "Conceder acceso",
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
index e5fc7c6937e4f60aa993751f9041e4e357b2a2cd..850e2c0952bfd7a9b6a870720c3067091b756c96 100644
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@@ -2,10 +2,30 @@
$TRANSLATIONS = array(
"Local" => "Kohalik",
"Location" => "Asukoht",
-"URL" => "URL",
+"Amazon S3" => "Amazon S3",
+"Key" => "Võti",
+"Secret" => "Salasõna",
+"Bucket" => "Korv",
+"Access Key" => "Ligipääsu võti",
+"Secret Key" => "Salavõti",
+"Hostname (optional)" => "Hostinimi (valikuline)",
+"Port (optional)" => "Post (valikuline)",
+"Region (optional)" => "Regioon (valikuline)",
+"Enable SSL" => "SSL-i kasutamine",
+"App key" => "Rakenduse võti",
+"App secret" => "Rakenduse salasõna",
+"Host" => "Host",
"Username" => "Kasutajanimi",
"Password" => "Parool",
+"Secure ftps://" => "Turvaline ftps://",
+"Client ID" => "Kliendi ID",
+"Client secret" => "Kliendi salasõna",
+"Username (required)" => "Kasutajanimi (kohustuslik)",
+"Bucket (required)" => "Korv (kohustuslik)",
"Share" => "Jaga",
+"URL" => "URL",
+"Secure https://" => "Turvaline https://",
+"Remote subfolder" => "Mujahl olev alamkaust",
"Access granted" => "Ligipääs on antud",
"Error configuring Dropbox storage" => "Viga Dropboxi salvestusruumi seadistamisel",
"Grant access" => "Anna ligipääs",
diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php
index 5b28791786408dd8b993419b403a80f02bcf6ea9..ef29ba0484835ca9536f63b27d3af816badee6ef 100644
--- a/apps/files_external/l10n/eu.php
+++ b/apps/files_external/l10n/eu.php
@@ -1,26 +1,36 @@
<?php
$TRANSLATIONS = array(
+"Local" => "Bertakoa",
"Location" => "Kokapena",
-"URL" => "URL",
+"Amazon S3" => "Amazon S3",
+"Port (optional)" => "Portua (hautazkoa)",
+"Enable SSL" => "Gaitu SSL",
+"Host" => "Hostalaria",
"Username" => "Erabiltzaile izena",
"Password" => "Pasahitza",
"Share" => "Partekatu",
+"URL" => "URL",
"Access granted" => "Sarrera baimendua",
"Error configuring Dropbox storage" => "Errore bat egon da Dropbox biltegiratzea konfiguratzean",
"Grant access" => "Baimendu sarrera",
"Please provide a valid Dropbox app key and secret." => "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua",
"Error configuring Google Drive storage" => "Errore bat egon da Google Drive biltegiratzea konfiguratzean",
+"Saved" => "Gordeta",
+"<b>Note:</b> " => "<b>Oharra:</b>",
+" and " => "eta",
"External Storage" => "Kanpoko Biltegiratzea",
"Folder name" => "Karpetaren izena",
"External storage" => "Kanpoko biltegiratzea",
"Configuration" => "Konfigurazioa",
"Options" => "Aukerak",
"Add storage" => "Gehitu biltegiratzea",
+"No user or group" => "Talde edo erabiltzailerik ez",
"All Users" => "Erabiltzaile guztiak",
"Groups" => "Taldeak",
"Users" => "Erabiltzaileak",
"Delete" => "Ezabatu",
"Enable User External Storage" => "Gaitu erabiltzaileentzako Kanpo Biltegiratzea",
+"Allow users to mount the following external storage" => "Baimendu erabiltzaileak hurrengo kanpo biltegiratzeak muntatzen",
"SSL root certificates" => "SSL erro ziurtagiriak",
"Import Root Certificate" => "Inportatu Erro Ziurtagiria"
);
diff --git a/apps/files_external/l10n/fa.php b/apps/files_external/l10n/fa.php
index 6bf8ce8af58080b474ffd80006eb7ef5e65e4c93..674a72873323ec636dd04ee02683b831bfe7797b 100644
--- a/apps/files_external/l10n/fa.php
+++ b/apps/files_external/l10n/fa.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "Ù…ØÙ„",
-"URL" => "آدرس",
+"Host" => "میزبانی",
"Username" => "نام کاربری",
"Password" => "گذرواژه",
"Share" => "اشتراک‌گذاری",
+"URL" => "آدرس",
"Access granted" => "مجوز دسترسی صادر شد",
"Error configuring Dropbox storage" => "خطا به هنگام تنظیم Ùضای دراپ باکس",
"Grant access" => " مجوز اعطا دسترسی",
diff --git a/apps/files_external/l10n/fi_FI.php b/apps/files_external/l10n/fi_FI.php
index 9efc8e09cb712360a47cc871bc771ed60a5a2ea9..aa7fb394d4ed1c89c67c1395b88e589a3b23d5b5 100644
--- a/apps/files_external/l10n/fi_FI.php
+++ b/apps/files_external/l10n/fi_FI.php
@@ -6,11 +6,13 @@ $TRANSLATIONS = array(
"Port (optional)" => "Portti (valinnainen)",
"Region (optional)" => "Alue (valinnainen)",
"Enable SSL" => "Käytä SSL:ää",
-"URL" => "Verkko-osoite",
+"Host" => "Isäntä",
"Username" => "Käyttäjätunnus",
"Password" => "Salasana",
"Username (required)" => "Käyttäjätunnus (vaaditaan)",
"Share" => "Jaa",
+"URL" => "Verkko-osoite",
+"Secure https://" => "Salattu https://",
"Access granted" => "Pääsy sallittu",
"Error configuring Dropbox storage" => "Virhe Dropbox levyn asetuksia tehtäessä",
"Grant access" => "Salli pääsy",
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
index c03a2f49e0a9739805a6d1cc1e4d43cdb00ca418..ea20abc5256939ae6501f2913bad394e593e2ccb 100644
--- a/apps/files_external/l10n/fr.php
+++ b/apps/files_external/l10n/fr.php
@@ -4,11 +4,34 @@ $TRANSLATIONS = array(
"Location" => "Emplacement",
"Amazon S3" => "Amazon S3",
"Key" => "Clé",
+"Secret" => "Secret",
+"Amazon S3 and compliant" => "Compatible avec Amazon S3",
"Access Key" => "Clé d'accès",
-"URL" => "URL",
+"Secret Key" => "Clé secrète",
+"Hostname (optional)" => "Nom machine (optionnel)",
+"Port (optional)" => "Port (optionnel)",
+"Region (optional)" => "Région (facultatif)",
+"Enable SSL" => "Activer SSL",
+"Enable Path Style" => "Activer le style de chemin",
+"App key" => "Clé App",
+"Host" => "Hôte",
"Username" => "Nom d'utilisateur",
"Password" => "Mot de passe",
+"Root" => "Root",
+"Secure ftps://" => "Sécuriser via ftps://",
+"Client ID" => "ID Client",
+"Username (required)" => "Nom d'utilisation (requis)",
+"API Key (required for Rackspace Cloud Files)" => "Clé API (requis pour Rackspace Cloud Files)",
+"Tenantname (required for OpenStack Object Storage)" => "Nom du locataire (requis pour le stockage OpenStack)",
+"Password (required for OpenStack Object Storage)" => "Mot de passe (requis pour OpenStack Object Storage)",
+"Service Name (required for OpenStack Object Storage)" => "Nom du service (requit pour le stockage OpenStack)",
+"Timeout of HTTP requests in seconds (optional)" => "Temps maximal de requête HTTP en seconde (facultatif)",
"Share" => "Partager",
+"SMB / CIFS using OC login" => "SMB / CIFS utilise le nom d'utilisateur OC",
+"Username as share" => "Nom d'utilisateur du partage",
+"URL" => "URL",
+"Secure https://" => "Sécurisation https://",
+"Remote subfolder" => "Sous-dossier distant",
"Access granted" => "Accès autorisé",
"Error configuring Dropbox storage" => "Erreur lors de la configuration du support de stockage Dropbox",
"Grant access" => "Autoriser l'accès",
diff --git a/apps/files_external/l10n/gl.php b/apps/files_external/l10n/gl.php
index ccbdcce7f3482b30b9dae20cac532aeaa616e11d..248afb5f6a7a8723629ecfe1bee5929160be25ff 100644
--- a/apps/files_external/l10n/gl.php
+++ b/apps/files_external/l10n/gl.php
@@ -16,7 +16,7 @@ $TRANSLATIONS = array(
"Enable Path Style" => "Activar o estilo de ruta",
"App key" => "Clave da API",
"App secret" => "Secreto do aplicativo",
-"URL" => "URL",
+"Host" => "Servidor",
"Username" => "Nome de usuario",
"Password" => "Contrasinal",
"Root" => "Root (raÃz)",
@@ -36,6 +36,7 @@ $TRANSLATIONS = array(
"Share" => "Compartir",
"SMB / CIFS using OC login" => "SMB / CIFS usando acceso OC",
"Username as share" => "Nome de usuario como compartición",
+"URL" => "URL",
"Secure https://" => "https:// seguro",
"Remote subfolder" => "Subcartafol remoto",
"Access granted" => "Concedeuse acceso",
diff --git a/apps/files_external/l10n/he.php b/apps/files_external/l10n/he.php
index 67cbb0cba2a80df3e03f173c920591381a253f99..f55a35fcadecf2857692f7d5a986073efc6be56f 100644
--- a/apps/files_external/l10n/he.php
+++ b/apps/files_external/l10n/he.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "מיקו×",
-"URL" => "כתובת",
+"Host" => "מ×רח",
"Username" => "×©× ×ž×©×ª×ž×©",
"Password" => "סיסמ×",
"Share" => "שיתוף",
+"URL" => "כתובת",
"Access granted" => "×”×•×¢× ×§×” גישה",
"Error configuring Dropbox storage" => "×ירעה שגי××” בעת הגדרת ×חסון ב־Dropbox",
"Grant access" => "×”×¢× ×§×ª גישה",
diff --git a/apps/files_external/l10n/hu_HU.php b/apps/files_external/l10n/hu_HU.php
index 831bd69c231b2c3ae20d8f29f9e3132f217e55a2..d9c570d68c9354847b221a608eb1a1742e330c9a 100644
--- a/apps/files_external/l10n/hu_HU.php
+++ b/apps/files_external/l10n/hu_HU.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "Hely",
-"URL" => "URL",
+"Host" => "Kiszolgáló",
"Username" => "Felhasználónév",
"Password" => "Jelszó",
"Share" => "Megosztás",
+"URL" => "URL",
"Access granted" => "Érvényes hozzáférés",
"Error configuring Dropbox storage" => "A Dropbox tárolót nem sikerült beállÃtani",
"Grant access" => "Megadom a hozzáférést",
diff --git a/apps/files_external/l10n/ia.php b/apps/files_external/l10n/ia.php
index 844af213d8bf19bf23c499b86b6ede10f2e73bd7..978003e20cb1aa98ebd1f2c2dbf3d08e84439fed 100644
--- a/apps/files_external/l10n/ia.php
+++ b/apps/files_external/l10n/ia.php
@@ -1,10 +1,10 @@
<?php
$TRANSLATIONS = array(
"Location" => "Loco",
-"URL" => "URL",
"Username" => "Nomine de usator",
"Password" => "Contrasigno",
"Share" => "Compartir",
+"URL" => "URL",
"Folder name" => "Nomine de dossier",
"Groups" => "Gruppos",
"Users" => "Usatores",
diff --git a/apps/files_external/l10n/id.php b/apps/files_external/l10n/id.php
index 4d33e6b450c1e1e1d65bf23d9f60a63c81fc7d49..a21ea7aef7b84ffb6b72477e8df46be22c031d61 100644
--- a/apps/files_external/l10n/id.php
+++ b/apps/files_external/l10n/id.php
@@ -1,26 +1,44 @@
<?php
$TRANSLATIONS = array(
+"Local" => "Lokal",
"Location" => "lokasi",
-"URL" => "tautan",
+"Amazon S3" => "Amazon S3",
+"Hostname (optional)" => "Hostname (tambahan)",
+"Port (optional)" => "Port (tambahan)",
+"Region (optional)" => "Wilayah (tambahan)",
+"Enable SSL" => "Aktifkan SSL",
+"Host" => "Host",
"Username" => "Nama Pengguna",
"Password" => "Sandi",
+"Root" => "Root",
+"Username (required)" => "Nama pengguna (dibutuhkan)",
"Share" => "Bagikan",
+"URL" => "tautan",
"Access granted" => "Akses diberikan",
"Error configuring Dropbox storage" => "Kesalahan dalam mengonfigurasi penyimpanan Dropbox",
"Grant access" => "Berikan hak akses",
"Please provide a valid Dropbox app key and secret." => "Masukkan kunci dan sandi aplikasi Dropbox yang benar.",
"Error configuring Google Drive storage" => "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive",
+"Saved" => "Disimpan",
+"<b>Note:</b> " => "<b>Catatan:</b> ",
+" and " => "dan",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.",
"External Storage" => "Penyimpanan Eksternal",
"Folder name" => "Nama folder",
"External storage" => "Penyimpanan eksternal",
"Configuration" => "Konfigurasi",
"Options" => "Opsi",
+"Available for" => "Tersedia untuk",
"Add storage" => "Tambahkan penyimpanan",
+"No user or group" => "Tidak ada pengguna dan grup",
"All Users" => "Semua Pengguna",
"Groups" => "Grup",
"Users" => "Pengguna",
"Delete" => "Hapus",
"Enable User External Storage" => "Aktifkan Penyimpanan Eksternal Pengguna",
+"Allow users to mount the following external storage" => "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut",
"SSL root certificates" => "Sertifikat root SSL",
"Import Root Certificate" => "Impor Sertifikat Root"
);
diff --git a/apps/files_external/l10n/is.php b/apps/files_external/l10n/is.php
index 39b750189dcfb84a916f64bf11245ff3f204ca02..daf9c4cb4417742e0af73cf1ef8effc5afa42ecd 100644
--- a/apps/files_external/l10n/is.php
+++ b/apps/files_external/l10n/is.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "Staðsetning",
-"URL" => "URL",
+"Host" => "Netþjónn",
"Username" => "Notendanafn",
"Password" => "Lykilorð",
"Share" => "Deila",
+"URL" => "URL",
"Access granted" => "Aðgengi veitt",
"Error configuring Dropbox storage" => "Villa við að setja upp Dropbox gagnasvæði",
"Grant access" => "Veita aðgengi",
diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php
index bc5b9d6dcee0392012a0fa270e9a9174a708c890..c6428a27ba196821b915cd239792805424521213 100644
--- a/apps/files_external/l10n/it.php
+++ b/apps/files_external/l10n/it.php
@@ -16,7 +16,7 @@ $TRANSLATIONS = array(
"Enable Path Style" => "Abilita stile percorsi",
"App key" => "Chiave applicazione",
"App secret" => "Segreto applicazione",
-"URL" => "URL",
+"Host" => "Host",
"Username" => "Nome utente",
"Password" => "Password",
"Root" => "Radice",
@@ -36,6 +36,7 @@ $TRANSLATIONS = array(
"Share" => "Condividi",
"SMB / CIFS using OC login" => "SMB / CIFS utilizzando le credenziali di OC",
"Username as share" => "Nome utente come condivisione",
+"URL" => "URL",
"Secure https://" => "Sicuro https://",
"Remote subfolder" => "Sottocartella remota",
"Access granted" => "Accesso consentito",
diff --git a/apps/files_external/l10n/ja.php b/apps/files_external/l10n/ja.php
index 4ac746caa00c5e8af5b67f6e4ce59b39335d9241..b70dd2a09a45678ad49260caeab20ab87fa79a2e 100644
--- a/apps/files_external/l10n/ja.php
+++ b/apps/files_external/l10n/ja.php
@@ -2,21 +2,60 @@
$TRANSLATIONS = array(
"Local" => "ãƒãƒ¼ã‚«ãƒ«",
"Location" => "ä½ç½®",
-"URL" => "URL",
+"Amazon S3" => "Amazon S3",
+"Key" => "ã‚ー",
+"Secret" => "シークレットã‚ー",
+"Bucket" => "ãƒã‚±ãƒƒãƒˆå",
+"Amazon S3 and compliant" => "Amazon S3 ã¨äº’æ›ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸",
+"Access Key" => "アクセスã‚ー",
+"Secret Key" => "シークレットã‚ー",
+"Hostname (optional)" => "ホストå (オプション)",
+"Port (optional)" => "ãƒãƒ¼ãƒˆ (オプション)",
+"Region (optional)" => "リージョン (オプション)",
+"Enable SSL" => "SSLを有効",
+"Enable Path Style" => "パス形å¼ã‚’有効",
+"App key" => "アプリã‚ー",
+"App secret" => "アプリシークレット",
+"Host" => "ホスト",
"Username" => "ユーザーå",
"Password" => "パスワード",
+"Root" => "ルート",
+"Secure ftps://" => "Secure ftps://",
+"Client ID" => "クライアントID",
+"Client secret" => "クライアント秘密ã‚ー",
+"OpenStack Object Storage" => "OpenStack Object Storage",
+"Username (required)" => "ユーザーå (å¿…é ˆ)",
+"Bucket (required)" => "ãƒã‚±ãƒƒãƒˆ (å¿…é ˆ)",
+"Region (optional for OpenStack Object Storage)" => "リージョン (OpenStack Object Storage用ã®ã‚ªãƒ—ション)",
+"API Key (required for Rackspace Cloud Files)" => "APIã‚ー (Rackspace Cloud Filesã«å¿…é ˆ)",
+"Tenantname (required for OpenStack Object Storage)" => "テナントå (OpenStack Object Storage用ã«å¿…è¦)",
+"Password (required for OpenStack Object Storage)" => "パスワード (OpenStack Object Storage用ã«å¿…è¦)",
+"Service Name (required for OpenStack Object Storage)" => "サービスå (OpenStack Object Storage用ã«å¿…è¦)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "è˜åˆ¥ç”¨ã‚¨ãƒ³ãƒ‰ãƒã‚¤ãƒ³ãƒˆURL (OpenStack Object Storage用ã«å¿…è¦)",
+"Timeout of HTTP requests in seconds (optional)" => "HTTPリクエストã®ã‚¿ã‚¤ãƒ アウト秒数 (オプション)",
"Share" => "共有",
+"SMB / CIFS using OC login" => "owncloudãƒã‚°ã‚¤ãƒ³ã§ SMB/CIFSを使用",
+"Username as share" => "共有å",
+"URL" => "URL",
+"Secure https://" => "ã‚»ã‚ュア https://",
+"Remote subfolder" => "リモートサブフォルダ",
"Access granted" => "アクセスã¯è¨±å¯ã•ã‚Œã¾ã—ãŸ",
"Error configuring Dropbox storage" => "Dropboxストレージã®è¨å®šã‚¨ãƒ©ãƒ¼",
"Grant access" => "アクセスを許å¯",
"Please provide a valid Dropbox app key and secret." => "有効ãªDropboxアプリã®ã‚ーã¨ãƒ‘スワードを入力ã—ã¦ãã ã•ã„。",
"Error configuring Google Drive storage" => "Googleドライブストレージã®è¨å®šã‚¨ãƒ©ãƒ¼",
"Saved" => "ä¿å˜ã•ã‚Œã¾ã—ãŸ",
+"<b>Note:</b> " => "<b>注æ„:</b> ",
+" and " => "ã¨",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>注æ„:</b> PHPã«cURLã®ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ãŒå…¥ã£ã¦ã„ãªã„ã‹ã€æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。%s をマウントã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã®ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ãã ã•ã„。",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>注æ„:</b> PHPã«FTPã®ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ãŒå…¥ã£ã¦ã„ãªã„ã‹ã€æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。%s をマウントã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã®ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ãã ã•ã„。",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>注æ„:</b> \"%s\" ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“。%sをマウントã§ãã¾ã›ã‚“。ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã®ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ãã ã•ã„。",
"External Storage" => "外部ストレージ",
"Folder name" => "フォルダーå",
"External storage" => "外部ストレージ",
"Configuration" => "è¨å®š",
"Options" => "オプション",
+"Available for" => "以下ãŒåˆ©ç”¨å¯èƒ½",
"Add storage" => "ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã‚’è¿½åŠ ",
"No user or group" => "ユーザーもã—ãã¯ã‚°ãƒ«ãƒ¼ãƒ—ãŒã‚ã‚Šã¾ã›ã‚“",
"All Users" => "ã™ã¹ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼",
diff --git a/apps/files_external/l10n/ka_GE.php b/apps/files_external/l10n/ka_GE.php
index f7eb01ba94a81e8f2c52606d255dd169512bdbda..a87c8b4879ad9a8d07b3646bbb84e37ca2905d9c 100644
--- a/apps/files_external/l10n/ka_GE.php
+++ b/apps/files_external/l10n/ka_GE.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "áƒáƒ“გილმდებáƒáƒ ეáƒáƒ‘áƒ",
-"URL" => "URL",
+"Host" => "ჰáƒáƒ¡áƒ¢áƒ˜",
"Username" => "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის სáƒáƒ®áƒ”ლი",
"Password" => "პáƒáƒ áƒáƒšáƒ˜",
"Share" => "გáƒáƒ–იáƒáƒ ებáƒ",
+"URL" => "URL",
"Access granted" => "დáƒáƒ¨áƒ•áƒ”ბრმინიáƒáƒ”ბულიáƒ",
"Error configuring Dropbox storage" => "შეცდáƒáƒ›áƒ Dropbox სáƒáƒªáƒáƒ•áƒ˜áƒ¡ კáƒáƒœáƒ¤áƒ˜áƒ’ურირების დრáƒáƒ¡",
"Grant access" => "დáƒáƒ¨áƒ•áƒ”ბის მინიáƒáƒ”ბáƒ",
diff --git a/apps/files_external/l10n/km.php b/apps/files_external/l10n/km.php
index aac6337024573a2b8ae0fbf7b13564419ea52406..da17fac1bffdf4dd55a303920ceb3ea7a3226688 100644
--- a/apps/files_external/l10n/km.php
+++ b/apps/files_external/l10n/km.php
@@ -1,12 +1,22 @@
<?php
$TRANSLATIONS = array(
"Location" => "ទីážáž¶áŸ†áž„",
-"URL" => "URL",
+"Host" => "ម៉ាស៊ីន​ផ្ទុក",
"Username" => "ឈ្មោះ​អ្នកប្រើ",
"Password" => "ពាក្យសម្ងាážáŸ‹",
"Share" => "ចែក​រំលែក",
+"URL" => "URL",
+"Access granted" => "បាន​ទទួល​សិទ្ធិ​ចូល",
+"Error configuring Dropbox storage" => "កំហុស​ការ​កំណážáŸ‹â€‹ážŸážŽáŸ’ឋាន​នៃ​ឃ្លាំងផ្ទុក Dropbox",
+"Grant access" => "ទទួល​សិទ្ធិ​ចូល",
+"Saved" => "បាន​រក្សាទុក",
+"External Storage" => "ឃ្លាំងផ្ទុក​ážáž¶áž„ក្រៅ",
"Folder name" => "ឈ្មោះ​ážáž",
+"External storage" => "ឃ្លាំងផ្ទុក​ážáž¶áž„ក្រៅ",
+"Configuration" => "ការ​កំណážáŸ‹â€‹ážŸážŽáŸ’ឋាន",
"Options" => "ជម្រើស",
+"Add storage" => "បន្ážáŸ‚ម​ឃ្លាំងផ្ទុក",
+"All Users" => "អ្នក​ប្រើ​ទាំងអស់",
"Groups" => "ក្រុ",
"Users" => "អ្នកប្រើ",
"Delete" => "លុប"
diff --git a/apps/files_external/l10n/ko.php b/apps/files_external/l10n/ko.php
index 6ae8ffdeb8fb26be9096b9ce9b5d70ce983a9003..631f95bc7b956cbfb4ae1687e71b572f1606f64c 100644
--- a/apps/files_external/l10n/ko.php
+++ b/apps/files_external/l10n/ko.php
@@ -2,10 +2,11 @@
$TRANSLATIONS = array(
"Location" => "장소",
"Amazon S3" => "Amazon S3",
-"URL" => "URL",
+"Host" => "호스트",
"Username" => "ì‚¬ìš©ìž ì´ë¦„",
"Password" => "암호",
"Share" => "ê³µìœ ",
+"URL" => "URL",
"Access granted" => "ì ‘ê·¼ 허가ë¨",
"Error configuring Dropbox storage" => "Dropbox ì €ìž¥ì†Œ ì„¤ì • 오류",
"Grant access" => "ì ‘ê·¼ 권한 부여",
diff --git a/apps/files_external/l10n/ku_IQ.php b/apps/files_external/l10n/ku_IQ.php
index 72cc813352e354cf76003741d2e39c5de3e789f5..3d5a3dd0d3263a0311f67c3d58b7f78819bb8507 100644
--- a/apps/files_external/l10n/ku_IQ.php
+++ b/apps/files_external/l10n/ku_IQ.php
@@ -1,10 +1,10 @@
<?php
$TRANSLATIONS = array(
"Location" => "شوێن",
-"URL" => "ناونیشانی به‌سته‌ر",
"Username" => "ناوی به‌کارهێنه‌ر",
"Password" => "وشەی تێپەربو",
"Share" => "هاوبەشی کردن",
+"URL" => "ناونیشانی به‌سته‌ر",
"Folder name" => "ناوی بوخچه",
"Users" => "به‌كارهێنه‌ر"
);
diff --git a/apps/files_external/l10n/lb.php b/apps/files_external/l10n/lb.php
index 49517e7af3ddf47d03f200c177c138e70ed04ee5..233b3f810511e3cdffcd340abab0c78011bffd57 100644
--- a/apps/files_external/l10n/lb.php
+++ b/apps/files_external/l10n/lb.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "Uert",
-"URL" => "URL",
+"Host" => "Host",
"Username" => "Benotzernumm",
"Password" => "Passwuert",
"Share" => "Deelen",
+"URL" => "URL",
"Folder name" => "Dossiers Numm:",
"Groups" => "Gruppen",
"Users" => "Benotzer",
diff --git a/apps/files_external/l10n/lt_LT.php b/apps/files_external/l10n/lt_LT.php
index 736becc58d5ab34854101c4bb7cb1f0e8d1bc20f..908abcc74885a5b9acda50200df029406009d3ca 100644
--- a/apps/files_external/l10n/lt_LT.php
+++ b/apps/files_external/l10n/lt_LT.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "Vieta",
-"URL" => "URL",
+"Host" => "Mazgas",
"Username" => "Prisijungimo vardas",
"Password" => "Slaptažodis",
"Share" => "Dalintis",
+"URL" => "URL",
"Access granted" => "PriÄ—jimas suteiktas",
"Error configuring Dropbox storage" => "Klaida nustatinÄ—jant Dropbox talpyklÄ…",
"Grant access" => "Suteikti priÄ—jimÄ…",
diff --git a/apps/files_external/l10n/lv.php b/apps/files_external/l10n/lv.php
index 3506e55323a8622bb79113f68dbc8723dcf37ef8..5234bda7dce11d56a4f9d82674e0064c43531a2f 100644
--- a/apps/files_external/l10n/lv.php
+++ b/apps/files_external/l10n/lv.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "Vieta",
-"URL" => "URL",
+"Host" => "Resursdators",
"Username" => "LietotÄjvÄrds",
"Password" => "Parole",
"Share" => "Dalīties",
+"URL" => "URL",
"Access granted" => "Piešķirta pieeja",
"Error configuring Dropbox storage" => "Kļūda, konfigurÄ“jot Dropbox krÄtuvi",
"Grant access" => "Piešķirt pieeju",
diff --git a/apps/files_external/l10n/mk.php b/apps/files_external/l10n/mk.php
index 0a72b65168acb72fd843512f1bda5f585b59db78..e1bf57d5b93f48711984d569c2b8447cc759dcdb 100644
--- a/apps/files_external/l10n/mk.php
+++ b/apps/files_external/l10n/mk.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "Локација",
-"URL" => "ÐдреÑа",
+"Host" => "Домаќин",
"Username" => "КориÑничко име",
"Password" => "Лозинка",
"Share" => "Сподели",
+"URL" => "ÐдреÑа",
"Access granted" => "ПриÑтапот е дозволен",
"Error configuring Dropbox storage" => "Грешка при конфигурација на Dropbox",
"Grant access" => "Дозволи приÑтап",
diff --git a/apps/files_external/l10n/ms_MY.php b/apps/files_external/l10n/ms_MY.php
index 789527e4a49171fba04dc0461c99b586d8a5ca46..e19ec499780ded8746877df7172bc0bdf7d5013b 100644
--- a/apps/files_external/l10n/ms_MY.php
+++ b/apps/files_external/l10n/ms_MY.php
@@ -1,10 +1,10 @@
<?php
$TRANSLATIONS = array(
"Location" => "Lokasi",
-"URL" => "URL",
"Username" => "Nama pengguna",
"Password" => "Kata laluan",
"Share" => "Kongsi",
+"URL" => "URL",
"Groups" => "Kumpulan",
"Users" => "Pengguna",
"Delete" => "Padam"
diff --git a/apps/files_external/l10n/nb_NO.php b/apps/files_external/l10n/nb_NO.php
index f1f0a09fd533143f34a2d7107a98f471a9d18d85..8302be047a8be9185aa7055c3368a3d6379dea46 100644
--- a/apps/files_external/l10n/nb_NO.php
+++ b/apps/files_external/l10n/nb_NO.php
@@ -3,10 +3,42 @@ $TRANSLATIONS = array(
"Local" => "Lokal",
"Location" => "Sted",
"Amazon S3" => "Amazon S3",
-"URL" => "URL",
+"Key" => "Key",
+"Secret" => "Secret",
+"Bucket" => "Bucket",
+"Amazon S3 and compliant" => "Amazon S3 og tilsvarende",
+"Access Key" => "Access Key",
+"Secret Key" => "Secret Key",
+"Hostname (optional)" => "Servernavn (ikke påkrevd)",
+"Port (optional)" => "Port (ikke påkrevd)",
+"Region (optional)" => "Region (ikke påkrevd)",
+"Enable SSL" => "Aktiver SSL",
+"Enable Path Style" => "Aktiver Path Style",
+"App key" => "App key",
+"App secret" => "App secret",
+"Host" => "Tjener",
"Username" => "Brukernavn",
"Password" => "Passord",
+"Root" => "Rot",
+"Secure ftps://" => "Sikker ftps://",
+"Client ID" => "Client ID",
+"Client secret" => "Client secret",
+"OpenStack Object Storage" => "OpenStack Object Storage",
+"Username (required)" => "Brukernavn (påkrevet)",
+"Bucket (required)" => "Bucket (påkrevet)",
+"Region (optional for OpenStack Object Storage)" => "Region (ikke påkrevet for OpenStack Object Storage)",
+"API Key (required for Rackspace Cloud Files)" => "API Key (påkrevet for Rackspace Cloud Files)",
+"Tenantname (required for OpenStack Object Storage)" => "Tenantname (påkrevet for OpenStack Object Storage)",
+"Password (required for OpenStack Object Storage)" => "Passord (påkrevet for OpenStack Object Storage)",
+"Service Name (required for OpenStack Object Storage)" => "Tjenestenavn (påkrevet for OpenStack Object Storage)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "URL for identity endpoint (påkrevet for OpenStack Object Storage)",
+"Timeout of HTTP requests in seconds (optional)" => "Tidsavbrudd for HTTP-spørringer i sekunder (ikke påkrevet)",
"Share" => "Del",
+"SMB / CIFS using OC login" => "SMB / CIFS med OC-pålogging",
+"Username as share" => "Brukernavn som share",
+"URL" => "URL",
+"Secure https://" => "Sikker https://",
+"Remote subfolder" => "Ekstern undermappe",
"Access granted" => "Tilgang innvilget",
"Error configuring Dropbox storage" => "Feil ved konfigurering av Dropbox-lagring",
"Grant access" => "Gi tilgang",
@@ -17,6 +49,7 @@ $TRANSLATIONS = array(
" and " => "og",
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Montering av %s er ikke mulig. Be systemadministratoren om å installere det.",
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Merk:</b> FTP støtte i PHP er ikke slått på eller innstallert. Kan ikke montere %s. Ta kontakt med din systemadministrator for å installere det.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>NB:</b> \"%s\" er ikke installert. Montering av %s er ikke mulig. Spør systemadministratoren om å installere det.",
"External Storage" => "Ekstern lagring",
"Folder name" => "Mappenavn",
"External storage" => "Ekstern lagringsplass",
diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php
index 2e88c1874048fc9b4a845b7f4cb97c0bb9eba8ce..2bdc047e96d8c936a16fa9654c7996d84e47a67a 100644
--- a/apps/files_external/l10n/nl.php
+++ b/apps/files_external/l10n/nl.php
@@ -16,7 +16,7 @@ $TRANSLATIONS = array(
"Enable Path Style" => "Activeren pad stijl",
"App key" => "App key",
"App secret" => "App secret",
-"URL" => "URL",
+"Host" => "Host",
"Username" => "Gebruikersnaam",
"Password" => "Wachtwoord",
"Root" => "Root",
@@ -36,6 +36,7 @@ $TRANSLATIONS = array(
"Share" => "Share",
"SMB / CIFS using OC login" => "SMB / CIFS via OC inlog",
"Username as share" => "Gebruikersnaam als share",
+"URL" => "URL",
"Secure https://" => "Secure https://",
"Remote subfolder" => "Externe submap",
"Access granted" => "Toegang toegestaan",
diff --git a/apps/files_external/l10n/nn_NO.php b/apps/files_external/l10n/nn_NO.php
index 542d3ec0421aefcf60a30bfe884b4d6384464d47..0ee80369eec4417ae7ffd3ab791c5f280a667f52 100644
--- a/apps/files_external/l10n/nn_NO.php
+++ b/apps/files_external/l10n/nn_NO.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "Stad",
-"URL" => "Nettstad",
+"Host" => "Tenar",
"Username" => "Brukarnamn",
"Password" => "Passord",
"Share" => "Del",
+"URL" => "Nettstad",
"Folder name" => "Mappenamn",
"Configuration" => "Innstillingar",
"Groups" => "Grupper",
diff --git a/apps/files_external/l10n/oc.php b/apps/files_external/l10n/oc.php
index e854c9f25ae5b48927b1d783c8d252e6a46def3a..bd5c98ca0513858026a9705d16abab385707654c 100644
--- a/apps/files_external/l10n/oc.php
+++ b/apps/files_external/l10n/oc.php
@@ -1,10 +1,10 @@
<?php
$TRANSLATIONS = array(
"Location" => "Plaça",
-"URL" => "URL",
"Username" => "Non d'usancièr",
"Password" => "Senhal",
"Share" => "Parteja",
+"URL" => "URL",
"Groups" => "Grops",
"Users" => "Usancièrs",
"Delete" => "Escafa"
diff --git a/apps/files_external/l10n/pl.php b/apps/files_external/l10n/pl.php
index 9c13371b166ff7f1ae78be91b0204ef64ace6e79..74d9347b606717aa837a1e0ad936f9113fb42c07 100644
--- a/apps/files_external/l10n/pl.php
+++ b/apps/files_external/l10n/pl.php
@@ -16,7 +16,7 @@ $TRANSLATIONS = array(
"Enable Path Style" => "Włącz styl ścieżki",
"App key" => "Klucz aplikacji",
"App secret" => "Hasło aplikacji",
-"URL" => "URL",
+"Host" => "Host",
"Username" => "Nazwa użytkownika",
"Password" => "Hasło",
"Root" => "Root",
@@ -36,6 +36,7 @@ $TRANSLATIONS = array(
"Share" => "Udostępnij",
"SMB / CIFS using OC login" => "SMB / CIFS przy użyciu loginu OC",
"Username as share" => "Użytkownik jako zasób",
+"URL" => "URL",
"Secure https://" => "Bezpieczny https://",
"Remote subfolder" => "Zdalny podfolder",
"Access granted" => "Dostęp do",
diff --git a/apps/files_external/l10n/pt_BR.php b/apps/files_external/l10n/pt_BR.php
index d9544ae159775828555e192fc5af83172cc6f147..b027a92e50e3e170b122d566e0918f04a91eb21c 100644
--- a/apps/files_external/l10n/pt_BR.php
+++ b/apps/files_external/l10n/pt_BR.php
@@ -16,7 +16,7 @@ $TRANSLATIONS = array(
"Enable Path Style" => "Habilitar Estilo do Caminho",
"App key" => "Chave do Aplicativo",
"App secret" => "Segredo da Aplicação",
-"URL" => "URL",
+"Host" => "Servidor",
"Username" => "Nome de Usuário",
"Password" => "Senha",
"Root" => "Raiz",
@@ -36,6 +36,7 @@ $TRANSLATIONS = array(
"Share" => "Compartilhar",
"SMB / CIFS using OC login" => "SMB / CIFS usando OC logon",
"Username as share" => "Nome de usuário como compartilhado",
+"URL" => "URL",
"Secure https://" => "https:// segura",
"Remote subfolder" => "Subpasta remota",
"Access granted" => "Acesso concedido",
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
index 767ddeec8a661420385227b9f3ba933a3c7d7d3b..27919976deed4fc4d3c56e3e13a209ce7066f1df 100644
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@@ -12,14 +12,18 @@ $TRANSLATIONS = array(
"Enable SSL" => "Activar SSL",
"App key" => "Chave da aplicação",
"App secret" => "Chave secreta da aplicação",
-"URL" => "URL",
+"Host" => "Endereço",
"Username" => "Nome de utilizador",
"Password" => "Palavra-passe",
"Root" => "Raiz",
+"Secure ftps://" => "ftps:// Seguro",
"Client ID" => "ID Cliente",
"Client secret" => "Segredo do cliente",
"Username (required)" => "Utilizador (requerido)",
"Share" => "Partilhar",
+"Username as share" => "Utilizar nome de utilizador como partilha",
+"URL" => "URL",
+"Secure https://" => "https:// Seguro",
"Remote subfolder" => "Sub-pasta remota ",
"Access granted" => "Acesso autorizado",
"Error configuring Dropbox storage" => "Erro ao configurar o armazenamento do Dropbox",
diff --git a/apps/files_external/l10n/ro.php b/apps/files_external/l10n/ro.php
index cc48e20ab08cd4f2057676027a963318634562f9..d5e1e90c54aeb1c9d829ce31e21c3d9030d1e2aa 100644
--- a/apps/files_external/l10n/ro.php
+++ b/apps/files_external/l10n/ro.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "Locație",
-"URL" => "URL",
+"Host" => "Gazdă",
"Username" => "Nume utilizator",
"Password" => "Parolă",
"Share" => "Partajează",
+"URL" => "URL",
"Access granted" => "Acces permis",
"Error configuring Dropbox storage" => "Eroare la configurarea mediului de stocare Dropbox",
"Grant access" => "Permite accesul",
diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php
index be1307a9e6b3d3d39f2823ad9e789412ce458463..b4985dd5dc9dd34c2bdb5de7d34c36a15135eb79 100644
--- a/apps/files_external/l10n/ru.php
+++ b/apps/files_external/l10n/ru.php
@@ -1,22 +1,37 @@
<?php
$TRANSLATIONS = array(
+"Local" => "Локально",
"Location" => "МеÑтоположение",
-"URL" => "СÑылка",
+"Amazon S3" => "Amazon S3",
+"Hostname (optional)" => "ХоÑÑ‚ (опц.)",
+"Port (optional)" => "Порт (опц.)",
+"Region (optional)" => "Регион (опционально)",
+"Enable SSL" => "Включить SSL",
+"Host" => "Сервер",
"Username" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ",
"Password" => "Пароль",
+"Secure ftps://" => "БезопаÑный ftps://",
+"Username (required)" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ (обÑз.)",
"Share" => "Открыть доÑтуп",
+"URL" => "СÑылка",
+"Secure https://" => "БезопаÑный https://",
"Access granted" => "ДоÑтуп предоÑтавлен",
"Error configuring Dropbox storage" => "Ошибка при наÑтройке хранилища Dropbox",
"Grant access" => "ПредоÑтавление доÑтупа",
"Please provide a valid Dropbox app key and secret." => "ПожалуйÑта, предоÑтавьте дейÑтвующий ключ Dropbox и пароль.",
"Error configuring Google Drive storage" => "Ошибка при наÑтройке хранилища Google Drive",
"Saved" => "Сохранено",
+"<b>Note:</b> " => "<b>Примечание:</b> ",
+" and " => "и",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Примечание:</b> Поддержка cURL в PHP не включена или не уÑтановлен модуль. Подключение %s невозможно. ОбратитеÑÑŒ к вашему ÑиÑтемному админиÑтратору.",
"External Storage" => "Внешний ноÑитель",
"Folder name" => "Ð˜Ð¼Ñ Ð¿Ð°Ð¿ÐºÐ¸",
"External storage" => "Внешний ноÑитель данных",
"Configuration" => "КонфигурациÑ",
"Options" => "Опции",
+"Available for" => "ДоÑтупно длÑ",
"Add storage" => "Добавить ноÑитель данных",
+"No user or group" => "Ðет Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ группы",
"All Users" => "Ð’Ñе пользователи",
"Groups" => "Группы",
"Users" => "Пользователи",
diff --git a/apps/files_external/l10n/si_LK.php b/apps/files_external/l10n/si_LK.php
index 908f82d8ee931fc9dcde94fb7c13ca12e53ac0a6..960ededaa6378032c2dbd3c4772c321590658a73 100644
--- a/apps/files_external/l10n/si_LK.php
+++ b/apps/files_external/l10n/si_LK.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "ස්ථà·à¶±à¶º",
-"URL" => "URL",
+"Host" => "à·ƒà¶à·Šà¶šà·à¶»à¶šà¶º",
"Username" => "පරිà·à·“ලක නම",
"Password" => "මුර පදය",
"Share" => "බෙද෠හද෠ගන්න",
+"URL" => "URL",
"Access granted" => "පිවිසීමට à·„à·à¶š",
"Error configuring Dropbox storage" => "Dropbox ගබඩà·à·€ වින්â€à¶ºà·à·ƒ කිරීමේ දà·à·à¶ºà¶šà·Š ඇà¶",
"Grant access" => "පිවිසුම ලබà·à¶¯à·™à¶±à·Šà¶±",
diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php
index e30b007c3cb8422f4f08df896192f9149e8183b0..f576d92cdac60b2d00d5dd94eaf079e1f738f627 100644
--- a/apps/files_external/l10n/sk_SK.php
+++ b/apps/files_external/l10n/sk_SK.php
@@ -2,10 +2,11 @@
$TRANSLATIONS = array(
"Local" => "Lokálny",
"Location" => "Umiestnenie",
-"URL" => "URL",
+"Host" => "Hostiteľ",
"Username" => "PoužÃvateľské meno",
"Password" => "Heslo",
"Share" => "Zdieľať",
+"URL" => "URL",
"Access granted" => "PrÃstup povolený",
"Error configuring Dropbox storage" => "Chyba pri konfigurácii úložiska Dropbox",
"Grant access" => "PovoliÅ¥ prÃstup",
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
index 235ba23eb107f06fa2918b3b8d301fd2cf45b407..c47e962b6e864c33771f62e4d0854caea94a0ba5 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -4,10 +4,31 @@ $TRANSLATIONS = array(
"Location" => "Mesto",
"Amazon S3" => "Amazon S3",
"Key" => "KljuÄ",
-"URL" => "Naslov URL",
+"Secret" => "Skrivni kljuÄ",
+"Amazon S3 and compliant" => "Amazon S3 in podobno",
+"Access Key" => "KljuÄ za dostop",
+"Secret Key" => "Skrivni kljuÄ",
+"Hostname (optional)" => "Ime gostitelja (izbirno)",
+"Port (optional)" => "Vrata (izbirno)",
+"Region (optional)" => "ObmoÄje (izbirno)",
+"Enable SSL" => "OmogoÄi SSL",
+"Enable Path Style" => "OmogoÄi slog poti",
+"App key" => "Programski kljuÄ",
+"App secret" => "Skrivni programski kljuÄ",
+"Host" => "Gostitelj",
"Username" => "Uporabniško ime",
"Password" => "Geslo",
+"Root" => "Koren",
+"Secure ftps://" => "Varni naÄin ftps://",
+"Client ID" => "ID odjemalca",
+"Client secret" => "Skrivni kljuÄ odjemalca",
+"Username (required)" => "Uporabniško ime (zahtevano)",
"Share" => "Souporaba",
+"SMB / CIFS using OC login" => "SMB / CIFS z uporabo prijave OC",
+"Username as share" => "Uporabniško ime za souporabo",
+"URL" => "Naslov URL",
+"Secure https://" => "Varni naÄin https://",
+"Remote subfolder" => "Oddaljena podrejena mapa",
"Access granted" => "Dostop je odobren",
"Error configuring Dropbox storage" => "Napaka nastavljanja shrambe Dropbox",
"Grant access" => "Odobri dostop",
diff --git a/apps/files_external/l10n/sq.php b/apps/files_external/l10n/sq.php
index 563a1b7dd926ba8aa732f23b4bdf5743914e8afa..1904514fdc4791e70bef38a1e834ec200f6198c2 100644
--- a/apps/files_external/l10n/sq.php
+++ b/apps/files_external/l10n/sq.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "Vendndodhja",
-"URL" => "URL-i",
+"Host" => "Pritësi",
"Username" => "Përdoruesi",
"Password" => "fjalëkalim",
"Share" => "Ndaj",
+"URL" => "URL-i",
"Groups" => "Grupet",
"Users" => "Përdoruesit",
"Delete" => "Elimino"
diff --git a/apps/files_external/l10n/sr.php b/apps/files_external/l10n/sr.php
index b0276764a8dc296f52dd8716e50093a07beb19c9..bf150f5b5b0fb4472a9e9c67ed5bbae1f833f4ee 100644
--- a/apps/files_external/l10n/sr.php
+++ b/apps/files_external/l10n/sr.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"Location" => "Локација",
+"Host" => "Домаћин",
"Username" => "КориÑничко име",
"Password" => "Лозинка",
"Share" => "Дели",
diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php
index a15ea0ed164473ad545bc9330a8aaf56374119e3..f5896150fa4d0cf84e88ab9cabb5c1c254f96737 100644
--- a/apps/files_external/l10n/sv.php
+++ b/apps/files_external/l10n/sv.php
@@ -2,10 +2,40 @@
$TRANSLATIONS = array(
"Local" => "Lokal",
"Location" => "Plats",
-"URL" => "URL",
+"Amazon S3" => "Amazon S3",
+"Key" => "Nyckel",
+"Secret" => "Hemlig",
+"Bucket" => "Bucket",
+"Amazon S3 and compliant" => "Amazon S3 och compliant",
+"Access Key" => "Accessnyckel",
+"Secret Key" => "Hemlig nyckel",
+"Hostname (optional)" => "Värdnamn (valfritt)",
+"Port (optional)" => "Port (valfritt)",
+"Region (optional)" => "Region (valfritt)",
+"Enable SSL" => "Aktivera SSL",
+"App key" => "App-nyckel",
+"App secret" => "App-hemlighet",
+"Host" => "Server",
"Username" => "Användarnamn",
"Password" => "Lösenord",
+"Root" => "Root",
+"Secure ftps://" => "Säker ftps://",
+"Client ID" => "Klient ID",
+"Client secret" => "klient secret",
+"OpenStack Object Storage" => "OpenStack Object Storage",
+"Username (required)" => "Användarnamn (måste anges)",
+"Bucket (required)" => "Bucket (krävs)",
+"Region (optional for OpenStack Object Storage)" => "Region (valfritt för OpenStack Object Storage)",
+"API Key (required for Rackspace Cloud Files)" => "API-nyckel (krävs för Rackspace Cloud Files)",
+"Password (required for OpenStack Object Storage)" => "Lösenord (krävs för OpenStack Object Storage)",
+"Service Name (required for OpenStack Object Storage)" => "Tjänstens namn (krävs för OpenStack Object Storage)",
+"Timeout of HTTP requests in seconds (optional)" => "Timeout för HTTP-förfrågningar i sekunder (tillval)",
"Share" => "Dela",
+"SMB / CIFS using OC login" => "SMB / CIFS använder OC inloggning",
+"Username as share" => "Användarnamn till utdelning",
+"URL" => "URL",
+"Secure https://" => "Säker https://",
+"Remote subfolder" => "Fjärrmapp",
"Access granted" => "Ã…tkomst beviljad",
"Error configuring Dropbox storage" => "Fel vid konfigurering av Dropbox",
"Grant access" => "Bevilja åtkomst",
diff --git a/apps/files_external/l10n/ta_LK.php b/apps/files_external/l10n/ta_LK.php
index 066cf411dd612cc981dc59d2af956571faad099e..a94b7417ff5ea1cff26aa138edc6a1a930622a57 100644
--- a/apps/files_external/l10n/ta_LK.php
+++ b/apps/files_external/l10n/ta_LK.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "இடமà¯",
-"URL" => "URL",
+"Host" => "ஓமà¯à®ªà¯à®©à®°à¯",
"Username" => "பயனாளர௠பெயரà¯",
"Password" => "கடவà¯à®šà¯à®šà¯Šà®²à¯",
"Share" => "பகிரà¯à®µà¯",
+"URL" => "URL",
"Access granted" => "அனà¯à®®à®¤à®¿ வழஙà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯",
"Error configuring Dropbox storage" => "Dropbox சேமிபà¯à®ªà¯ˆ தகவமைபà¯à®ªà®¤à®¿à®²à¯ வழà¯",
"Grant access" => "அனà¯à®®à®¤à®¿à®¯à¯ˆ வழஙà¯à®•à®²à¯",
diff --git a/apps/files_external/l10n/th_TH.php b/apps/files_external/l10n/th_TH.php
index 3edf8c6382427236ecbee258f17c2d30f1e81a70..9f393a2546f46dd9878d1fe55433a9c9f4801735 100644
--- a/apps/files_external/l10n/th_TH.php
+++ b/apps/files_external/l10n/th_TH.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "ตำà¹à¸«à¸™à¹ˆà¸‡à¸—ี่à¸à¸¢à¸¹à¹ˆ",
-"URL" => "URL",
+"Host" => "โฮสต์",
"Username" => "ชื่à¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™",
"Password" => "รหัสผ่าน",
"Share" => "à¹à¸Šà¸£à¹Œ",
+"URL" => "URL",
"Access granted" => "à¸à¸²à¸£à¹€à¸‚้าถึงได้รับà¸à¸™à¸¸à¸à¸²à¸•à¹à¸¥à¹‰à¸§",
"Error configuring Dropbox storage" => "เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดในà¸à¸²à¸£à¸à¸³à¸«à¸™à¸”ค่าพื้นที่จัดเà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥ Dropbox",
"Grant access" => "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹€à¸‚้าถึงได้",
diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php
index aa3290bd4bca936a4a63cca5ec0cf5abd32f6102..346d2a8be3f8cdccfb9c09da286a8924cea8896b 100644
--- a/apps/files_external/l10n/tr.php
+++ b/apps/files_external/l10n/tr.php
@@ -16,9 +16,9 @@ $TRANSLATIONS = array(
"Enable Path Style" => "Yol Biçemini Etkinleştir",
"App key" => "Uyg. anahtarı",
"App secret" => "Uyg. parolası",
-"URL" => "URL",
-"Username" => "Kullanıcı Adı:",
-"Password" => "Parola:",
+"Host" => "Sunucu",
+"Username" => "Kullanıcı Adı",
+"Password" => "Parola",
"Root" => "Kök",
"Secure ftps://" => "Güvenli ftps://",
"Client ID" => "Ä°stemci KimliÄŸ",
@@ -36,6 +36,7 @@ $TRANSLATIONS = array(
"Share" => "PaylaÅŸ",
"SMB / CIFS using OC login" => "OC oturumu kullanarak SMB / CIFS",
"Username as share" => "Paylaşım olarak kullanıcı adı",
+"URL" => "URL",
"Secure https://" => "Güvenli https://",
"Remote subfolder" => "Uzak alt klasör",
"Access granted" => "GiriÅŸ kabul edildi",
diff --git a/apps/files_external/l10n/ug.php b/apps/files_external/l10n/ug.php
index bd7dc4298650328383a787a7605d70af0f8c6154..701a5457ae2e762cfcd946841903f63dcbd2e755 100644
--- a/apps/files_external/l10n/ug.php
+++ b/apps/files_external/l10n/ug.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "ئورنى",
-"URL" => "URL",
+"Host" => "باش ئاپپارات",
"Username" => "ئىشلەتكۈچى ئاتى",
"Password" => "ئىم",
"Share" => "ھەمبەھىر",
+"URL" => "URL",
"Folder name" => "قىسقۇچ ئاتى",
"External storage" => "سىرتقى ساقلىغۇچ",
"Configuration" => "سەپلىمە",
diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php
index f644fe8606329d86f5b67141e7fbb310ec987f84..aea352a6863ee2f9df79a1c9bff96bc834b77393 100644
--- a/apps/files_external/l10n/uk.php
+++ b/apps/files_external/l10n/uk.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "МіÑце",
-"URL" => "URL",
+"Host" => "ХоÑÑ‚",
"Username" => "Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача",
"Password" => "Пароль",
"Share" => "ПоділитиÑÑ",
+"URL" => "URL",
"Access granted" => "ДоÑтуп дозволено",
"Error configuring Dropbox storage" => "Помилка при налаштуванні Ñховища Dropbox",
"Grant access" => "Дозволити доÑтуп",
diff --git a/apps/files_external/l10n/ur_PK.php b/apps/files_external/l10n/ur_PK.php
index e2138b9046b15f4822ebddfe89411c7869f2cd2e..5d4695b5115839d356d3c4d51d123b6abeb5a098 100644
--- a/apps/files_external/l10n/ur_PK.php
+++ b/apps/files_external/l10n/ur_PK.php
@@ -1,7 +1,11 @@
<?php
$TRANSLATIONS = array(
+"Location" => "مقام",
"Username" => "یوزر نیم",
"Password" => "پاسورڈ",
-"Users" => "یوزرز"
+"Share" => "تقسیم",
+"URL" => "یو ار ایل",
+"Users" => "یوزرز",
+"Delete" => "Øذ٠کریں"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/vi.php b/apps/files_external/l10n/vi.php
index 86d1236f665fab00fb66fa921d2af31637eb5533..03d50bc1433c740fff815b158be6abdc9cb0104b 100644
--- a/apps/files_external/l10n/vi.php
+++ b/apps/files_external/l10n/vi.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
"Location" => "Vị trÃ",
-"URL" => "URL",
+"Host" => "Máy chủ",
"Username" => "Tên đăng nháºp",
"Password" => "Máºt khẩu",
"Share" => "Chia sẻ",
+"URL" => "URL",
"Access granted" => "Äã cấp quyá»n truy cáºp",
"Error configuring Dropbox storage" => "Lỗi cấu hình lưu trữ Dropbox ",
"Grant access" => "Cấp quyá»n truy cáºp",
diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php
index 241bc29e66177b5d5ede143db870d02aa7305bfe..95e9c0e643eb6885bf81ced9f8063825154fe57d 100644
--- a/apps/files_external/l10n/zh_CN.php
+++ b/apps/files_external/l10n/zh_CN.php
@@ -8,14 +8,16 @@ $TRANSLATIONS = array(
"Port (optional)" => "ç«¯å£ (å¯é€‰)",
"Region (optional)" => "区域 (optional)",
"Enable SSL" => "å¯ç”¨ SSL",
-"URL" => "URL",
+"Host" => "主机",
"Username" => "用户å",
"Password" => "密ç ",
"Root" => "æ ¹è·¯å¾„",
"Secure ftps://" => "安全 ftps://",
"Share" => "共享",
"SMB / CIFS using OC login" => "SMB / CIFS 使用 OC 登录信æ¯",
+"URL" => "URL",
"Secure https://" => "安全 https://",
+"Remote subfolder" => "远程å文件夹",
"Access granted" => "æƒé™å·²æŽˆäºˆã€‚",
"Error configuring Dropbox storage" => "é…ç½®Dropboxå˜å‚¨æ—¶å‡ºé”™",
"Grant access" => "授æƒ",
diff --git a/apps/files_external/l10n/zh_HK.php b/apps/files_external/l10n/zh_HK.php
index b3a22c91bb2836bf8c2fd76761f7fb6cf4f02a23..05fa0921874fe1ffac1258fe750ed0d52996ffd2 100644
--- a/apps/files_external/l10n/zh_HK.php
+++ b/apps/files_external/l10n/zh_HK.php
@@ -1,10 +1,11 @@
<?php
$TRANSLATIONS = array(
-"URL" => "網å€",
"Username" => "用戶å稱",
"Password" => "密碼",
"Share" => "分享",
+"URL" => "網å€",
"Folder name" => "資料夾å稱",
+"Options" => "é¸é …",
"Groups" => "群組",
"Users" => "用戶",
"Delete" => "刪除"
diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php
index a4b0ebe4dd53918397df85353356a29e2e32b120..154009f7a18306c4ab6fa65baa975898364c86ad 100644
--- a/apps/files_external/l10n/zh_TW.php
+++ b/apps/files_external/l10n/zh_TW.php
@@ -2,10 +2,11 @@
$TRANSLATIONS = array(
"Local" => "本地",
"Location" => "地點",
-"URL" => "URL",
+"Host" => "主機",
"Username" => "使用者å稱：",
"Password" => "密碼",
"Share" => "分享",
+"URL" => "URL",
"Access granted" => "å…許å˜å–",
"Error configuring Dropbox storage" => "è¨å®š Dropbox 儲å˜æ™‚發生錯誤",
"Grant access" => "å…許å˜å–",
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 2093fb7e58cf7aadf249db84cc9614fb904d4cb8..7ff17f0e98a3f371d7a0d823f931966fe54af6bb 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -25,7 +25,7 @@
namespace OC\Files\Storage;
set_include_path(get_include_path() . PATH_SEPARATOR .
- \OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
+ \OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
require 'aws-autoloader.php';
use Aws\S3\S3Client;
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 99eca2f38cfc8a0a8868a6434eadb4c28b8d5b4d..21f63bf439d31cb3aec9df64216353c7470da9e5 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -35,6 +35,7 @@ class OC_Mount_Config {
const MOUNT_TYPE_GLOBAL = 'global';
const MOUNT_TYPE_GROUP = 'group';
const MOUNT_TYPE_USER = 'user';
+ const MOUNT_TYPE_PERSONAL = 'personal';
// whether to skip backend test (for unit tests, as this static class is not mockable)
public static $skipTest = false;
@@ -126,19 +127,54 @@ class OC_Mount_Config {
$datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data");
$mount_file = \OC_Config::getValue("mount_file", $datadir . "/mount.json");
+ $backends = self::getBackends();
+
//move config file to it's new position
if (is_file(\OC::$SERVERROOT . '/config/mount.json')) {
rename(\OC::$SERVERROOT . '/config/mount.json', $mount_file);
}
// Load system mount points
- $mountConfig = self::readData(false);
+ $mountConfig = self::readData();
+
+ // Global mount points (is this redundant?)
if (isset($mountConfig[self::MOUNT_TYPE_GLOBAL])) {
foreach ($mountConfig[self::MOUNT_TYPE_GLOBAL] as $mountPoint => $options) {
$options['options'] = self::decryptPasswords($options['options']);
- $mountPoints[$mountPoint] = $options;
+ if (!isset($options['priority'])) {
+ $options['priority'] = $backends[$options['class']]['priority'];
+ }
+
+ // Override if priority greater
+ if ( (!isset($mountPoints[$mountPoint]))
+ || ($options['priority'] >= $mountPoints[$mountPoint]['priority']) ) {
+ $options['priority_type'] = self::MOUNT_TYPE_GLOBAL;
+ $mountPoints[$mountPoint] = $options;
+ }
+ }
+ }
+ // All user mount points
+ if (isset($mountConfig[self::MOUNT_TYPE_USER]) && isset($mountConfig[self::MOUNT_TYPE_USER]['all'])) {
+ $mounts = $mountConfig[self::MOUNT_TYPE_USER]['all'];
+ foreach ($mounts as $mountPoint => $options) {
+ $mountPoint = self::setUserVars($user, $mountPoint);
+ foreach ($options as &$option) {
+ $option = self::setUserVars($user, $option);
+ }
+ $options['options'] = self::decryptPasswords($options['options']);
+ if (!isset($options['priority'])) {
+ $options['priority'] = $backends[$options['class']]['priority'];
+ }
+
+ // Override if priority greater
+ if ( (!isset($mountPoints[$mountPoint]))
+ || ($options['priority'] >= $mountPoints[$mountPoint]['priority']) ) {
+ $options['priority_type'] = self::MOUNT_TYPE_GLOBAL;
+ $mountPoints[$mountPoint] = $options;
+ }
}
}
+ // Group mount points
if (isset($mountConfig[self::MOUNT_TYPE_GROUP])) {
foreach ($mountConfig[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
if (\OC_Group::inGroup($user, $group)) {
@@ -148,31 +184,55 @@ class OC_Mount_Config {
$option = self::setUserVars($user, $option);
}
$options['options'] = self::decryptPasswords($options['options']);
- $mountPoints[$mountPoint] = $options;
+ if (!isset($options['priority'])) {
+ $options['priority'] = $backends[$options['class']]['priority'];
+ }
+
+ // Override if priority greater or if priority type different
+ if ( (!isset($mountPoints[$mountPoint]))
+ || ($options['priority'] >= $mountPoints[$mountPoint]['priority'])
+ || ($mountPoints[$mountPoint]['priority_type'] !== self::MOUNT_TYPE_GROUP) ) {
+ $options['priority_type'] = self::MOUNT_TYPE_GROUP;
+ $mountPoints[$mountPoint] = $options;
+ }
}
}
}
}
+ // User mount points
if (isset($mountConfig[self::MOUNT_TYPE_USER])) {
foreach ($mountConfig[self::MOUNT_TYPE_USER] as $mountUser => $mounts) {
- if ($mountUser === 'all' or strtolower($mountUser) === strtolower($user)) {
+ if (strtolower($mountUser) === strtolower($user)) {
foreach ($mounts as $mountPoint => $options) {
$mountPoint = self::setUserVars($user, $mountPoint);
foreach ($options as &$option) {
$option = self::setUserVars($user, $option);
}
$options['options'] = self::decryptPasswords($options['options']);
- $mountPoints[$mountPoint] = $options;
+ if (!isset($options['priority'])) {
+ $options['priority'] = $backends[$options['class']]['priority'];
+ }
+
+ // Override if priority greater or if priority type different
+ if ( (!isset($mountPoints[$mountPoint]))
+ || ($options['priority'] >= $mountPoints[$mountPoint]['priority'])
+ || ($mountPoints[$mountPoint]['priority_type'] !== self::MOUNT_TYPE_USER) ) {
+ $options['priority_type'] = self::MOUNT_TYPE_USER;
+ $mountPoints[$mountPoint] = $options;
+ }
}
}
}
}
// Load personal mount points
- $mountConfig = self::readData(true);
+ $mountConfig = self::readData($user);
if (isset($mountConfig[self::MOUNT_TYPE_USER][$user])) {
foreach ($mountConfig[self::MOUNT_TYPE_USER][$user] as $mountPoint => $options) {
$options['options'] = self::decryptPasswords($options['options']);
+
+ // Always override previous config
+ $options['priority_type'] = self::MOUNT_TYPE_PERSONAL;
$mountPoints[$mountPoint] = $options;
}
}
@@ -233,7 +293,7 @@ class OC_Mount_Config {
* @return array
*/
public static function getSystemMountPoints() {
- $mountPoints = self::readData(false);
+ $mountPoints = self::readData();
$backends = self::getBackends();
$system = array();
if (isset($mountPoints[self::MOUNT_TYPE_GROUP])) {
@@ -244,6 +304,9 @@ class OC_Mount_Config {
$mount['class'] = '\OC\Files\Storage\\'.substr($mount['class'], 15);
}
$mount['options'] = self::decryptPasswords($mount['options']);
+ if (!isset($mount['priority'])) {
+ $mount['priority'] = $backends[$mount['class']]['priority'];
+ }
// Remove '/$user/files/' from mount point
$mountPoint = substr($mountPoint, 13);
@@ -251,6 +314,7 @@ class OC_Mount_Config {
'class' => $mount['class'],
'mountpoint' => $mountPoint,
'backend' => $backends[$mount['class']]['backend'],
+ 'priority' => $mount['priority'],
'options' => $mount['options'],
'applicable' => array('groups' => array($group), 'users' => array()),
'status' => self::getBackendStatus($mount['class'], $mount['options'], false)
@@ -275,12 +339,16 @@ class OC_Mount_Config {
$mount['class'] = '\OC\Files\Storage\\'.substr($mount['class'], 15);
}
$mount['options'] = self::decryptPasswords($mount['options']);
+ if (!isset($mount['priority'])) {
+ $mount['priority'] = $backends[$mount['class']]['priority'];
+ }
// Remove '/$user/files/' from mount point
$mountPoint = substr($mountPoint, 13);
$config = array(
'class' => $mount['class'],
'mountpoint' => $mountPoint,
'backend' => $backends[$mount['class']]['backend'],
+ 'priority' => $mount['priority'],
'options' => $mount['options'],
'applicable' => array('groups' => array(), 'users' => array($user)),
'status' => self::getBackendStatus($mount['class'], $mount['options'], false)
@@ -306,7 +374,7 @@ class OC_Mount_Config {
* @return array
*/
public static function getPersonalMountPoints() {
- $mountPoints = self::readData(true);
+ $mountPoints = self::readData(OCP\User::getUser());
$backEnds = self::getBackends();
$uid = OCP\User::getUser();
$personal = array();
@@ -359,10 +427,11 @@ class OC_Mount_Config {
* Add a mount point to the filesystem
* @param string $mountPoint Mount point
* @param string $class Backend class
- * @param array Backend parameters for the class
+ * @param array $classOptions Backend parameters for the class
* @param string $mountType MOUNT_TYPE_GROUP | MOUNT_TYPE_USER
* @param string $applicable User or group to apply mount to
- * @param bool Personal or system mount point i.e. is this being called from the personal or admin page
+ * @param bool $isPersonal Personal or system mount point i.e. is this being called from the personal or admin page
+ * @param int|null $priority Mount point priority, null for default
* @return boolean
*/
public static function addMountPoint($mountPoint,
@@ -370,7 +439,8 @@ class OC_Mount_Config {
$classOptions,
$mountType,
$applicable,
- $isPersonal = false) {
+ $isPersonal = false,
+ $priority = null) {
$backends = self::getBackends();
$mountPoint = OC\Files\Filesystem::normalizePath($mountPoint);
if ($mountPoint === '' || $mountPoint === '/') {
@@ -400,28 +470,35 @@ class OC_Mount_Config {
'options' => self::encryptPasswords($classOptions))
)
);
- $mountPoints = self::readData($isPersonal);
- // Merge the new mount point into the current mount points
- if (isset($mountPoints[$mountType])) {
- if (isset($mountPoints[$mountType][$applicable])) {
- $mountPoints[$mountType][$applicable]
- = array_merge($mountPoints[$mountType][$applicable], $mount[$applicable]);
+ if (! $isPersonal && !is_null($priority)) {
+ $mount[$applicable][$mountPoint]['priority'] = $priority;
+ }
+
+ $mountPoints = self::readData($isPersonal ? OCP\User::getUser() : NULL);
+ $mountPoints = self::mergeMountPoints($mountPoints, $mount, $mountType);
+
+ // Set default priority if none set
+ if (!isset($mountPoints[$mountType][$applicable][$mountPoint]['priority'])) {
+ if (isset($backends[$class]['priority'])) {
+ $mountPoints[$mountType][$applicable][$mountPoint]['priority']
+ = $backends[$class]['priority'];
} else {
- $mountPoints[$mountType] = array_merge($mountPoints[$mountType], $mount);
+ $mountPoints[$mountType][$applicable][$mountPoint]['priority']
+ = 100;
}
- } else {
- $mountPoints[$mountType] = $mount;
}
- self::writeData($isPersonal, $mountPoints);
+
+ self::writeData($isPersonal ? OCP\User::getUser() : NULL, $mountPoints);
+
return self::getBackendStatus($class, $classOptions, $isPersonal);
}
/**
*
- * @param string Mount point
- * @param string MOUNT_TYPE_GROUP | MOUNT_TYPE_USER
- * @param string User or group to remove mount from
- * @param bool Personal or system mount point
+ * @param string $mountPoint Mount point
+ * @param string $mountType MOUNT_TYPE_GROUP | MOUNT_TYPE_USER
+ * @param string $applicable User or group to remove mount from
+ * @param bool $isPersonal Personal or system mount point
* @return bool
*/
public static function removeMountPoint($mountPoint, $mountType, $applicable, $isPersonal = false) {
@@ -434,7 +511,7 @@ class OC_Mount_Config {
} else {
$mountPoint = '/$user/files/'.ltrim($mountPoint, '/');
}
- $mountPoints = self::readData($isPersonal);
+ $mountPoints = self::readData($isPersonal ? OCP\User::getUser() : NULL);
// Remove mount point
unset($mountPoints[$mountType][$applicable][$mountPoint]);
// Unset parent arrays if empty
@@ -444,20 +521,20 @@ class OC_Mount_Config {
unset($mountPoints[$mountType]);
}
}
- self::writeData($isPersonal, $mountPoints);
+ self::writeData($isPersonal ? OCP\User::getUser() : NULL, $mountPoints);
return true;
}
/**
* Read the mount points in the config file into an array
- * @param boolean $isPersonal Personal or system config file
+ * @param string|null $user If not null, personal for $user, otherwise system
* @return array
*/
- private static function readData($isPersonal) {
+ private static function readData($user = NULL) {
$parser = new \OC\ArrayParser();
- if ($isPersonal) {
- $phpFile = OC_User::getHome(OCP\User::getUser()).'/mount.php';
- $jsonFile = OC_User::getHome(OCP\User::getUser()).'/mount.json';
+ if (isset($user)) {
+ $phpFile = OC_User::getHome($user).'/mount.php';
+ $jsonFile = OC_User::getHome($user).'/mount.json';
} else {
$phpFile = OC::$SERVERROOT.'/config/mount.php';
$datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data/');
@@ -479,13 +556,12 @@ class OC_Mount_Config {
/**
* Write the mount points to the config file
- * @param bool Personal or system config file
- * @param array Mount points
- * @param boolean $isPersonal
+ * @param string|null $user If not null, personal for $user, otherwise system
+ * @param array $data Mount points
*/
- private static function writeData($isPersonal, $data) {
- if ($isPersonal) {
- $file = OC_User::getHome(OCP\User::getUser()).'/mount.json';
+ private static function writeData($user, $data) {
+ if (isset($user)) {
+ $file = OC_User::getHome($user).'/mount.json';
} else {
$datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data/');
$file = \OC_Config::getValue('mount_file', $datadir . '/mount.json');
@@ -619,9 +695,9 @@ class OC_Mount_Config {
/**
* Returns a dependency missing message
- * @param $l OC_L10N
- * @param $module string
- * @param $backend string
+ * @param OC_L10N $l
+ * @param string $module
+ * @param string $backend
* @return string
*/
private static function getSingleDependencyMessage($l, $module, $backend) {
@@ -667,7 +743,7 @@ class OC_Mount_Config {
/**
* Encrypt a single password
* @param string $password plain text password
- * @return encrypted password
+ * @return string encrypted password
*/
private static function encryptPassword($password) {
$cipher = self::getCipher();
@@ -679,7 +755,7 @@ class OC_Mount_Config {
/**
* Decrypts a single password
* @param string $encryptedPassword encrypted password
- * @return plain text password
+ * @return string plain text password
*/
private static function decryptPassword($encryptedPassword) {
$cipher = self::getCipher();
@@ -690,6 +766,36 @@ class OC_Mount_Config {
return $cipher->decrypt($binaryPassword);
}
+ /**
+ * Merges mount points
+ * @param array $data Existing mount points
+ * @param array $mountPoint New mount point
+ * @param string $mountType
+ * @return array
+ */
+ private static function mergeMountPoints($data, $mountPoint, $mountType) {
+ $applicable = key($mountPoint);
+ $mountPath = key($mountPoint[$applicable]);
+ if (isset($data[$mountType])) {
+ if (isset($data[$mountType][$applicable])) {
+ // Merge priorities
+ if (isset($data[$mountType][$applicable][$mountPath])
+ && isset($data[$mountType][$applicable][$mountPath]['priority'])
+ && !isset($mountPoint[$applicable][$mountPath]['priority'])) {
+ $mountPoint[$applicable][$mountPath]['priority']
+ = $data[$mountType][$applicable][$mountPath]['priority'];
+ }
+ $data[$mountType][$applicable]
+ = array_merge($data[$mountType][$applicable], $mountPoint[$applicable]);
+ } else {
+ $data[$mountType] = array_merge($data[$mountType], $mountPoint);
+ }
+ } else {
+ $data[$mountType] = $mountPoint;
+ }
+ return $data;
+ }
+
/**
* Returns the encryption cipher
*/
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 38de3360f2b40c348427e5c15a04774ebd67a33f..9f297d22dcb83bfd8a48512562f2c82f271f67ad 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -44,7 +44,7 @@ class Dropbox extends \OC\Files\Storage\Common {
$this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $this->root;
$oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
$oauth->setToken($params['token'], $params['token_secret']);
- $this->dropbox = new \Dropbox_API($oauth, 'dropbox');
+ $this->dropbox = new \Dropbox_API($oauth, 'auto');
} else {
throw new \Exception('Creating \OC\Files\Storage\Dropbox storage failed');
}
@@ -63,10 +63,10 @@ class Dropbox extends \OC\Files\Storage\Common {
}
/**
- * @brief Returns the path's metadata
+ * Returns the path's metadata
* @param string $path path for which to return the metadata
- * @param $list if true, also return the directory's contents
- * @return directory contents if $list is true, file metadata if $list is
+ * @param bool $list if true, also return the directory's contents
+ * @return mixed directory contents if $list is true, file metadata if $list is
* false, null if the file doesn't exist or "false" if the operation failed
*/
private function getMetaData($path, $list = false) {
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index b3f8b1444ae5d599de0ba504f8d2689adde0ca81..2650a94f85ef33656f7ae68f59a9609ff65954b9 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -64,7 +64,7 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
/**
* Unlinks file or directory
- * @param string @path
+ * @param string $path
*/
public function unlink($path) {
if ($this->is_dir($path)) {
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index b1d355323d9a078df9948f94367c0dc91ad6abb0..6e53c4a99310c9805ac8b5e76b886cb3a91bf4a8 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -83,7 +83,7 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
/**
* Unlinks file or directory
- * @param string @path
+ * @param string $path
*/
public function unlink($path) {
if ($this->is_dir($path)) {
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index a202d3843cb212925b5ba82b5cea18064b653857..03364867b0c69829d4980d6270fbe5dcb425ca05 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -23,7 +23,7 @@
namespace OC\Files\Storage;
set_include_path(get_include_path() . PATH_SEPARATOR .
- \OC_App::getAppPath('files_external') . '/3rdparty/php-opencloud/lib');
+ \OC_App::getAppPath('files_external') . '/3rdparty/php-opencloud/lib');
require_once 'openstack.php';
use \OpenCloud;
@@ -31,25 +31,25 @@ use \OpenCloud\Common\Exceptions;
class Swift extends \OC\Files\Storage\Common {
- /**
- * @var \OpenCloud\ObjectStore
- */
+ /**
+ * @var \OpenCloud\ObjectStore
+ */
private $connection;
- /**
- * @var \OpenCloud\ObjectStore\Container
- */
+ /**
+ * @var \OpenCloud\ObjectStore\Container
+ */
private $container;
- /**
- * @var \OpenCloud\OpenStack
- */
+ /**
+ * @var \OpenCloud\OpenStack
+ */
private $anchor;
- /**
- * @var string
- */
+ /**
+ * @var string
+ */
private $bucket;
- /**
- * @var array
- */
+ /**
+ * @var array
+ */
private static $tmpFiles = array();
/**
diff --git a/apps/files_external/tests/mountconfig.php b/apps/files_external/tests/mountconfig.php
index 14fe1d90b7aac32679ee174778fdde5273b32d43..9b04e200e2b6933b52a0795ab911d5e5926dd4f5 100644
--- a/apps/files_external/tests/mountconfig.php
+++ b/apps/files_external/tests/mountconfig.php
@@ -41,16 +41,22 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
const TEST_USER1 = 'user1';
const TEST_USER2 = 'user2';
const TEST_GROUP1 = 'group1';
+ const TEST_GROUP1B = 'group1b';
const TEST_GROUP2 = 'group2';
+ const TEST_GROUP2B = 'group2b';
public function setUp() {
\OC_User::createUser(self::TEST_USER1, self::TEST_USER1);
\OC_User::createUser(self::TEST_USER2, self::TEST_USER2);
\OC_Group::createGroup(self::TEST_GROUP1);
+ \OC_Group::createGroup(self::TEST_GROUP1B);
\OC_Group::addToGroup(self::TEST_USER1, self::TEST_GROUP1);
+ \OC_Group::addToGroup(self::TEST_USER1, self::TEST_GROUP1B);
\OC_Group::createGroup(self::TEST_GROUP2);
+ \OC_Group::createGroup(self::TEST_GROUP2B);
\OC_Group::addToGroup(self::TEST_USER2, self::TEST_GROUP2);
+ \OC_Group::addToGroup(self::TEST_USER2, self::TEST_GROUP2B);
\OC_User::setUserId(self::TEST_USER1);
$this->userHome = \OC_User::getHome(self::TEST_USER1);
@@ -81,7 +87,9 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
\OC_User::deleteUser(self::TEST_USER2);
\OC_User::deleteUser(self::TEST_USER1);
\OC_Group::deleteGroup(self::TEST_GROUP1);
+ \OC_Group::deleteGroup(self::TEST_GROUP1B);
\OC_Group::deleteGroup(self::TEST_GROUP2);
+ \OC_Group::deleteGroup(self::TEST_GROUP2B);
@unlink($this->dataDir . '/mount.json');
@@ -635,4 +643,161 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
$this->assertEquals('ext', $config[1]['mountpoint']);
$this->assertEquals($options2, $config[1]['options']);
}
+
+ public function priorityDataProvider() {
+ return array(
+
+ // test 1 - group vs group
+ array(
+ array(
+ array(
+ 'isPersonal' => false,
+ 'mountType' => OC_Mount_Config::MOUNT_TYPE_GROUP,
+ 'applicable' => self::TEST_GROUP1,
+ 'priority' => 50
+ ),
+ array(
+ 'isPersonal' => false,
+ 'mountType' => OC_Mount_Config::MOUNT_TYPE_GROUP,
+ 'applicable' => self::TEST_GROUP1B,
+ 'priority' => 60
+ )
+ ),
+ 1
+ ),
+ // test 2 - user vs personal
+ array(
+ array(
+ array(
+ 'isPersonal' => false,
+ 'mountType' => OC_Mount_Config::MOUNT_TYPE_USER,
+ 'applicable' => self::TEST_USER1,
+ 'priority' => 2000
+ ),
+ array(
+ 'isPersonal' => true,
+ 'mountType' => OC_Mount_Config::MOUNT_TYPE_USER,
+ 'applicable' => self::TEST_USER1,
+ 'priority' => null
+ )
+ ),
+ 1
+ ),
+ // test 3 - all vs group vs user
+ array(
+ array(
+ array(
+ 'isPersonal' => false,
+ 'mountType' => OC_Mount_Config::MOUNT_TYPE_USER,
+ 'applicable' => 'all',
+ 'priority' => 70
+ ),
+ array(
+ 'isPersonal' => false,
+ 'mountType' => OC_Mount_Config::MOUNT_TYPE_GROUP,
+ 'applicable' => self::TEST_GROUP1,
+ 'priority' => 60
+ ),
+ array(
+ 'isPersonal' => false,
+ 'mountType' => OC_Mount_Config::MOUNT_TYPE_USER,
+ 'applicable' => self::TEST_USER1,
+ 'priority' => 50
+ )
+ ),
+ 2
+ )
+
+ );
+ }
+
+ /**
+ * Ensure priorities are being respected
+ * Test user is self::TEST_USER1
+ *
+ * @dataProvider priorityDataProvider
+ * @param array[] $mounts array of associative array of mount parameters:
+ * bool $isPersonal
+ * string $mountType
+ * string $applicable
+ * int|null $priority null for personal
+ * @param int $expected index of expected visible mount
+ */
+ public function testPriority($mounts, $expected) {
+ $mountConfig = array(
+ 'host' => 'somehost',
+ 'user' => 'someuser',
+ 'password' => 'somepassword',
+ 'root' => 'someroot'
+ );
+
+ // Add mount points
+ foreach($mounts as $i => $mount) {
+ $this->assertTrue(
+ OC_Mount_Config::addMountPoint(
+ '/ext',
+ '\OC\Files\Storage\SMB',
+ $mountConfig + array('id' => $i),
+ $mount['mountType'],
+ $mount['applicable'],
+ $mount['isPersonal'],
+ $mount['priority']
+ )
+ );
+ }
+
+ // Get mount points for user
+ $mountPoints = OC_Mount_Config::getAbsoluteMountPoints(self::TEST_USER1);
+
+ $this->assertEquals(1, count($mountPoints));
+ $this->assertEquals($expected, $mountPoints['/'.self::TEST_USER1.'/files/ext']['options']['id']);
+ }
+
+ /**
+ * Test for persistence of priority when changing mount options
+ */
+ public function testPriorityPersistence() {
+ $class = '\OC\Files\Storage\SMB';
+ $priority = 123;
+ $mountConfig = array(
+ 'host' => 'somehost',
+ 'user' => 'someuser',
+ 'password' => 'somepassword',
+ 'root' => 'someroot'
+ );
+
+ $this->assertTrue(
+ OC_Mount_Config::addMountPoint(
+ '/ext',
+ $class,
+ $mountConfig,
+ OC_Mount_Config::MOUNT_TYPE_USER,
+ self::TEST_USER1,
+ false,
+ $priority
+ )
+ );
+
+ // Check for correct priority
+ $mountPoints = OC_Mount_Config::getAbsoluteMountPoints(self::TEST_USER1);
+ $this->assertEquals($priority,
+ $mountPoints['/'.self::TEST_USER1.'/files/ext']['priority']);
+
+ // Simulate changed mount options (without priority set)
+ $this->assertTrue(
+ OC_Mount_Config::addMountPoint(
+ '/ext',
+ $class,
+ $mountConfig,
+ OC_Mount_Config::MOUNT_TYPE_USER,
+ self::TEST_USER1,
+ false
+ )
+ );
+
+ // Check for correct priority
+ $mountPoints = OC_Mount_Config::getAbsoluteMountPoints(self::TEST_USER1);
+ $this->assertEquals($priority,
+ $mountPoints['/'.self::TEST_USER1.'/files/ext']['priority']);
+ }
}
diff --git a/apps/files_sharing/ajax/list.php b/apps/files_sharing/ajax/list.php
index 4b645496253f704567b31e5895289e82dac105b0..93964c5ed5bdc0b45b6b5c07c9afaadf5e43b8c5 100644
--- a/apps/files_sharing/ajax/list.php
+++ b/apps/files_sharing/ajax/list.php
@@ -20,17 +20,10 @@
*
*/
-// only need filesystem apps
-$RUNTIME_APPTYPES=array('filesystem');
-
-// Init owncloud
-
-if(!\OC_App::isEnabled('files_sharing')){
- exit;
-}
+OCP\JSON::checkAppEnabled('files_sharing');
if(!isset($_GET['t'])){
- \OC_Response::setStatus(400); //400 Bad Request
+ \OC_Response::setStatus(\OC_Response::STATUS_BAD_REQUEST);
\OC_Log::write('core-preview', 'No token parameter was passed', \OC_Log::DEBUG);
exit;
}
@@ -47,6 +40,9 @@ if (isset($_GET['dir'])) {
$relativePath = $_GET['dir'];
}
+$sortAttribute = isset( $_GET['sort'] ) ? $_GET['sort'] : 'name';
+$sortDirection = isset( $_GET['sortdirection'] ) ? ($_GET['sortdirection'] === 'desc') : false;
+
$data = \OCA\Files_Sharing\Helper::setupFromToken($token, $relativePath, $password);
$linkItem = $data['linkItem'];
@@ -55,16 +51,15 @@ $dir = $data['realPath'];
$dir = \OC\Files\Filesystem::normalizePath($dir);
if (!\OC\Files\Filesystem::is_dir($dir . '/')) {
- \OC_Response::setStatus(404);
+ \OC_Response::setStatus(\OC_Response::STATUS_NOT_FOUND);
\OCP\JSON::error(array('success' => false));
exit();
}
$data = array();
-$baseUrl = OCP\Util::linkTo('files_sharing', 'index.php') . '?t=' . urlencode($token) . '&dir=';
// make filelist
-$files = \OCA\Files\Helper::getFiles($dir);
+$files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection);
$formattedFiles = array();
foreach ($files as $file) {
diff --git a/apps/files_sharing/ajax/publicpreview.php b/apps/files_sharing/ajax/publicpreview.php
index d8c892f1b7f952d2fae55e8e029475e8b4c50e7a..0b2af7a6e5960863fed90885dc10c1a2e7e044df 100644
--- a/apps/files_sharing/ajax/publicpreview.php
+++ b/apps/files_sharing/ajax/publicpreview.php
@@ -5,9 +5,8 @@
* later.
* See the COPYING-README file.
*/
-if(!\OC_App::isEnabled('files_sharing')){
- exit;
-}
+
+OCP\JSON::checkAppEnabled('files_sharing');
\OC_User::setIncognitoMode(true);
@@ -19,20 +18,20 @@ $token = array_key_exists('t', $_GET) ? (string) $_GET['t'] : '';
$keepAspect = array_key_exists('a', $_GET) ? true : false;
if($token === ''){
- \OC_Response::setStatus(400); //400 Bad Request
+ \OC_Response::setStatus(\OC_Response::STATUS_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_Response::setStatus(\OC_Response::STATUS_NOT_FOUND);
\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_Response::setStatus(\OC_Response::STATUS_INTERNAL_SERVER_ERROR);
\OC_Log::write('core-preview', 'Passed token seems to be valid, but it does not contain all necessary information . ("' . $token . '")', \OC_Log::WARN);
exit;
}
@@ -51,9 +50,9 @@ $pathInfo = $view->getFileInfo($path);
$sharedFile = null;
if($linkedItem['item_type'] === 'folder') {
- $isvalid = \OC\Files\Filesystem::isValidPath($file);
- if(!$isvalid) {
- \OC_Response::setStatus(400); //400 Bad Request
+ $isValid = \OC\Files\Filesystem::isValidPath($file);
+ if(!$isValid) {
+ \OC_Response::setStatus(\OC_Response::STATUS_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;
}
@@ -76,7 +75,7 @@ if ($keepAspect === true) {
}
if($maxX === 0 || $maxY === 0) {
- \OC_Response::setStatus(400); //400 Bad Request
+ \OC_Response::setStatus(\OC_Response::STATUS_BAD_REQUEST);
\OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG);
exit;
}
@@ -93,6 +92,6 @@ try{
$preview->showPreview();
} catch (\Exception $e) {
- \OC_Response::setStatus(500);
+ \OC_Response::setStatus(\OC_Response::STATUS_INTERNAL_SERVER_ERROR);
\OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG);
}
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 0ef34578117434b00b36cab65ec056fd9478f939..21b2646c5eade7a57cde704acf06e6cc346c08a9 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -1,4 +1,5 @@
<?php
+$l = OC_L10N::get('files_sharing');
OC::$CLASSPATH['OC_Share_Backend_File'] = 'files_sharing/lib/share/file.php';
OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'files_sharing/lib/share/folder.php';
@@ -9,6 +10,7 @@ OC::$CLASSPATH['OC\Files\Cache\Shared_Updater'] = 'files_sharing/lib/updater.php
OC::$CLASSPATH['OC\Files\Cache\Shared_Watcher'] = 'files_sharing/lib/watcher.php';
OC::$CLASSPATH['OCA\Files\Share\Api'] = 'files_sharing/lib/api.php';
OC::$CLASSPATH['OCA\Files\Share\Maintainer'] = 'files_sharing/lib/maintainer.php';
+OC::$CLASSPATH['OCA\Files\Share\Proxy'] = 'files_sharing/lib/proxy.php';
OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
@@ -18,3 +20,24 @@ OCP\Util::addScript('files_sharing', 'share');
\OC_Hook::connect('OC_Filesystem', 'delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook');
\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook');
\OC_Hook::connect('OC_Appconfig', 'post_set_value', '\OCA\Files\Share\Maintainer', 'configChangeHook');
+
+OC_FileProxy::register(new OCA\Files\Share\Proxy());
+
+\OCA\Files\App::getNavigationManager()->add(
+ array(
+ "id" => 'sharingin',
+ "appname" => 'files_sharing',
+ "script" => 'list.php',
+ "order" => 10,
+ "name" => $l->t('Shared with you')
+ )
+);
+\OCA\Files\App::getNavigationManager()->add(
+ array(
+ "id" => 'sharingout',
+ "appname" => 'files_sharing',
+ "script" => 'list.php',
+ "order" => 15,
+ "name" => $l->t('Shared with others')
+ )
+);
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index 9b42c1e17b5a8ff757517a2f79e845f2e841aff3..077433a53abc814586bf78f73f1f7b47eae33217 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -4,8 +4,8 @@
<name>Share Files</name>
<description>File sharing between users</description>
<licence>AGPL</licence>
- <author>Michael Gapczynski</author>
- <require>4.93</require>
+ <author>Michael Gapczynski, Bjoern Schiessle</author>
+ <requiremin>4.93</requiremin>
<shipped>true</shipped>
<default_enable/>
<types>
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 67d847019462d77f6ed4a7e1544d11eb38b8c39a..1bafb7807441cc96713ff3f97f35e1ab12ec93e3 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -1,7 +1,3 @@
-#controls {
- left: 0;
-}
-
#preview {
background: #fff;
text-align: center;
@@ -48,13 +44,6 @@ p.info a {
max-width:100%;
}
-/* some margin for the file type icon */
-#imgframe .publicpreview {
- margin-top: 10%;
-}
-
-
-
thead {
padding-left: 0 !important; /* fixes multiselect bar offset on shared page */
}
diff --git a/apps/files_sharing/css/sharedfilelist.css b/apps/files_sharing/css/sharedfilelist.css
new file mode 100644
index 0000000000000000000000000000000000000000..6b0c7d2226ed88fa8555a20c5844573cdc1ce1f4
--- /dev/null
+++ b/apps/files_sharing/css/sharedfilelist.css
@@ -0,0 +1,3 @@
+#filestable.shareList .summary .filesize {
+ display: none;
+}
diff --git a/apps/files_sharing/js/app.js b/apps/files_sharing/js/app.js
new file mode 100644
index 0000000000000000000000000000000000000000..3764328a5d04624107538433a2f272440d19e316
--- /dev/null
+++ b/apps/files_sharing/js/app.js
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+OCA.Sharing = {};
+OCA.Sharing.App = {
+
+ _inFileList: null,
+ _outFileList: null,
+
+ initSharingIn: function($el) {
+ if (this._inFileList) {
+ return this._inFileList;
+ }
+
+ this._inFileList = new OCA.Sharing.FileList(
+ $el,
+ {
+ scrollContainer: $('#app-content'),
+ sharedWithUser: true,
+ fileActions: this._createFileActions()
+ }
+ );
+
+ this._extendFileList(this._inFileList);
+ this._inFileList.appName = t('files_sharing', 'Shared with you');
+ this._inFileList.$el.find('#emptycontent').text(t('files_sharing', 'No files have been shared with you yet.'));
+ return this._inFileList;
+ },
+
+ initSharingOut: function($el) {
+ if (this._outFileList) {
+ return this._outFileList;
+ }
+ this._outFileList = new OCA.Sharing.FileList(
+ $el,
+ {
+ scrollContainer: $('#app-content'),
+ sharedWithUser: false,
+ fileActions: this._createFileActions()
+ }
+ );
+
+ this._extendFileList(this._outFileList);
+ this._outFileList.appName = t('files_sharing', 'Shared with others');
+ this._outFileList.$el.find('#emptycontent').text(t('files_sharing', 'You haven\'t shared any files yet.'));
+ return this._outFileList;
+ },
+
+ removeSharingIn: function() {
+ if (this._inFileList) {
+ this._inFileList.$fileList.empty();
+ }
+ },
+
+ removeSharingOut: function() {
+ if (this._outFileList) {
+ this._outFileList.$fileList.empty();
+ }
+ },
+
+ _createFileActions: function() {
+ // inherit file actions from the files app
+ var fileActions = new OCA.Files.FileActions();
+ // note: not merging the legacy actions because legacy apps are not
+ // compatible with the sharing overview and need to be adapted first
+ fileActions.registerDefaultActions();
+ fileActions.merge(OCA.Files.fileActions);
+
+ // when the user clicks on a folder, redirect to the corresponding
+ // folder in the files app instead of opening it directly
+ fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
+ OCA.Files.App.setActiveView('files', {silent: true});
+ OCA.Files.App.fileList.changeDirectory(context.$file.attr('data-path') + '/' + filename, true, true);
+ });
+ fileActions.setDefault('dir', 'Open');
+ return fileActions;
+ },
+
+ _extendFileList: function(fileList) {
+ // remove size column from summary
+ fileList.fileSummary.$el.find('.filesize').remove();
+ }
+};
+
+$(document).ready(function() {
+ $('#app-content-sharingin').on('show', function(e) {
+ OCA.Sharing.App.initSharingIn($(e.target));
+ });
+ $('#app-content-sharingin').on('hide', function() {
+ OCA.Sharing.App.removeSharingIn();
+ });
+ $('#app-content-sharingout').on('show', function(e) {
+ OCA.Sharing.App.initSharingOut($(e.target));
+ });
+ $('#app-content-sharingout').on('hide', function() {
+ OCA.Sharing.App.removeSharingOut();
+ });
+});
+
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 0b4dec817643ae7f5d03732ba9365f4ad64c5047..27e8d361ff9bd9d5387c88c35a77846a385d72dd 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -8,95 +8,181 @@
*
*/
-/* global OC, FileActions, FileList, Files */
+/* global FileActions, Files */
+/* global dragOptions, folderDropOptions */
+OCA.Sharing = {};
+if (!OCA.Files) {
+ OCA.Files = {};
+}
+OCA.Sharing.PublicApp = {
+ _initialized: false,
-$(document).ready(function() {
+ initialize: function($el) {
+ var self = this;
+ var fileActions;
+ if (this._initialized) {
+ return;
+ }
+ fileActions = new OCA.Files.FileActions();
+ // default actions
+ fileActions.registerDefaultActions();
+ // legacy actions
+ fileActions.merge(window.FileActions);
+ // regular actions
+ fileActions.merge(OCA.Files.fileActions);
- var mimetype = $('#mimetype').val();
+ this._initialized = true;
+ this.initialDir = $('#dir').val();
- if (typeof FileActions !== 'undefined') {
- // Show file preview if previewer is available, images are already handled by the template
- 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') {
- action($('#filename').val());
- }
+ // file list mode ?
+ if ($el.find('#filestable').length) {
+ this.fileList = new OCA.Files.FileList(
+ $el,
+ {
+ scrollContainer: $(window),
+ dragOptions: dragOptions,
+ folderDropOptions: folderDropOptions,
+ fileActions: fileActions
+ }
+ );
+ this.files = OCA.Files.Files;
+ this.files.initialize();
}
- }
- // dynamically load image previews
- if (mimetype.substr(0, mimetype.indexOf('/')) === 'image' ) {
+ var mimetype = $('#mimetype').val();
- var params = {
- x: $(document).width() * window.devicePixelRatio,
- a: 'true',
- file: encodeURIComponent($('#dir').val() + $('#filename').val()),
- t: $('#sharingToken').val()
- };
+ if (typeof FileActions !== 'undefined') {
+ // Show file preview if previewer is available, images are already handled by the template
+ 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') {
+ action($('#filename').val());
+ }
+ }
+ }
- var img = $('<img class="publicpreview">');
- img.attr('src', OC.filePath('files_sharing', 'ajax', 'publicpreview.php') + '?' + OC.buildQueryString(params));
- img.appendTo('#imgframe');
- }
+ // dynamically load image previews
+ if (mimetype.substr(0, mimetype.indexOf('/')) === 'image' ) {
- // override since the format is different
- if (typeof Files !== 'undefined') {
- Files.getDownloadUrl = function(filename, dir) {
- if ($.isArray(filename)) {
- filename = JSON.stringify(filename);
- }
- var path = dir || FileList.getCurrentDirectory();
var params = {
- service: 'files',
+ x: $(document).width() * window.devicePixelRatio,
+ a: 'true',
+ file: encodeURIComponent(this.initialDir + $('#filename').val()),
t: $('#sharingToken').val(),
- path: path,
- files: filename,
- download: null
+ scalingup: 0
};
- return OC.filePath('', '', 'public.php') + '?' + OC.buildQueryString(params);
- };
- Files.getAjaxUrl = function(action, params) {
- params = params || {};
- params.t = $('#sharingToken').val();
- return OC.filePath('files_sharing', 'ajax', action + '.php') + '?' + OC.buildQueryString(params);
- };
+ var img = $('<img class="publicpreview">');
+ img.attr('src', OC.filePath('files_sharing', 'ajax', 'publicpreview.php') + '?' + OC.buildQueryString(params));
+ img.appendTo('#imgframe');
+ }
- FileList.linkTo = function(dir) {
- var params = {
- service: 'files',
- t: $('#sharingToken').val(),
- dir: dir
+ if (this.fileList) {
+ // TODO: move this to a separate PublicFileList class that extends OCA.Files.FileList (+ unit tests)
+ this.fileList.getDownloadUrl = function(filename, dir) {
+ if ($.isArray(filename)) {
+ filename = JSON.stringify(filename);
+ }
+ var path = dir || FileList.getCurrentDirectory();
+ var params = {
+ service: 'files',
+ t: $('#sharingToken').val(),
+ path: path,
+ files: filename,
+ download: null
+ };
+ return OC.filePath('', '', 'public.php') + '?' + OC.buildQueryString(params);
};
- return OC.filePath('', '', 'public.php') + '?' + OC.buildQueryString(params);
- };
- Files.generatePreviewUrl = function(urlSpec) {
- urlSpec.t = $('#dirToken').val();
- return OC.generateUrl('/apps/files_sharing/ajax/publicpreview.php?') + $.param(urlSpec);
- };
+ this.fileList.getAjaxUrl = function(action, params) {
+ params = params || {};
+ params.t = $('#sharingToken').val();
+ return OC.filePath('files_sharing', 'ajax', action + '.php') + '?' + OC.buildQueryString(params);
+ };
- var file_upload_start = $('#file_upload_start');
- file_upload_start.on('fileuploadadd', function(e, data) {
- var fileDirectory = '';
- if(typeof data.files[0].relativePath !== 'undefined') {
- fileDirectory = data.files[0].relativePath;
- }
+ this.fileList.linkTo = function(dir) {
+ var params = {
+ service: 'files',
+ t: $('#sharingToken').val(),
+ dir: dir
+ };
+ return OC.filePath('', '', 'public.php') + '?' + OC.buildQueryString(params);
+ };
- // Add custom data to the upload handler
- data.formData = {
- requesttoken: $('#publicUploadRequestToken').val(),
- dirToken: $('#dirToken').val(),
- subdir: $('input#dir').val(),
- file_directory: fileDirectory
+ this.fileList.generatePreviewUrl = function(urlSpec) {
+ urlSpec.t = $('#dirToken').val();
+ return OC.generateUrl('/apps/files_sharing/ajax/publicpreview.php?') + $.param(urlSpec);
};
+
+ var file_upload_start = $('#file_upload_start');
+ file_upload_start.on('fileuploadadd', function(e, data) {
+ var fileDirectory = '';
+ if(typeof data.files[0].relativePath !== 'undefined') {
+ fileDirectory = data.files[0].relativePath;
+ }
+
+ // Add custom data to the upload handler
+ data.formData = {
+ requesttoken: $('#publicUploadRequestToken').val(),
+ dirToken: $('#dirToken').val(),
+ subdir: self.fileList.getCurrentDirectory(),
+ file_directory: fileDirectory
+ };
+ });
+
+ // do not allow sharing from the public page
+ delete this.fileList.fileActions.actions.all.Share;
+
+ this.fileList.changeDirectory(this.initialDir || '/', false, true);
+
+ // URL history handling
+ this.fileList.$el.on('changeDirectory', _.bind(this._onDirectoryChanged, this));
+ OC.Util.History.addOnPopStateHandler(_.bind(this._onUrlChanged, this));
+ }
+
+ $(document).on('click', '#directLink', function() {
+ $(this).focus();
+ $(this).select();
});
+
+ // legacy
+ window.FileList = this.fileList;
+ },
+
+ _onDirectoryChanged: function(e) {
+ OC.Util.History.pushState({
+ service: 'files',
+ t: $('#sharingToken').val(),
+ // arghhhh, why is this not called "dir" !?
+ path: e.dir
+ });
+ },
+
+ _onUrlChanged: function(params) {
+ this.fileList.changeDirectory(params.path || params.dir, false, true);
}
+};
- $(document).on('click', '#directLink', function() {
- $(this).focus();
- $(this).select();
+$(document).ready(function() {
+ var App = OCA.Sharing.PublicApp;
+ // defer app init, to give a chance to plugins to register file actions
+ _.defer(function() {
+ App.initialize($('#preview'));
});
+ if (window.Files) {
+ // HACK: for oc-dialogs previews that depends on Files:
+ Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
+ return App.fileList.lazyLoadPreview({
+ path: path,
+ mime: mime,
+ callback: ready,
+ width: width,
+ height: height,
+ etag: etag
+ });
+ };
+ }
});
+
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 3c7c9239a6cbf3f870a3a253936ffeb27983210d..5a42604c866dbc3c10d84a80f4897ac22e2fc783 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -8,63 +8,102 @@
*
*/
-/* global OC, t, FileList, FileActions */
$(document).ready(function() {
+ if (!_.isUndefined(OC.Share) && !_.isUndefined(OCA.Files)) {
+ // TODO: make a separate class for this or a hook or jQuery event ?
+ if (OCA.Files.FileList) {
+ var oldCreateRow = OCA.Files.FileList.prototype._createRow;
+ OCA.Files.FileList.prototype._createRow = function(fileData) {
+ var tr = oldCreateRow.apply(this, arguments);
+ if (fileData.shareOwner) {
+ tr.attr('data-share-owner', fileData.shareOwner);
+ // user should always be able to rename a mount point
+ if (fileData.isShareMountPoint) {
+ tr.attr('data-permissions', fileData.permissions | OC.PERMISSION_UPDATE);
+ tr.attr('data-reshare-permissions', fileData.permissions);
+ }
+ }
+ return tr;
+ };
+ }
- var disableSharing = $('#disableSharing').data('status'),
- sharesLoaded = false;
-
- if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !disableSharing) {
- var oldCreateRow = FileList._createRow;
- FileList._createRow = function(fileData) {
- var tr = oldCreateRow.apply(this, arguments);
- if (fileData.shareOwner) {
- tr.attr('data-share-owner', fileData.shareOwner);
- }
- return tr;
- };
-
- $('#fileList').on('fileActionsReady',function(){
-
- var allShared = $('#fileList').find('[data-share-owner] [data-Action="Share"]');
- allShared.addClass('permanent');
- allShared.find('span').text(function(){
- var $owner = $(this).closest('tr').attr('data-share-owner');
- return ' ' + t('files_sharing', 'Shared by {owner}', {owner: $owner});
+ // use delegate to catch the case with multiple file lists
+ $('#content').delegate('#fileList', 'fileActionsReady',function(ev){
+ // if no share action exists because the admin disabled sharing for this user
+ // we create a share notification action to inform the user about files
+ // shared with him otherwise we just update the existing share action.
+ var fileList = ev.fileList;
+ var $fileList = $(this);
+ $fileList.find('[data-share-owner]').each(function() {
+ var $tr = $(this);
+ var $action;
+ var owner;
+ var message;
+ var permissions = $tr.data('permissions');
+ if(permissions & OC.PERMISSION_SHARE) {
+ $action = $tr.find('[data-Action="Share"]');
+ $action.addClass('permanent');
+ owner = $tr.closest('tr').attr('data-share-owner');
+ message = ' ' + t('files_sharing', 'Shared by {owner}', {owner: owner});
+ $action.find('span').text(message);
+ } else {
+ var shareNotification = '<a class="action action-share-notification permanent"' +
+ ' data-action="Share-Notification" href="#" original-title="">' +
+ ' <img class="svg" src="' + OC.imagePath('core', 'actions/share') + '"></img>';
+ $tr.find('.fileactions').append(function() {
+ var owner = $(this).closest('tr').attr('data-share-owner');
+ var shareBy = t('files_sharing', 'Shared by {owner}', {owner: owner});
+ var $result = $(shareNotification + '<span> ' + shareBy + '</span></span>');
+ $result.on('click', function() {
+ return false;
+ });
+ return $result;
+ });
+ }
});
- if (!sharesLoaded){
- OC.Share.loadIcons('file');
+ if (!OCA.Sharing.sharesLoaded){
+ OC.Share.loadIcons('file', fileList);
// assume that we got all shares, so switching directories
// will not invalidate that list
- sharesLoaded = true;
+ OCA.Sharing.sharesLoaded = true;
}
else{
- OC.Share.updateIcons('file');
+ OC.Share.updateIcons('file', fileList);
}
});
- FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) {
- var tr = FileList.findFileEl(filename);
+ OCA.Files.fileActions.register(
+ 'all',
+ 'Share',
+ OC.PERMISSION_SHARE,
+ OC.imagePath('core', 'actions/share'),
+ function(filename, context) {
+
+ var $tr = context.$file;
var itemType = 'file';
- if ($(tr).data('type') == 'dir') {
+ if ($tr.data('type') === 'dir') {
itemType = 'folder';
}
- var possiblePermissions = $(tr).data('permissions');
- var appendTo = $(tr).find('td.filename');
+ var possiblePermissions = $tr.data('reshare-permissions');
+ if (_.isUndefined(possiblePermissions)) {
+ possiblePermissions = $tr.data('permissions');
+ }
+
+ var appendTo = $tr.find('td.filename');
// Check if drop down is already visible for a different file
if (OC.Share.droppedDown) {
- if ($(tr).data('id') != $('#dropdown').attr('data-item-source')) {
+ if ($tr.data('id') !== $('#dropdown').attr('data-item-source')) {
OC.Share.hideDropDown(function () {
- $(tr).addClass('mouseOver');
- OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions, filename);
+ $tr.addClass('mouseOver');
+ OC.Share.showDropDown(itemType, $tr.data('id'), appendTo, true, possiblePermissions, filename);
});
} else {
OC.Share.hideDropDown();
}
} else {
- $(tr).addClass('mouseOver');
- OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions, filename);
+ $tr.addClass('mouseOver');
+ OC.Share.showDropDown(itemType, $tr.data('id'), appendTo, true, possiblePermissions, filename);
}
});
}
diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
new file mode 100644
index 0000000000000000000000000000000000000000..ef1034ecfdc874b97a0334a07d351f337bb6df8b
--- /dev/null
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -0,0 +1,235 @@
+/*
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+(function() {
+
+ /**
+ * Sharing file list
+ *
+ * Contains both "shared with others" and "shared with you" modes.
+ */
+ var FileList = function($el, options) {
+ this.initialize($el, options);
+ };
+
+ FileList.prototype = _.extend({}, OCA.Files.FileList.prototype, {
+ appName: 'Shares',
+
+ /**
+ * Whether the list shows the files shared with the user (true) or
+ * the files that the user shared with others (false).
+ */
+ _sharedWithUser: false,
+
+ initialize: function($el, options) {
+ OCA.Files.FileList.prototype.initialize.apply(this, arguments);
+ if (this.initialized) {
+ return;
+ }
+
+ if (options && options.sharedWithUser) {
+ this._sharedWithUser = true;
+ }
+ },
+
+ _createRow: function(fileData) {
+ // TODO: hook earlier and render the whole row here
+ var $tr = OCA.Files.FileList.prototype._createRow.apply(this, arguments);
+ $tr.find('.filesize').remove();
+ $tr.find('td.date').before($tr.children('td:first'));
+ $tr.find('td.filename input:checkbox').remove();
+ $tr.attr('data-share-id', _.pluck(fileData.shares, 'id').join(','));
+ if (this._sharedWithUser) {
+ $tr.attr('data-share-owner', fileData.shares[0].ownerDisplayName);
+ }
+ return $tr;
+ },
+
+ /**
+ * Set whether the list should contain outgoing shares
+ * or incoming shares.
+ *
+ * @param state true for incoming shares, false otherwise
+ */
+ setSharedWithUser: function(state) {
+ this._sharedWithUser = !!state;
+ },
+
+ updateEmptyContent: function() {
+ var dir = this.getCurrentDirectory();
+ if (dir === '/') {
+ // root has special permissions
+ this.$el.find('#emptycontent').toggleClass('hidden', !this.isEmpty);
+ this.$el.find('#filestable thead th').toggleClass('hidden', this.isEmpty);
+ }
+ else {
+ OCA.Files.FileList.prototype.updateEmptyContent.apply(this, arguments);
+ }
+ },
+
+ getDirectoryPermissions: function() {
+ return OC.PERMISSION_READ | OC.PERMISSION_DELETE;
+ },
+
+ updateStorageStatistics: function() {
+ // no op because it doesn't have
+ // storage info like free space / used space
+ },
+
+ reload: function() {
+ var self = this;
+ this.showMask();
+ if (this._reloadCall) {
+ this._reloadCall.abort();
+ }
+ this._reloadCall = $.ajax({
+ url: OC.linkToOCS('apps/files_sharing/api/v1') + 'shares',
+ /* jshint camelcase: false */
+ data: {
+ format: 'json',
+ shared_with_me: !!this._sharedWithUser
+ },
+ type: 'GET',
+ beforeSend: function(xhr) {
+ xhr.setRequestHeader('OCS-APIREQUEST', 'true');
+ },
+ error: function(result) {
+ self.reloadCallback(result);
+ },
+ success: function(result) {
+ self.reloadCallback(result);
+ }
+ });
+ },
+
+ reloadCallback: function(result) {
+ delete this._reloadCall;
+ this.hideMask();
+
+ this.$el.find('#headerSharedWith').text(
+ t('files_sharing', this._sharedWithUser ? 'Shared by' : 'Shared with')
+ );
+ if (result.ocs && result.ocs.data) {
+ this.setFiles(this._makeFilesFromShares(result.ocs.data));
+ }
+ else {
+ // TODO: error handling
+ }
+ },
+
+ /**
+ * Converts the OCS API share response data to a file info
+ * list
+ * @param OCS API share array
+ * @return array of file info maps
+ */
+ _makeFilesFromShares: function(data) {
+ var self = this;
+ // OCS API uses non-camelcased names
+ var files = _.chain(data)
+ // convert share data to file data
+ .map(function(share) {
+ /* jshint camelcase: false */
+ var file = {
+ id: share.file_source,
+ mimetype: share.mimetype
+ };
+ if (share.item_type === 'folder') {
+ file.type = 'dir';
+ file.mimetype = 'httpd/unix-directory';
+ }
+ else {
+ file.type = 'file';
+ // force preview retrieval as we don't have mime types,
+ // the preview endpoint will fall back to the mime type
+ // icon if no preview exists
+ file.isPreviewAvailable = true;
+ file.icon = true;
+ }
+ file.share = {
+ id: share.id,
+ type: share.share_type,
+ target: share.share_with,
+ stime: share.stime * 1000,
+ };
+ if (self._sharedWithUser) {
+ file.share.ownerDisplayName = share.displayname_owner;
+ file.name = OC.basename(share.file_target);
+ file.path = OC.dirname(share.file_target);
+ file.permissions = share.permissions;
+ }
+ else {
+ file.share.targetDisplayName = share.share_with_displayname;
+ file.name = OC.basename(share.path);
+ file.path = OC.dirname(share.path);
+ file.permissions = OC.PERMISSION_ALL;
+ }
+ return file;
+ })
+ // Group all files and have a "shares" array with
+ // the share info for each file.
+ //
+ // This uses a hash memo to cumulate share information
+ // inside the same file object (by file id).
+ .reduce(function(memo, file) {
+ var data = memo[file.id];
+ var counterPart = file.share.ownerDisplayName || file.share.targetDisplayName;
+ if (!data) {
+ data = memo[file.id] = file;
+ data.shares = [file.share];
+ // using a hash to make them unique,
+ // this is only a list to be displayed
+ data.counterParts = {};
+ // counter is cheaper than calling _.keys().length
+ data.counterPartsCount = 0;
+ data.mtime = file.share.stime;
+ }
+ else {
+ // always take the most recent stime
+ if (file.share.stime > data.mtime) {
+ data.mtime = file.share.stime;
+ }
+ data.shares.push(file.share);
+ }
+
+ if (file.share.type === OC.Share.SHARE_TYPE_LINK) {
+ data.hasLinkShare = true;
+ } else if (counterPart && data.counterPartsCount < 10) {
+ // limit counterparts for output
+ data.counterParts[counterPart] = true;
+ data.counterPartsCount++;
+ }
+
+ delete file.share;
+ return memo;
+ }, {})
+ // Retrieve only the values of the returned hash
+ .values()
+ // Clean up
+ .each(function(data) {
+ // convert the counterParts map to a flat
+ // array of sorted names
+ data.counterParts = _.chain(data.counterParts).keys().sort().value();
+ if (data.hasLinkShare) {
+ data.counterParts.unshift(t('files_sharing', 'link'));
+ delete data.hasLinkShare;
+ }
+ delete data.counterPartsCount;
+ })
+ // Sort by expected sort comparator
+ .sortBy(this._sortComparator)
+ // Finish the chain by getting the result
+ .value();
+
+ return files;
+ }
+ });
+
+ OCA.Sharing.FileList = FileList;
+})();
diff --git a/apps/files_sharing/l10n/ast.php b/apps/files_sharing/l10n/ast.php
index d90df88723fa6b12a4d8ea4fb15b7678b7f6e926..fa3704ea6ba952ee11c55a72fd1e19f66d9237a2 100644
--- a/apps/files_sharing/l10n/ast.php
+++ b/apps/files_sharing/l10n/ast.php
@@ -1,7 +1,17 @@
<?php
$TRANSLATIONS = array(
"Shared by {owner}" => "CompartÃu por {owner}",
+"This share is password-protected" => "Esta compartición tien contraseña protexida",
+"The password is wrong. Try again." => "La contraseña ye incorreuta. Inténtalo otra vegada.",
"Password" => "Contraseña",
-"Download" => "Baxar"
+"Sorry, this link doesn’t seem to work anymore." => "SentÃmoslo, esti enllaz paez que yá nun furrula.",
+"Reasons might be:" => "Les razones pueden ser: ",
+"the item was removed" => "desanicióse l'elementu",
+"the link expired" => "l'enllaz caducó",
+"sharing is disabled" => "compartir ta desactiváu",
+"For more info, please ask the person who sent this link." => "Pa más información, entrúga-y a la persona qu'unvió esti enllaz",
+"Download" => "Baxar",
+"Download %s" => "Descargar %s",
+"Direct link" => "Enllaz direutu"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
index 03c2f844a14c283675515f3278e03f00e9d5075e..8be7bcb2a4bc36becae0106a03ca2331e7220508 100644
--- a/apps/files_sharing/l10n/eu.php
+++ b/apps/files_sharing/l10n/eu.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
"sharing is disabled" => "elkarbanatzea ez dago gaituta",
"For more info, please ask the person who sent this link." => "Informazio gehiagorako, mesedez eskatu lotura hau bidali zuen pertsonari",
"Download" => "Deskargatu",
+"Download %s" => "Deskargatu %s",
"Direct link" => "Lotura zuzena"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/fa.php b/apps/files_sharing/l10n/fa.php
index 1176401f1a30023e1f5dde3d03d1897386c7c495..fb6a4bc87098af7d1306b5e36ee1cfa366dfffb2 100644
--- a/apps/files_sharing/l10n/fa.php
+++ b/apps/files_sharing/l10n/fa.php
@@ -1,8 +1,17 @@
<?php
$TRANSLATIONS = array(
"Shared by {owner}" => "اشتراک گذارنده {owner}",
+"This share is password-protected" => "این اشتراک توسط رمز عبور Ù…ØاÙظت Ù…ÛŒ شود",
"The password is wrong. Try again." => "رمزعبور اشتباه Ù…ÛŒ باشد. دوباره امتØان کنید.",
"Password" => "گذرواژه",
-"Download" => "دانلود"
+"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." => "برای اطلاعات بیشتر، لطÙا از شخصی Ú©Ù‡ این پیوند را ارسال کرده سوال بÙرمایید.",
+"Download" => "دانلود",
+"Download %s" => "دانلود %s",
+"Direct link" => "پیوند مستقیم"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/km.php b/apps/files_sharing/l10n/km.php
index db353c9cb7486bab848fa80fc8854ee27ad1b0cf..75f5679d97a37016b9ecd20212a7ad05a83393e8 100644
--- a/apps/files_sharing/l10n/km.php
+++ b/apps/files_sharing/l10n/km.php
@@ -1,6 +1,17 @@
<?php
$TRANSLATIONS = array(
+"Shared by {owner}" => "{owner} បាន​ចែក​រំលែក",
+"This share is password-protected" => "ការ​ចែករំលែក​នáŸáŸ‡â€‹ážáŸ’រូវ​បាន​ការពារ​ដោយ​ពាក្យ​សម្ងាážáŸ‹",
+"The password is wrong. Try again." => "ពាក្យ​សម្ងាážáŸ‹â€‹ážáž»ážŸâ€‹áž ើយ។ ព្យាយាម​ម្ដង​ទៀážáŸ”",
"Password" => "ពាក្យសម្ងាážáŸ‹",
-"Download" => "ទាញយក"
+"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." => "សម្រាប់​ពáŸážáŸŒáž˜áž¶áž“​បន្ážáŸ‚ម សូម​សួរ​អ្នក​ដែល​ផ្ញើ​ážáŸ†ážŽâ€‹áž“áŸáŸ‡áŸ”",
+"Download" => "ទាញយក",
+"Download %s" => "ទាញយក %s",
+"Direct link" => "ážáŸ†ážŽâ€‹áž•áŸ’ទាល់"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/nb_NO.php b/apps/files_sharing/l10n/nb_NO.php
index 193ee7165ece8ec44d06bcee19a35a0805667937..3595a49cbf730c0e7902fe7103ea856ddeca94cd 100644
--- a/apps/files_sharing/l10n/nb_NO.php
+++ b/apps/files_sharing/l10n/nb_NO.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
"sharing is disabled" => "deling er deaktivert",
"For more info, please ask the person who sent this link." => "For mer informasjon, spør personen som sendte lenken.",
"Download" => "Last ned",
+"Download %s" => "Last ned %s",
"Direct link" => "Direkte lenke"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php
index 41c60d2ec8a3c710b8bf9c893701353450ab50b5..468bcdd85e6ecd0e6c0b5f2b2fac6e505ca53e5d 100644
--- a/apps/files_sharing/l10n/ru.php
+++ b/apps/files_sharing/l10n/ru.php
@@ -1,16 +1,17 @@
<?php
$TRANSLATIONS = array(
"Shared by {owner}" => "ДоÑтуп открыл {owner}",
-"This share is password-protected" => "Общий реÑÑƒÑ€Ñ Ð·Ð°Ñ‰Ð¸Ñ‰Ñ‘Ð½ паролем",
+"This share is password-protected" => "Ð”Ð»Ñ Ð´Ð¾Ñтупа к информации необходимо ввеÑти пароль",
"The password is wrong. Try again." => "Ðеверный пароль. Попробуйте еще раз.",
"Password" => "Пароль",
-"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" => "Ñрок ÑÑылки иÑтёк",
-"sharing is disabled" => "общий доÑтуп отключён",
-"For more info, please ask the person who sent this link." => "ПожалуйÑта, обратитеÑÑŒ к отправителю данной ÑÑылки.",
+"the link expired" => "Ñрок дейÑÑ‚Ð²Ð¸Ñ ÑÑылки иÑтёк",
+"sharing is disabled" => "доÑтуп к информации заблокирован",
+"For more info, please ask the person who sent this link." => "Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации, пожалуйÑта, ÑвÑжитеÑÑŒ Ñ Ñ‚ÐµÐ¼, кто отправил Вам Ñту ÑÑылку.",
"Download" => "Скачать",
+"Download %s" => "Скачать %s",
"Direct link" => "ПрÑÐ¼Ð°Ñ ÑÑылка"
);
$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_sharing/l10n/ur_PK.php b/apps/files_sharing/l10n/ur_PK.php
index 4f6767c26a136e2c22a894ee0ab5ecd31ccedb3b..b0b90367771436d87d505ebb24b9b4248b8a9c62 100644
--- a/apps/files_sharing/l10n/ur_PK.php
+++ b/apps/files_sharing/l10n/ur_PK.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"Password" => "پاسورڈ"
+"Password" => "پاسورڈ",
+"Download" => "ڈاؤن لوڈ،"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/zh_CN.php b/apps/files_sharing/l10n/zh_CN.php
index 3178b28405856363d7dea7748881cd3e68bc4b71..5cc95b71af70204b59858c9a2e39cce8c74a27f4 100644
--- a/apps/files_sharing/l10n/zh_CN.php
+++ b/apps/files_sharing/l10n/zh_CN.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
"sharing is disabled" => "共享已ç¦ç”¨",
"For more info, please ask the person who sent this link." => "欲知详情，请è”ç³»å‘ç»™ä½ é“¾æŽ¥çš„äººã€‚",
"Download" => "下载",
+"Download %s" => "下载 %s",
"Direct link" => "直接链接"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/lib/api.php b/apps/files_sharing/lib/api.php
index 438d3cc4ba3702e23cc698b201b2a64275ff2866..dc4e5cf6c49f03ad1b69782f49fcd92cf4c5ddf0 100644
--- a/apps/files_sharing/lib/api.php
+++ b/apps/files_sharing/lib/api.php
@@ -25,12 +25,15 @@ namespace OCA\Files\Share;
class Api {
/**
- * @brief get all shares
+ * get all shares
*
* @param array $params option 'file' to limit the result to a specific file/folder
* @return \OC_OCS_Result share information
*/
public static function getAllShares($params) {
+ if (isset($_GET['shared_with_me']) && $_GET['shared_with_me'] !== 'false') {
+ return self::getFilesSharedWithMe();
+ }
// if a file is specified, get the share for this file
if (isset($_GET['path'])) {
$params['itemSource'] = self::getFileId($_GET['path']);
@@ -49,18 +52,26 @@ class Api {
return self::collectShares($params);
}
- $share = \OCP\Share::getItemShared('file', null);
+ $shares = \OCP\Share::getItemShared('file', null);
- if ($share === false) {
+ if ($shares === false) {
return new \OC_OCS_Result(null, 404, 'could not get shares');
} else {
- return new \OC_OCS_Result($share);
+ foreach ($shares as &$share) {
+ // file_target might not be set if the target user hasn't mounted
+ // the filesystem yet
+ if ($share['item_type'] === 'file' && isset($share['file_target'])) {
+ $share['mimetype'] = \OC_Helper::getFileNameMimeType($share['file_target']);
+ }
+ $newShares[] = $share;
+ }
+ return new \OC_OCS_Result($shares);
}
}
/**
- * @brief get share information for a given share
+ * get share information for a given share
*
* @param array $params which contains a 'id'
* @return \OC_OCS_Result share information
@@ -76,7 +87,7 @@ class Api {
}
/**
- * @brief collect all share information, either of a specific share or all
+ * collect all share information, either of a specific share or all
* shares for a given path
* @param array $params
* @return \OC_OCS_Result
@@ -130,7 +141,7 @@ class Api {
}
/**
- * @brief add reshares to a array of shares
+ * add reshares to a array of shares
* @param array $shares array of shares
* @param int $itemSource item source ID
* @return array new shares array which includes reshares
@@ -161,7 +172,7 @@ class Api {
}
/**
- * @brief get share from all files in a given folder (non-recursive)
+ * get share from all files in a given folder (non-recursive)
* @param array $params contains 'path' to the folder
* @return \OC_OCS_Result
*/
@@ -196,7 +207,28 @@ class Api {
}
/**
- * @breif create a new share
+ * get files shared with the user
+ * @return \OC_OCS_Result
+ */
+ private static function getFilesSharedWithMe() {
+ try {
+ $shares = \OCP\Share::getItemsSharedWith('file');
+ foreach ($shares as &$share) {
+ if ($share['item_type'] === 'file') {
+ $share['mimetype'] = \OC_Helper::getFileNameMimeType($share['file_target']);
+ }
+ }
+ $result = new \OC_OCS_Result($shares);
+ } catch (\Exception $e) {
+ $result = new \OC_OCS_Result(null, 403, $e->getMessage());
+ }
+
+ return $result;
+
+ }
+
+ /**
+ * create a new share
* @param array $params
* @return \OC_OCS_Result
*/
@@ -313,7 +345,7 @@ class Api {
}
/**
- * @brief update permissions for a share
+ * update permissions for a share
* @param array $share information about the share
* @param array $params contains 'permissions'
* @return \OC_OCS_Result
@@ -358,7 +390,7 @@ class Api {
}
/**
- * @brief enable/disable public upload
+ * enable/disable public upload
* @param array $share information about the share
* @param array $params contains 'publicUpload' which can be 'yes' or 'no'
* @return \OC_OCS_Result
@@ -384,9 +416,9 @@ class Api {
}
/**
- * @brief update password for public link share
+ * update password for public link share
* @param array $share information about the share
- * @param type $params 'password'
+ * @param array $params 'password'
* @return \OC_OCS_Result
*/
private static function updatePassword($share, $params) {
@@ -418,13 +450,18 @@ class Api {
return new \OC_OCS_Result(null, 404, "share doesn't exists, can't change password");
}
- $result = \OCP\Share::shareItem(
- $itemType,
- $itemSource,
- \OCP\Share::SHARE_TYPE_LINK,
- $shareWith,
- $permissions
- );
+ try {
+ $result = \OCP\Share::shareItem(
+ $itemType,
+ $itemSource,
+ \OCP\Share::SHARE_TYPE_LINK,
+ $shareWith,
+ $permissions
+ );
+ } catch (\Exception $e) {
+ return new \OC_OCS_Result(null, 403, $e->getMessage());
+ }
+
if($result) {
return new \OC_OCS_Result();
}
@@ -433,7 +470,7 @@ class Api {
}
/**
- * @brief unshare a file/folder
+ * unshare a file/folder
* @param array $params contains the shareID 'id' which should be unshared
* @return \OC_OCS_Result
*/
@@ -473,7 +510,7 @@ class Api {
}
/**
- * @brief get file ID from a given path
+ * get file ID from a given path
* @param string $path
* @return string fileID or null
*/
@@ -490,7 +527,7 @@ class Api {
}
/**
- * @brief get itemType
+ * get itemType
* @param string $path
* @return string type 'file', 'folder' or null of file/folder doesn't exists
*/
@@ -508,7 +545,7 @@ class Api {
}
/**
- * @brief get some information from a given share
+ * get some information from a given share
* @param int $shareID
* @return array with: item_source, share_type, share_with, item_type, permissions
*/
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 1f316301c47d13d0c0b597f0e8338117dc79dd23..9d83ed13b87a2be161611303e97a1a918d68ac4d 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -42,7 +42,7 @@ class Shared_Cache extends Cache {
}
/**
- * @brief Get the source cache of a shared file or folder
+ * Get the source cache of a shared file or folder
* @param string $target Shared target file path
* @return \OC\Files\Cache\Cache
*/
@@ -80,7 +80,7 @@ class Shared_Cache extends Cache {
/**
* get the stored metadata of a file or folder
*
- * @param string /int $file
+ * @param string|int $file
* @return array
*/
public function get($file) {
@@ -424,7 +424,7 @@ class Shared_Cache extends Cache {
*
* @param int $id
* @param string $pathEnd (optional) used internally for recursive calls
- * @return string | null
+ * @return string|null
*/
public function getPathById($id, $pathEnd = '') {
// direct shares are easy
@@ -442,6 +442,9 @@ class Shared_Cache extends Cache {
}
}
+ /**
+ * @param integer $id
+ */
private function getShareById($id) {
$item = \OCP\Share::getItemSharedWithBySource('file', $id);
if ($item) {
@@ -454,6 +457,9 @@ class Shared_Cache extends Cache {
return null;
}
+ /**
+ * @param integer $id
+ */
private function getParentInfo($id) {
$sql = 'SELECT `parent`, `name` FROM `*PREFIX*filecache` WHERE `fileid` = ?';
$query = \OC_DB::prepare($sql);
diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php
index cc1f7d9ffdf5bd1d55b48d65ee74f98f337b6270..49546f012a63e87b7535ca8d4017cd6c3efd8cee 100644
--- a/apps/files_sharing/lib/helper.php
+++ b/apps/files_sharing/lib/helper.php
@@ -79,7 +79,7 @@ class Helper {
* @param array $linkItem link item array
* @param string $password optional password
*
- * @return true if authorized, false otherwise
+ * @return boolean true if authorized, false otherwise
*/
public static function authenticate($linkItem, $password) {
if ($password !== null) {
@@ -125,9 +125,13 @@ class Helper {
$ids = array();
- while ($path !== '' && $path !== '.' && $path !== '/') {
+ while ($path !== dirname($path)) {
$info = $ownerView->getFileInfo($path);
- $ids[] = $info['fileid'];
+ if ($info instanceof \OC\Files\FileInfo) {
+ $ids[] = $info['fileid'];
+ } else {
+ \OCP\Util::writeLog('sharing', 'No fileinfo available for: ' . $path, \OCP\Util::WARN);
+ }
$path = dirname($path);
}
@@ -158,7 +162,7 @@ class Helper {
}
/**
- * @brief Format a path to be relative to the /user/files/ directory
+ * Format a path to be relative to the /user/files/ directory
* @param string $path the absolute path
* @return string e.g. turns '/admin/files/test.txt' into 'test.txt'
*/
@@ -176,4 +180,26 @@ class Helper {
return $relPath;
}
+
+ /**
+ * check if file name already exists and generate unique target
+ *
+ * @param string $path
+ * @param array $excludeList
+ * @param \OC\Files\View $view
+ * @return string $path
+ */
+ public static function generateUniqueTarget($path, $excludeList, $view) {
+ $pathinfo = pathinfo($path);
+ $ext = (isset($pathinfo['extension'])) ? '.'.$pathinfo['extension'] : '';
+ $name = $pathinfo['filename'];
+ $dir = $pathinfo['dirname'];
+ $i = 2;
+ while ($view->file_exists($path) || in_array($path, $excludeList)) {
+ $path = \OC\Files\Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
+ $i++;
+ }
+
+ return $path;
+ }
}
diff --git a/apps/files_sharing/lib/maintainer.php b/apps/files_sharing/lib/maintainer.php
index bbb3268410e641a9309edf7e0f828b2ceb530976..f07c09e5aee48b85f1b079623d785f07d3d6cd6e 100644
--- a/apps/files_sharing/lib/maintainer.php
+++ b/apps/files_sharing/lib/maintainer.php
@@ -33,7 +33,7 @@ class Maintainer {
* Keeps track of the "allow links" config setting
* and removes all link shares if the config option is set to "no"
*
- * @param array with app, key, value as named values
+ * @param array $params array with app, key, value as named values
*/
static public function configChangeHook($params) {
if($params['app'] === 'core' && $params['key'] === 'shareapi_allow_links' && $params['value'] === 'no') {
diff --git a/apps/files_sharing/lib/permissions.php b/apps/files_sharing/lib/permissions.php
index c3ad63e2fd26b6ab8725d3b9619151ea85beea87..f32ebabe40d4763821d0824be65b11d0cd045b99 100644
--- a/apps/files_sharing/lib/permissions.php
+++ b/apps/files_sharing/lib/permissions.php
@@ -30,6 +30,7 @@ class Shared_Permissions extends Permissions {
* @return int (-1 if file no permissions set)
*/
public function get($fileId, $user) {
+
if ($fileId == -1) {
// if we ask for the mount point return -1 so that we can get the correct
// permissions by the path, with the root fileId we have no idea which share is meant
@@ -37,11 +38,14 @@ class Shared_Permissions extends Permissions {
}
$source = \OCP\Share::getItemSharedWithBySource('file', $fileId, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE,
null, true);
+
+ $permission = -1;
+
if ($source) {
- return $source['permissions'];
- } else {
- return -1;
+ $permission = $this->updatePermissions($source['permissions']);
}
+
+ return $permission;
}
/**
@@ -55,7 +59,7 @@ class Shared_Permissions extends Permissions {
$source = \OCP\Share::getItemSharedWithBySource('file', $fileId, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE,
null, false);
if ($source) {
- return $source['permissions'];
+ return $this->updatePermissions($source['permissions']);
} else {
return -1;
}
@@ -106,7 +110,7 @@ class Shared_Permissions extends Permissions {
$result = $query->execute(array($parentId));
$filePermissions = array();
while ($row = $result->fetchRow()) {
- $filePermissions[$row['fileid']] = $permissions;
+ $filePermissions[$row['fileid']] = $this->updatePermissions($permissions);
}
return $filePermissions;
}
diff --git a/apps/files_sharing/lib/proxy.php b/apps/files_sharing/lib/proxy.php
new file mode 100644
index 0000000000000000000000000000000000000000..f595328cc63f9797528b0d5400fa134eaa1027fe
--- /dev/null
+++ b/apps/files_sharing/lib/proxy.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2014 Bjoern Schiessle <schiessle@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 OCA\Files\Share;
+
+class Proxy extends \OC_FileProxy {
+
+ /**
+ * check if the deleted folder contains share mount points and move them
+ * up to the parent
+ *
+ * @param string $path
+ */
+ public function preUnlink($path) {
+ $this->moveMountPointsUp($path);
+ }
+
+ /**
+ * check if the deleted folder contains share mount points and move them
+ * up to the parent
+ *
+ * @param string $path
+ */
+ public function preRmdir($path) {
+ $this->moveMountPointsUp($path);
+ }
+
+ /**
+ * move share mount points up to the parent
+ *
+ * @param string $path
+ */
+ private function moveMountPointsUp($path) {
+ $view = new \OC\Files\View('/');
+
+ // find share mount points within $path and move them up to the parent folder
+ // before we delete $path
+ $mountManager = \OC\Files\Filesystem::getMountManager();
+ $mountedShares = $mountManager->findIn($path);
+ foreach ($mountedShares as $mount) {
+ if ($mount->getStorage()->instanceOfStorage('\OC\Files\Storage\Shared')) {
+ $mountPoint = $mount->getMountPoint();
+ $mountPointName = $mount->getMountPointName();
+ $target = \OCA\Files_Sharing\Helper::generateUniqueTarget(dirname($path) . '/' . $mountPointName, array(), $view);
+ $view->rename($mountPoint, $target);
+ }
+ }
+ }
+
+}
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index c0c9e0c107eda3fd543af9cf3a1ba41a65c042ee..91595461a618c2935e07284a5ff4eb68dcd5ce6a 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -33,10 +33,12 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
private $path;
public function isValidSource($itemSource, $uidOwner) {
- $query = \OC_DB::prepare('SELECT `name` FROM `*PREFIX*filecache` WHERE `fileid` = ?');
- $result = $query->execute(array($itemSource));
- if ($row = $result->fetchRow()) {
- $this->path = $row['name'];
+ $path = \OC\Files\Filesystem::getPath($itemSource);
+ if ($path) {
+ // FIXME: attributes should not be set here,
+ // keeping this pattern for now to avoid unexpected
+ // regressions
+ $this->path = basename($path);
return true;
}
return false;
@@ -52,7 +54,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
}
/**
- * @brief create unique target
+ * create unique target
* @param string $filePath
* @param string $shareWith
* @param string $exclude
@@ -73,16 +75,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
$excludeList = array_merge($excludeList, $exclude);
}
- $pathinfo = pathinfo($target);
- $ext = (isset($pathinfo['extension'])) ? '.'.$pathinfo['extension'] : '';
- $name = $pathinfo['filename'];
- $i = 2;
- while ($view->file_exists($target) || in_array($target, $excludeList)) {
- $target = '/' . $name . ' ('.$i.')' . $ext;
- $i++;
- }
-
- return $target;
+ return \OCA\Files_Sharing\Helper::generateUniqueTarget($target, $excludeList, $view);
}
public function formatItems($items, $format, $parameters = null) {
@@ -152,7 +145,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
}
/**
- * @brief resolve reshares to return the correct source item
+ * resolve reshares to return the correct source item
* @param array $source
* @return array source item
*/
@@ -181,8 +174,13 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
return $source;
}
+ /**
+ * @param string $target
+ * @param string $mountPoint
+ * @param string $itemType
+ * @return array|false source item
+ */
public static function getSource($target, $mountPoint, $itemType) {
-
if ($itemType === 'folder') {
$source = \OCP\Share::getItemSharedWith('folder', $mountPoint, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
if ($source && $target !== '') {
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 4733dff3d14b997eb20ca30481f04b05d664e7e6..a7dd2b3afa1df6c78a03c484b0d9130a7d0db60c 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -36,7 +36,7 @@ class Shared extends \OC\Files\Storage\Common {
}
/**
- * @breif get id of the mount point
+ * get id of the mount point
* @return string
*/
public function getId() {
@@ -44,7 +44,7 @@ class Shared extends \OC\Files\Storage\Common {
}
/**
- * @breif get file cache of the shared item source
+ * get file cache of the shared item source
* @return string
*/
public function getSourceId() {
@@ -52,9 +52,8 @@ class Shared extends \OC\Files\Storage\Common {
}
/**
- * @brief Get the source file path, permissions, and owner for a shared file
- * @param string Shared target file path
- * @param string $target
+ * Get the source file path, permissions, and owner for a shared file
+ * @param string $target Shared target file path
* @return Returns array with the keys path, permissions, and owner or false if not found
*/
public function getFile($target) {
@@ -76,9 +75,8 @@ class Shared extends \OC\Files\Storage\Common {
}
/**
- * @brief Get the source file path for a shared file
- * @param string Shared target file path
- * @param string $target
+ * Get the source file path for a shared file
+ * @param string $target Shared target file path
* @return string source file path or false if not found
*/
public function getSourcePath($target) {
@@ -100,16 +98,22 @@ class Shared extends \OC\Files\Storage\Common {
}
/**
- * @brief Get the permissions granted for a shared file
- * @param string Shared target file path
- * @return int CRUDS permissions granted or false if not found
+ * Get the permissions granted for a shared file
+ * @param string $target Shared target file path
+ * @return int CRUDS permissions granted
*/
public function getPermissions($target) {
- $source = $this->getFile($target);
- if ($source) {
- return $source['permissions'];
+ $permissions = $this->share['permissions'];
+ // part file are always have delete permissions
+ if (pathinfo($target, PATHINFO_EXTENSION) === 'part') {
+ $permissions |= \OCP\PERMISSION_DELETE;
}
- return false;
+
+ if (\OC_Util::isSharingDisabledForUser()) {
+ $permissions &= ~\OCP\PERMISSION_SHARE;
+ }
+
+ return $permissions;
}
public function mkdir($path) {
@@ -173,19 +177,12 @@ class Shared extends \OC\Files\Storage\Common {
}
public function filesize($path) {
- if ($path == '' || $path == '/' || $this->is_dir($path)) {
- return 0;
- } else if ($source = $this->getSourcePath($path)) {
- list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($source);
- return $storage->filesize($internalPath);
- }
- return false;
+ $source = $this->getSourcePath($path);
+ list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($source);
+ return $storage->filesize($internalPath);
}
public function isCreatable($path) {
- if ($path == '') {
- $path = $this->getMountPoint();
- }
return ($this->getPermissions($path) & \OCP\PERMISSION_CREATE);
}
@@ -194,22 +191,16 @@ class Shared extends \OC\Files\Storage\Common {
}
public function isUpdatable($path) {
- if ($path == '') {
- $path = $this->getMountPoint();
- }
return ($this->getPermissions($path) & \OCP\PERMISSION_UPDATE);
}
public function isDeletable($path) {
- if ($path == '') {
- $path = $this->getMountPoint();
- }
return ($this->getPermissions($path) & \OCP\PERMISSION_DELETE);
}
public function isSharable($path) {
- if ($path == '') {
- $path = $this->getMountPoint();
+ if (\OCP\Util::isSharingDisabledForUser()) {
+ return false;
}
return ($this->getPermissions($path) & \OCP\PERMISSION_SHARE);
}
@@ -276,7 +267,7 @@ class Shared extends \OC\Files\Storage\Common {
}
/**
- * @brief Format a path to be relative to the /user/files/ directory
+ * Format a path to be relative to the /user/files/ directory
* @param string $path the absolute path
* @return string e.g. turns '/admin/files/test.txt' into '/test.txt'
*/
@@ -300,7 +291,7 @@ class Shared extends \OC\Files\Storage\Common {
}
/**
- * @brief rename a shared folder/file
+ * rename a shared folder/file
* @param string $sourcePath
* @param string $targetPath
* @return bool
@@ -309,7 +300,7 @@ class Shared extends \OC\Files\Storage\Common {
// it shouldn't be possible to move a Shared storage into another one
list($targetStorage, ) = \OC\Files\Filesystem::resolvePath($targetPath);
- if ($targetStorage instanceof \OC\Files\Storage\Shared) {
+ if ($targetStorage->instanceOfStorage('\OC\Files\Storage\Shared')) {
\OCP\Util::writeLog('file sharing',
'It is not allowed to move one mount point into another one',
\OCP\Util::DEBUG);
@@ -318,27 +309,12 @@ class Shared extends \OC\Files\Storage\Common {
$relTargetPath = $this->stripUserFilesPath($targetPath);
- // if the user renames a mount point from a group share we need to create a new db entry
- // for the unique name
- if ($this->getShareType() === \OCP\Share::SHARE_TYPE_GROUP && $this->uniqueNameSet() === false) {
- $query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`,'
- .' `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`,'
- .' `file_target`, `token`, `parent`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)');
- $arguments = array($this->share['item_type'], $this->share['item_source'], $this->share['item_target'],
- 2, \OCP\User::getUser(), $this->share['uid_owner'], $this->share['permissions'], $this->share['stime'], $this->share['file_source'],
- $relTargetPath, $this->share['token'], $this->share['id']);
-
- } else {
- // rename mount point
- $query = \OC_DB::prepare(
- 'Update `*PREFIX*share`
- SET `file_target` = ?
- WHERE `id` = ?'
- );
- $arguments = array($relTargetPath, $this->getShareId());
+ if ($relTargetPath === false) {
+ \OCP\Util::writeLog('file sharing', 'Wrong target path given: ' . $targetPath, \OCP\Util::ERROR);
+ return false;
}
- $result = $query->execute($arguments);
+ $result = self::updateFileTarget($relTargetPath, $this->share);
if ($result) {
// update the mount manager with the new paths
@@ -356,9 +332,39 @@ class Shared extends \OC\Files\Storage\Common {
\OCP\Util::ERROR);
}
- return $result;
+ return (bool)$result;
}
+ /**
+ * @update fileTarget in the database if the mount point changed
+ * @param string $newPath
+ * @param array $share reference to the share which should be modified
+ * @return type
+ */
+ private static function updateFileTarget($newPath, &$share) {
+ // if the user renames a mount point from a group share we need to create a new db entry
+ // for the unique name
+ if ($share['share_type'] === \OCP\Share::SHARE_TYPE_GROUP &&
+ (isset($share['unique_name']) && $share['unique_name'])) {
+ $query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`,'
+ .' `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`,'
+ .' `file_target`, `token`, `parent`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)');
+ $arguments = array($share['item_type'], $share['item_source'], $share['item_target'],
+ 2, \OCP\User::getUser(), $share['uid_owner'], $share['permissions'], $share['stime'], $share['file_source'],
+ $newPath, $share['token'], $share['id']);
+
+ } else {
+ // rename mount point
+ $query = \OC_DB::prepare(
+ 'Update `*PREFIX*share`
+ SET `file_target` = ?
+ WHERE `id` = ?'
+ );
+ $arguments = array($newPath, $share['id']);
+ }
+
+ return $query->execute($arguments);
+ }
public function rename($path1, $path2) {
@@ -454,9 +460,6 @@ class Shared extends \OC\Files\Storage\Common {
}
public function free_space($path) {
- if ($path == '') {
- $path = $this->getMountPoint();
- }
$source = $this->getSourcePath($path);
if ($source) {
list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($source);
@@ -487,6 +490,7 @@ class Shared extends \OC\Files\Storage\Common {
|| $shares
) {
foreach ($shares as $share) {
+ self::verifyMountPoint($share);
\OC\Files\Filesystem::mount('\OC\Files\Storage\Shared',
array(
'share' => $share,
@@ -497,19 +501,39 @@ class Shared extends \OC\Files\Storage\Common {
}
/**
- * @brief return mount point of share, relative to data/user/files
- * @return string
+ * check if the parent folder exists otherwise move the mount point up
+ *
+ * @param array $share reference to the share we want to check
*/
- public function getMountPoint() {
- return $this->share['file_target'];
+ private static function verifyMountPoint(&$share) {
+ $mountPoint = basename($share['file_target']);
+ $parent = dirname($share['file_target']);
+
+ while (!\OC\Files\Filesystem::is_dir($parent)) {
+ $parent = dirname($parent);
+ }
+
+ $newMountPoint = \OCA\Files_Sharing\Helper::generateUniqueTarget(
+ \OC\Files\Filesystem::normalizePath($parent . '/' . $mountPoint),
+ array(),
+ new \OC\Files\View('/' . \OCP\User::getUser() . '/files')
+ );
+
+ if($newMountPoint !== $share['file_target']) {
+
+ self::updateFileTarget($newMountPoint, $share);
+ $share['file_target'] = $newMountPoint;
+
+ }
}
/**
- * @brief get share type
- * @return integer can be single user share (0) group share (1), unique group share name (2)
+ * return mount point of share, relative to data/user/files
+ *
+ * @return string
*/
- private function getShareType() {
- return $this->share['share_type'];
+ public function getMountPoint() {
+ return $this->share['file_target'];
}
private function setMountPoint($path) {
@@ -517,30 +541,17 @@ class Shared extends \OC\Files\Storage\Common {
}
/**
- * @brief does the group share already has a user specific unique name
- * @return bool
- */
- private function uniqueNameSet() {
- return (isset($this->share['unique_name']) && $this->share['unique_name']);
- }
-
- /**
+ * the share now uses a unique name of this user
+ *
* @brief the share now uses a unique name of this user
*/
private function setUniqueName() {
$this->share['unique_name'] = true;
}
- /**
- * @brief get share ID
- * @return integer unique share ID
- */
- private function getShareId() {
- return $this->share['id'];
- }
-
/**
* @brief get the user who shared the file
+ *
* @return string
*/
public function getSharedFrom() {
@@ -548,7 +559,7 @@ class Shared extends \OC\Files\Storage\Common {
}
/**
- * @brief return share type, can be "file" or "folder"
+ * return share type, can be "file" or "folder"
* @return string
*/
public function getItemType() {
diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php
index f7c0a75aeeb200e5c1ce17218958fa1699c989bd..5cb2b638e5a67dcd5d21c3070ae360fb67cb73b6 100644
--- a/apps/files_sharing/lib/updater.php
+++ b/apps/files_sharing/lib/updater.php
@@ -27,7 +27,7 @@ class Shared_Updater {
static private $toRemove = array();
/**
- * @brief walk up the users file tree and update the etags
+ * walk up the users file tree and update the etags
* @param string $user
* @param string $path
*/
@@ -38,14 +38,13 @@ class Shared_Updater {
\OC\Files\Filesystem::initMountPoints($user);
$view = new \OC\Files\View('/' . $user);
if ($view->file_exists($path)) {
- while ($path !== '/') {
+ while ($path !== dirname($path)) {
$etag = $view->getETag($path);
$view->putFileInfo($path, array('etag' => $etag));
$path = dirname($path);
}
} else {
- error_log("error!" . 'can not update etags on ' . $path . ' for user ' . $user);
- \OCP\Util::writeLog('files_sharing', 'can not update etags on ' . $path . ' for user ' . $user, \OCP\Util::ERROR);
+ \OCP\Util::writeLog('files_sharing', 'can not update etags on ' . $path . ' for user ' . $user . '. Path does not exists', \OCP\Util::DEBUG);
}
}
@@ -55,6 +54,12 @@ class Shared_Updater {
* @param string $target
*/
static public function correctFolders($target) {
+
+ // ignore part files
+ if (pathinfo($target, PATHINFO_EXTENSION) === 'part') {
+ return false;
+ }
+
// Correct Shared folders of other users shared with
$shares = \OCA\Files_Sharing\Helper::getSharesFromItem($target);
@@ -73,7 +78,7 @@ class Shared_Updater {
}
/**
- * @brief remove all shares for a given file if the file was deleted
+ * remove all shares for a given file if the file was deleted
*
* @param string $path
*/
@@ -110,11 +115,14 @@ class Shared_Updater {
* @param array $params
*/
static public function deleteHook($params) {
- self::correctFolders($params['path']);
- $fileInfo = \OC\Files\Filesystem::getFileInfo($params['path']);
+ $path = $params['path'];
+ self::correctFolders($path);
+
+ $fileInfo = \OC\Files\Filesystem::getFileInfo($path);
+
// mark file as deleted so that we can clean up the share table if
// the file was deleted successfully
- self::$toRemove[$params['path']] = $fileInfo['fileid'];
+ self::$toRemove[$path] = $fileInfo['fileid'];
}
/**
diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
new file mode 100644
index 0000000000000000000000000000000000000000..bad690ea95f9dd05a50387a1e03cc59a95e5bb72
--- /dev/null
+++ b/apps/files_sharing/list.php
@@ -0,0 +1,11 @@
+<?php
+
+// Check if we are a user
+OCP\User::checkLoggedIn();
+
+$tmpl = new OCP\Template('files_sharing', 'list', '');
+
+OCP\Util::addScript('files_sharing', 'app');
+OCP\Util::addScript('files_sharing', 'sharedfilelist');
+
+$tmpl->printPage();
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index e17ffc48036d79d42bdd260fecd8f75c215235f5..8a86cb3806a6f2c29ca3017ca93ae9fc6e621bea 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -149,11 +149,11 @@ if (isset($path)) {
$freeSpace=OCP\Util::freeSpace($path);
$uploadLimit=OCP\Util::uploadLimit();
- $folder = new OCP\Template('files', 'index', '');
+ $folder = new OCP\Template('files', 'list', '');
$folder->assign('dir', $getPath);
$folder->assign('dirToken', $linkItem['token']);
$folder->assign('permissions', OCP\PERMISSION_READ);
- $folder->assign('isPublic',true);
+ $folder->assign('isPublic', true);
$folder->assign('publicUploadEnabled', 'no');
$folder->assign('files', $files);
$folder->assign('uploadMaxFilesize', $maxUploadFilesize);
@@ -162,7 +162,6 @@ if (isset($path)) {
$folder->assign('uploadLimit', $uploadLimit); // PHP upload limit
$folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
$folder->assign('usedSpacePercent', 0);
- $folder->assign('disableSharing', true);
$folder->assign('trash', false);
$tmpl->assign('folder', $folder->fetchPage());
$allowZip = OCP\Config::getSystemValue('allowZipDownload', true);
diff --git a/apps/files_sharing/templates/list.php b/apps/files_sharing/templates/list.php
new file mode 100644
index 0000000000000000000000000000000000000000..a1d95ebc1f115d01efa9ae8820c3794afcb01ce9
--- /dev/null
+++ b/apps/files_sharing/templates/list.php
@@ -0,0 +1,28 @@
+<?php /** @var $l OC_L10N */ ?>
+<div id="controls">
+ <div id="file_action_panel"></div>
+</div>
+<div id='notification'></div>
+
+<div id="emptycontent" class="hidden"></div>
+
+<input type="hidden" name="dir" value="" id="dir">
+
+<table id="filestable">
+ <thead>
+ <tr>
+ <th id='headerName' class="hidden column-name">
+ <div id="headerName-container">
+ <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+ </div>
+ </th>
+ <th id="headerDate" class="hidden column-mtime">
+ <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Share time' )); ?></span><span class="sort-indicator"></span></a>
+ </th>
+ </tr>
+ </thead>
+ <tbody id="fileList">
+ </tbody>
+ <tfoot>
+ </tfoot>
+</table>
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 9471752b6b5d493bc9d2e58c0978a5d68353ee2b..234b6d098387bca9f88d87408256e0371c7696a2 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -10,7 +10,7 @@
<input type="hidden" name="sharingToken" value="<?php p($_['sharingToken']) ?>" id="sharingToken">
<input type="hidden" name="filename" value="<?php p($_['filename']) ?>" id="filename">
<input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype">
-<header><div id="header" class="icon-noise <?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>">
+<header><div id="header" class="<?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>">
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a>
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index b2f05d10ac6e5e22cbe548b73fb1e10bb7ab1d27..6d0ed434ef2e9bc89f734749a8128e1d06cbf4d0 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -29,10 +29,14 @@ use OCA\Files\Share;
*/
class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
+ const TEST_FOLDER_NAME = '/folder_share_api_test';
+
+ private static $tempStorage;
+
function setUp() {
parent::setUp();
- $this->folder = '/folder_share_api_test';
+ $this->folder = self::TEST_FOLDER_NAME;
$this->subfolder = '/subfolder_share_api_test';
$this->subsubfolder = '/subsubfolder_share_api_test';
@@ -51,6 +55,8 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$this->view->unlink($this->filename);
$this->view->deleteAll($this->folder);
+ self::$tempStorage = null;
+
parent::tearDown();
}
@@ -107,11 +113,137 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$fileinfo = $this->view->getFileInfo($this->folder);
\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+ }
+
+ function testEnfoceLinkPassword() {
+
+ $appConfig = \OC::$server->getAppConfig();
+ $appConfig->setValue('core', 'shareapi_enforce_links_password', 'yes');
+
+ // don't allow to share link without a password
+ $_POST['path'] = $this->folder;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+
+
+ $result = Share\Api::createShare(array());
+ $this->assertFalse($result->succeeded());
+
+
+ // don't allow to share link without a empty password
+ $_POST['path'] = $this->folder;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+ $_POST['password'] = '';
+
+ $result = Share\Api::createShare(array());
+ $this->assertFalse($result->succeeded());
+
+ // share with password should succeed
+ $_POST['path'] = $this->folder;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+ $_POST['password'] = 'foo';
+
+ $result = Share\Api::createShare(array());
+ $this->assertTrue($result->succeeded());
+
+ $data = $result->getData();
+
+ // setting new password should succeed
+ $params = array();
+ $params['id'] = $data['id'];
+ $params['_put'] = array();
+ $params['_put']['password'] = 'bar';
+
+ $result = Share\Api::updateShare($params);
+ $this->assertTrue($result->succeeded());
+
+ // removing password should fail
+ $params = array();
+ $params['id'] = $data['id'];
+ $params['_put'] = array();
+ $params['_put']['password'] = '';
+
+ $result = Share\Api::updateShare($params);
+ $this->assertFalse($result->succeeded());
+
+ // cleanup
+ $fileinfo = $this->view->getFileInfo($this->folder);
+ \OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+ $appConfig->setValue('core', 'shareapi_enforce_links_password', 'no');
+ }
+
+ /**
+ * @medium
+ */
+ function testSharePermissions() {
+
+ // sharing file to a user should work if shareapi_exclude_groups is set
+ // to no
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'no');
+ $_POST['path'] = $this->filename;
+ $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
+
+ $result = Share\Api::createShare(array());
+
+ $this->assertTrue($result->succeeded());
+ $data = $result->getData();
+
+ $share = $this->getShareFromId($data['id']);
+
+ $items = \OCP\Share::getItemShared('file', $share['item_source']);
+
+ $this->assertTrue(!empty($items));
+
+ $fileinfo = $this->view->getFileInfo($this->filename);
+
+ $result = \OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+
+ $this->assertTrue($result);
+
+ // exclude groups, but not the group the user belongs to. Sharing should still work
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'yes');
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', 'admin,group1,group2');
+
+ $_POST['path'] = $this->filename;
+ $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
+
+ $result = Share\Api::createShare(array());
+
+ $this->assertTrue($result->succeeded());
+ $data = $result->getData();
+
+ $share = $this->getShareFromId($data['id']);
+
+ $items = \OCP\Share::getItemShared('file', $share['item_source']);
+ $this->assertTrue(!empty($items));
+ $fileinfo = $this->view->getFileInfo($this->filename);
+
+ $result = \OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+ $this->assertTrue($result);
+
+ // now we exclude the group the user belongs to ('group'), sharing should fail now
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', 'admin,group');
+
+ $_POST['path'] = $this->filename;
+ $_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
+ $_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
+
+ $result = Share\Api::createShare(array());
+
+ $this->assertFalse($result->succeeded());
+
+ // cleanup
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'no');
+ \OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', '');
}
+
/**
* @medium
* @depends testCreateShare
@@ -127,7 +259,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$this->assertTrue($result->succeeded());
- // test should return two shares created from testCreateShare()
+ // test should return two shares created from testCreateShare()
$this->assertTrue(count($result->getData()) === 1);
\OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
@@ -154,7 +286,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$this->assertTrue($result->succeeded());
- // test should return one share created from testCreateShare()
+ // test should return one share created from testCreateShare()
$this->assertTrue(count($result->getData()) === 2);
\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
@@ -281,7 +413,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$this->assertTrue($result->succeeded());
- // test should return one share within $this->folder
+ // test should return one share within $this->folder
$this->assertTrue(count($result->getData()) === 1);
\OCP\Share::unshare('file', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER,
@@ -292,7 +424,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief share a folder, than reshare a file within the shared folder and check if we construct the correct path
+ * share a folder, than reshare a file within the shared folder and check if we construct the correct path
* @medium
*/
function testGetShareFromFolderReshares() {
@@ -357,7 +489,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief reshare a sub folder and check if we get the correct path
+ * reshare a sub folder and check if we get the correct path
* @medium
*/
function testGetShareFromSubFolderReShares() {
@@ -410,7 +542,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief test re-re-share of folder if the path gets constructed correctly
+ * test re-re-share of folder if the path gets constructed correctly
* @medium
*/
function testGetShareFromFolderReReShares() {
@@ -478,7 +610,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief test multiple shared folder if the path gets constructed correctly
+ * test multiple shared folder if the path gets constructed correctly
* @medium
*/
function testGetShareMultipleSharedFolder() {
@@ -561,7 +693,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief test re-re-share of folder if the path gets constructed correctly
+ * test re-re-share of folder if the path gets constructed correctly
* @medium
*/
function testGetShareFromFileReReShares() {
@@ -638,7 +770,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$result = Share\Api::getShare($params);
$this->assertEquals(404, $result->getStatusCode());
- $meta = $result->getMeta();
+ $meta = $result->getMeta();
$this->assertEquals('share doesn\'t exist', $meta['message']);
}
@@ -695,7 +827,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
$result = Share\Api::updateShare($params);
- $meta = $result->getMeta();
+ $meta = $result->getMeta();
$this->assertTrue($result->succeeded(), $meta['message']);
$items = \OCP\Share::getItemShared('file', $userShare['file_source']);
@@ -835,7 +967,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief test unshare of a reshared file
+ * test unshare of a reshared file
*/
function testDeleteReshare() {
@@ -879,7 +1011,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
}
/**
- * @brief share a folder which contains a share mount point, should be forbidden
+ * share a folder which contains a share mount point, should be forbidden
*/
public function testShareFolderWithAMountPoint() {
// user 1 shares a folder with user2
@@ -928,6 +1060,54 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
}
+ /**
+ * Post init mount points hook for mounting simulated ext storage
+ */
+ public static function initTestMountPointsHook($data) {
+ if ($data['user'] === \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1) {
+ \OC\Files\Filesystem::mount(self::$tempStorage, array(), '/' . \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1 . '/files' . self::TEST_FOLDER_NAME);
+ }
+ }
+
+ /**
+ * Tests mounting a folder that is an external storage mount point.
+ */
+ public function testShareStorageMountPoint() {
+ self::$tempStorage = new \OC\Files\Storage\Temporary(array());
+ self::$tempStorage->file_put_contents('test.txt', 'abcdef');
+ self::$tempStorage->getScanner()->scan('');
+
+ // needed because the sharing code sometimes switches the user internally and mounts the user's
+ // storages. In our case the temp storage isn't mounted automatically, so doing it in the post hook
+ // (similar to how ext storage works)
+ OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\Test_Files_Sharing_Api', 'initTestMountPointsHook');
+
+ // logging in will auto-mount the temp storage for user1 as well
+ \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1);
+
+ $fileInfo = $this->view->getFileInfo($this->folder);
+
+ // user 1 shares the mount point folder with user2
+ $result = \OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
+
+ $this->assertTrue($result);
+
+ // user2: check that mount point name appears correctly
+ \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+
+ $view = new \OC\Files\View('/' . \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2 . '/files');
+
+ $this->assertTrue($view->file_exists($this->folder));
+ $this->assertTrue($view->file_exists($this->folder . '/test.txt'));
+
+ \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1);
+
+ \OCP\Share::unshare('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+
+ \OC_Hook::clear('OC_Filesystem', 'post_initMountPoints', '\Test_Files_Sharing_Api', 'initTestMountPointsHook');
+ }
/**
* @expectedException \Exception
*/
@@ -951,4 +1131,57 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
\OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_LINK, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
}
+ public function testDefaultExpireDate() {
+ \Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1);
+ \OC_Appconfig::setValue('core', 'shareapi_default_expire_date', 'yes');
+ \OC_Appconfig::setValue('core', 'shareapi_enforce_expire_date', 'yes');
+ \OC_Appconfig::setValue('core', 'shareapi_expire_after_n_days', '2');
+
+ // default expire date is set to 2 days
+ // the time when the share was created is set to 3 days in the past
+ // user defined expire date is set to +2 days from now on
+ // -> link should be already expired by the default expire date but the user
+ // share should still exists.
+ $now = time();
+ $dateFormat = 'Y-m-d H:i:s';
+ $shareCreated = $now - 3 * 24 * 60 * 60;
+ $expireDate = date($dateFormat, $now + 2 * 24 * 60 * 60);
+
+ $info = OC\Files\Filesystem::getFileInfo($this->filename);
+ $this->assertTrue($info instanceof \OC\Files\FileInfo);
+
+ $result = \OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_LINK, null, \OCP\PERMISSION_READ);
+ $this->assertTrue(is_string($result));
+
+ $result = \OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_USER, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
+ $this->assertTrue($result);
+
+ $result = \OCP\Share::setExpirationDate('file', $info->getId() , $expireDate);
+ $this->assertTrue($result);
+
+ //manipulate stime so that both shares are older then the default expire date
+ $statement = "UPDATE `*PREFIX*share` SET `stime` = ? WHERE `share_type` = ?";
+ $query = \OCP\DB::prepare($statement);
+ $result = $query->execute(array($shareCreated, \OCP\Share::SHARE_TYPE_LINK));
+ $this->assertSame(1, $result);
+ $statement = "UPDATE `*PREFIX*share` SET `stime` = ? WHERE `share_type` = ?";
+ $query = \OCP\DB::prepare($statement);
+ $result = $query->execute(array($shareCreated, \OCP\Share::SHARE_TYPE_USER));
+ $this->assertSame(1, $result);
+
+ // now the link share should expire because of enforced default expire date
+ // the user share should still exist
+ $result = \OCP\Share::getItemShared('file', $info->getId());
+ $this->assertTrue(is_array($result));
+ $this->assertSame(1, count($result));
+ $share = reset($result);
+ $this->assertSame(\OCP\Share::SHARE_TYPE_USER, $share['share_type']);
+
+ //cleanup
+ $result = \OCP\Share::unshare('file', $info->getId(), \OCP\Share::SHARE_TYPE_USER, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+ $this->assertTrue($result);
+ \OC_Appconfig::setValue('core', 'shareapi_default_expire_date', 'no');
+ \OC_Appconfig::setValue('core', 'shareapi_enforce_expire_date', 'no');
+
+ }
}
diff --git a/apps/files_sharing/tests/base.php b/apps/files_sharing/tests/base.php
index 495dca072c72759af0ce50a5a5630065031e4366..34ec4a36ede9ddbda9b25846fffe47c415028a66 100644
--- a/apps/files_sharing/tests/base.php
+++ b/apps/files_sharing/tests/base.php
@@ -39,7 +39,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
public $filename;
public $data;
/**
- * @var OC_FilesystemView
+ * @var OC\Files\View
*/
public $view;
public $folder;
@@ -68,7 +68,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
$this->data = 'foobar';
- $this->view = new \OC_FilesystemView('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
+ $this->view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
// remember files_encryption state
$this->stateFilesEncryption = \OC_App::isEnabled('files_encryption');
@@ -97,7 +97,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
}
/**
- * @param $user
+ * @param string $user
* @param bool $create
* @param bool $password
*/
@@ -109,6 +109,8 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
if ($create) {
\OC_User::createUser($user, $password);
+ \OC_Group::createGroup('group');
+ \OC_Group::addToGroup($user, 'group');
}
\OC_Util::tearDownFS();
@@ -119,7 +121,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
}
/**
- * @brief get some information from a given share
+ * get some information from a given share
* @param int $shareID
* @return array with: item_source, share_type, share_with, item_type, permissions
*/
diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php
index 1af73c558d553c476f0386a536c5b18ee244141b..c5408ba55e7ceccb13fbd40505c960587cf71d1b 100644
--- a/apps/files_sharing/tests/cache.php
+++ b/apps/files_sharing/tests/cache.php
@@ -25,7 +25,7 @@ require_once __DIR__ . '/base.php';
class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
/**
- * @var OC_FilesystemView
+ * @var OC\Files\View
*/
public $user2View;
@@ -230,7 +230,7 @@ class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
}
/**
- * @brief verify if each value from the result matches the expected result
+ * verify if each value from the result matches the expected result
* @param array $example array with the expected results
* @param array $result array with the results
*/
diff --git a/apps/files_sharing/tests/js/appSpec.js b/apps/files_sharing/tests/js/appSpec.js
new file mode 100644
index 0000000000000000000000000000000000000000..ad95ee5394251157121f25fc6a3bceaea8f3a503
--- /dev/null
+++ b/apps/files_sharing/tests/js/appSpec.js
@@ -0,0 +1,143 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2014 Vincent Petry <pvince81@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/>.
+*
+*/
+
+describe('OCA.Sharing.App tests', function() {
+ var App = OCA.Sharing.App;
+ var fileListIn;
+ var fileListOut;
+
+ beforeEach(function() {
+ $('#testArea').append(
+ '<div id="app-navigation">' +
+ '<ul><li data-id="files"><a>Files</a></li>' +
+ '<li data-id="sharingin"><a></a></li>' +
+ '<li data-id="sharingout"><a></a></li>' +
+ '</ul></div>' +
+ '<div id="app-content">' +
+ '<div id="app-content-files" class="hidden">' +
+ '</div>' +
+ '<div id="app-content-sharingin" class="hidden">' +
+ '</div>' +
+ '<div id="app-content-sharingout" class="hidden">' +
+ '</div>' +
+ '</div>' +
+ '</div>'
+ );
+ fileListIn = App.initSharingIn($('#app-content-sharingin'));
+ fileListOut = App.initSharingOut($('#app-content-sharingout'));
+ });
+ afterEach(function() {
+ App._inFileList = null;
+ App._outFileList = null;
+ fileListIn = null;
+ fileListOut = null;
+ });
+
+ describe('initialization', function() {
+ it('inits sharing-in list on show', function() {
+ expect(fileListIn._sharedWithUser).toEqual(true);
+ });
+ it('inits sharing-out list on show', function() {
+ expect(fileListOut._sharedWithUser).toBeFalsy();
+ });
+ });
+ describe('file actions', function() {
+ it('provides default file actions', function() {
+ _.each([fileListIn, fileListOut], function(fileList) {
+ var fileActions = fileList.fileActions;
+
+ expect(fileActions.actions.all).toBeDefined();
+ expect(fileActions.actions.all.Delete).toBeDefined();
+ expect(fileActions.actions.all.Rename).toBeDefined();
+ expect(fileActions.actions.file.Download).toBeDefined();
+
+ expect(fileActions.defaults.dir).toEqual('Open');
+ });
+ });
+ it('provides custom file actions', function() {
+ var actionStub = sinon.stub();
+ // regular file action
+ OCA.Files.fileActions.register(
+ 'all',
+ 'RegularTest',
+ OC.PERMISSION_READ,
+ OC.imagePath('core', 'actions/shared'),
+ actionStub
+ );
+
+ App._inFileList = null;
+ fileListIn = App.initSharingIn($('#app-content-sharingin'));
+
+ expect(fileListIn.fileActions.actions.all.RegularTest).toBeDefined();
+ });
+ it('does not provide legacy file actions', function() {
+ var actionStub = sinon.stub();
+ // legacy file action
+ window.FileActions.register(
+ 'all',
+ 'LegacyTest',
+ OC.PERMISSION_READ,
+ OC.imagePath('core', 'actions/shared'),
+ actionStub
+ );
+
+ App._inFileList = null;
+ fileListIn = App.initSharingIn($('#app-content-sharingin'));
+
+ expect(fileListIn.fileActions.actions.all.LegacyTest).not.toBeDefined();
+ });
+ it('redirects to files app when opening a directory', function() {
+ var oldList = OCA.Files.App.fileList;
+ // dummy new list to make sure it exists
+ OCA.Files.App.fileList = new OCA.Files.FileList($('<table><thead></thead><tbody></tbody></table>'));
+
+ var setActiveViewStub = sinon.stub(OCA.Files.App, 'setActiveView');
+ // create dummy table so we can click the dom
+ var $table = '<table><thead></thead><tbody id="fileList"></tbody></table>';
+ $('#app-content-sharingin').append($table);
+
+ App._inFileList = null;
+ fileListIn = App.initSharingIn($('#app-content-sharingin'));
+
+ fileListIn.setFiles([{
+ name: 'testdir',
+ type: 'dir',
+ path: '/somewhere/inside/subdir',
+ counterParts: ['user2'],
+ shares: [{
+ ownerDisplayName: 'user2'
+ }]
+ }]);
+
+ fileListIn.findFileEl('testdir').find('td a.name').click();
+
+ expect(OCA.Files.App.fileList.getCurrentDirectory()).toEqual('/somewhere/inside/subdir/testdir');
+
+ expect(setActiveViewStub.calledOnce).toEqual(true);
+ expect(setActiveViewStub.calledWith('files')).toEqual(true);
+
+ setActiveViewStub.restore();
+
+ // restore old list
+ OCA.Files.App.fileList = oldList;
+ });
+ });
+});
diff --git a/apps/files_sharing/tests/js/sharedfilelistSpec.js b/apps/files_sharing/tests/js/sharedfilelistSpec.js
new file mode 100644
index 0000000000000000000000000000000000000000..7aec8322a4467a4b3ec25880a5155a0e6ce61220
--- /dev/null
+++ b/apps/files_sharing/tests/js/sharedfilelistSpec.js
@@ -0,0 +1,412 @@
+/*
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+describe('OCA.Sharing.FileList tests', function() {
+ var testFiles, alertStub, notificationStub, fileList;
+
+ beforeEach(function() {
+ alertStub = sinon.stub(OC.dialogs, 'alert');
+ notificationStub = sinon.stub(OC.Notification, 'show');
+
+ // init parameters and test table elements
+ $('#testArea').append(
+ '<div id="app-content-container">' +
+ // init horrible parameters
+ '<input type="hidden" id="dir" value="/"></input>' +
+ '<input type="hidden" id="permissions" value="31"></input>' +
+ // dummy controls
+ '<div id="controls">' +
+ ' <div class="actions creatable"></div>' +
+ ' <div class="notCreatable"></div>' +
+ '</div>' +
+ // dummy table
+ // TODO: at some point this will be rendered by the fileList class itself!
+ '<table id="filestable">' +
+ '<thead><tr>' +
+ '<th id="headerName" class="hidden column-name">' +
+ '<input type="checkbox" id="select_all_files" class="select-all">' +
+ '<a class="name columntitle" data-sort="name"><span>Name</span><span class="sort-indicator"></span></a>' +
+ '<span class="selectedActions hidden">' +
+ '</th>' +
+ '<th class="hidden column-mtime">' +
+ '<a class="columntitle" data-sort="mtime"><span class="sort-indicator"></span></a>' +
+ '</th>' +
+ '</tr></thead>' +
+ '<tbody id="fileList"></tbody>' +
+ '<tfoot></tfoot>' +
+ '</table>' +
+ '<div id="emptycontent">Empty content message</div>' +
+ '</div>'
+ );
+ });
+ afterEach(function() {
+ testFiles = undefined;
+ fileList = undefined;
+
+ notificationStub.restore();
+ alertStub.restore();
+ });
+
+ describe('loading file list for incoming shares', function() {
+ var ocsResponse;
+
+ beforeEach(function() {
+ fileList = new OCA.Sharing.FileList(
+ $('#app-content-container'), {
+ sharedWithUser: true
+ }
+ );
+
+ fileList.reload();
+
+ /* jshint camelcase: false */
+ ocsResponse = {
+ ocs: {
+ meta: {
+ status: 'ok',
+ statuscode: 100,
+ message: null
+ },
+ data: [{
+ id: 7,
+ item_type: 'file',
+ item_source: 49,
+ item_target: '/49',
+ file_source: 49,
+ file_target: '/local path/local name.txt',
+ path: 'files/something shared.txt',
+ permissions: 31,
+ stime: 11111,
+ share_type: OC.Share.SHARE_TYPE_USER,
+ share_with: 'user1',
+ share_with_displayname: 'User One',
+ mimetype: 'text/plain',
+ uid_owner: 'user2',
+ displayname_owner: 'User Two'
+ }]
+ }
+ };
+ });
+ it('render file shares', function() {
+ var request;
+
+ expect(fakeServer.requests.length).toEqual(1);
+ request = fakeServer.requests[0];
+ expect(request.url).toEqual(
+ OC.linkToOCS('apps/files_sharing/api/v1') +
+ 'shares?format=json&shared_with_me=true'
+ );
+
+ fakeServer.requests[0].respond(
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify(ocsResponse)
+ );
+
+ var $rows = fileList.$el.find('tbody tr');
+ var $tr = $rows.eq(0);
+ expect($rows.length).toEqual(1);
+ expect($tr.attr('data-id')).toEqual('49');
+ expect($tr.attr('data-type')).toEqual('file');
+ expect($tr.attr('data-file')).toEqual('local name.txt');
+ expect($tr.attr('data-path')).toEqual('/local path');
+ expect($tr.attr('data-size')).not.toBeDefined();
+ expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+ expect($tr.attr('data-mime')).toEqual('text/plain');
+ expect($tr.attr('data-mtime')).toEqual('11111000');
+ expect($tr.attr('data-share-owner')).toEqual('User Two');
+ expect($tr.attr('data-share-id')).toEqual('7');
+ expect($tr.find('a.name').attr('href')).toEqual(
+ OC.webroot +
+ '/index.php/apps/files/ajax/download.php' +
+ '?dir=%2Flocal%20path&files=local%20name.txt'
+ );
+ expect($tr.find('.nametext').text().trim()).toEqual('local name.txt');
+ });
+ it('render folder shares', function() {
+ /* jshint camelcase: false */
+ var request;
+ ocsResponse.ocs.data[0] = _.extend(ocsResponse.ocs.data[0], {
+ item_type: 'folder',
+ file_target: '/local path/local name',
+ path: 'files/something shared',
+ });
+
+ expect(fakeServer.requests.length).toEqual(1);
+ request = fakeServer.requests[0];
+ expect(request.url).toEqual(
+ OC.linkToOCS('apps/files_sharing/api/v1') +
+ 'shares?format=json&shared_with_me=true'
+ );
+
+ fakeServer.requests[0].respond(
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify(ocsResponse)
+ );
+
+ var $rows = fileList.$el.find('tbody tr');
+ var $tr = $rows.eq(0);
+ expect($rows.length).toEqual(1);
+ expect($tr.attr('data-id')).toEqual('49');
+ expect($tr.attr('data-type')).toEqual('dir');
+ expect($tr.attr('data-file')).toEqual('local name');
+ expect($tr.attr('data-path')).toEqual('/local path');
+ expect($tr.attr('data-size')).not.toBeDefined();
+ expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+ expect($tr.attr('data-mime')).toEqual('httpd/unix-directory');
+ expect($tr.attr('data-mtime')).toEqual('11111000');
+ expect($tr.attr('data-share-owner')).toEqual('User Two');
+ expect($tr.attr('data-share-id')).toEqual('7');
+ expect($tr.find('a.name').attr('href')).toEqual(
+ OC.webroot +
+ '/index.php/apps/files' +
+ '?dir=/local%20path/local%20name'
+ );
+ expect($tr.find('.nametext').text().trim()).toEqual('local name');
+ });
+ });
+ describe('loading file list for outgoing shares', function() {
+ var ocsResponse;
+
+ beforeEach(function() {
+ fileList = new OCA.Sharing.FileList(
+ $('#app-content-container'), {
+ sharedWithUser: false
+ }
+ );
+
+ fileList.reload();
+
+ /* jshint camelcase: false */
+ ocsResponse = {
+ ocs: {
+ meta: {
+ status: 'ok',
+ statuscode: 100,
+ message: null
+ },
+ data: [{
+ id: 7,
+ item_type: 'file',
+ item_source: 49,
+ file_source: 49,
+ path: '/local path/local name.txt',
+ permissions: 27,
+ stime: 11111,
+ share_type: OC.Share.SHARE_TYPE_USER,
+ share_with: 'user2',
+ share_with_displayname: 'User Two',
+ mimetype: 'text/plain',
+ uid_owner: 'user1',
+ displayname_owner: 'User One'
+ }]
+ }
+ };
+ });
+ it('render file shares', function() {
+ var request;
+
+ expect(fakeServer.requests.length).toEqual(1);
+ request = fakeServer.requests[0];
+ expect(request.url).toEqual(
+ OC.linkToOCS('apps/files_sharing/api/v1') +
+ 'shares?format=json&shared_with_me=false'
+ );
+
+ fakeServer.requests[0].respond(
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify(ocsResponse)
+ );
+
+ var $rows = fileList.$el.find('tbody tr');
+ var $tr = $rows.eq(0);
+ expect($rows.length).toEqual(1);
+ expect($tr.attr('data-id')).toEqual('49');
+ expect($tr.attr('data-type')).toEqual('file');
+ expect($tr.attr('data-file')).toEqual('local name.txt');
+ expect($tr.attr('data-path')).toEqual('/local path');
+ expect($tr.attr('data-size')).not.toBeDefined();
+ expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+ expect($tr.attr('data-mime')).toEqual('text/plain');
+ expect($tr.attr('data-mtime')).toEqual('11111000');
+ expect($tr.attr('data-share-owner')).not.toBeDefined();
+ expect($tr.attr('data-share-id')).toEqual('7');
+ expect($tr.find('a.name').attr('href')).toEqual(
+ OC.webroot +
+ '/index.php/apps/files/ajax/download.php' +
+ '?dir=%2Flocal%20path&files=local%20name.txt'
+ );
+ expect($tr.find('.nametext').text().trim()).toEqual('local name.txt');
+ });
+ it('render folder shares', function() {
+ var request;
+ /* jshint camelcase: false */
+ ocsResponse.ocs.data[0] = _.extend(ocsResponse.ocs.data[0], {
+ item_type: 'folder',
+ path: '/local path/local name',
+ });
+
+ expect(fakeServer.requests.length).toEqual(1);
+ request = fakeServer.requests[0];
+ expect(request.url).toEqual(
+ OC.linkToOCS('apps/files_sharing/api/v1') +
+ 'shares?format=json&shared_with_me=false'
+ );
+
+ fakeServer.requests[0].respond(
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify(ocsResponse)
+ );
+
+ var $rows = fileList.$el.find('tbody tr');
+ var $tr = $rows.eq(0);
+ expect($rows.length).toEqual(1);
+ expect($tr.attr('data-id')).toEqual('49');
+ expect($tr.attr('data-type')).toEqual('dir');
+ expect($tr.attr('data-file')).toEqual('local name');
+ expect($tr.attr('data-path')).toEqual('/local path');
+ expect($tr.attr('data-size')).not.toBeDefined();
+ expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+ expect($tr.attr('data-mime')).toEqual('httpd/unix-directory');
+ expect($tr.attr('data-mtime')).toEqual('11111000');
+ expect($tr.attr('data-share-owner')).not.toBeDefined();
+ expect($tr.attr('data-share-id')).toEqual('7');
+ expect($tr.find('a.name').attr('href')).toEqual(
+ OC.webroot +
+ '/index.php/apps/files' +
+ '?dir=/local%20path/local%20name'
+ );
+ expect($tr.find('.nametext').text().trim()).toEqual('local name');
+ });
+ it('render link shares', function() {
+ /* jshint camelcase: false */
+ var request;
+ ocsResponse.ocs.data[0] = {
+ id: 7,
+ item_type: 'file',
+ item_source: 49,
+ file_source: 49,
+ path: '/local path/local name.txt',
+ permissions: 1,
+ stime: 11111,
+ share_type: OC.Share.SHARE_TYPE_LINK,
+ share_with: null,
+ token: 'abc',
+ mimetype: 'text/plain',
+ uid_owner: 'user1',
+ displayname_owner: 'User One'
+ };
+ expect(fakeServer.requests.length).toEqual(1);
+ request = fakeServer.requests[0];
+ expect(request.url).toEqual(
+ OC.linkToOCS('apps/files_sharing/api/v1') +
+ 'shares?format=json&shared_with_me=false'
+ );
+
+ fakeServer.requests[0].respond(
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify(ocsResponse)
+ );
+
+ var $rows = fileList.$el.find('tbody tr');
+ var $tr = $rows.eq(0);
+ expect($rows.length).toEqual(1);
+ expect($tr.attr('data-id')).toEqual('49');
+ expect($tr.attr('data-type')).toEqual('file');
+ expect($tr.attr('data-file')).toEqual('local name.txt');
+ expect($tr.attr('data-path')).toEqual('/local path');
+ expect($tr.attr('data-size')).not.toBeDefined();
+ expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+ expect($tr.attr('data-mime')).toEqual('text/plain');
+ expect($tr.attr('data-mtime')).toEqual('11111000');
+ expect($tr.attr('data-share-owner')).not.toBeDefined();
+ expect($tr.attr('data-share-id')).toEqual('7');
+ expect($tr.find('a.name').attr('href')).toEqual(
+ OC.webroot +
+ '/index.php/apps/files/ajax/download.php' +
+ '?dir=%2Flocal%20path&files=local%20name.txt');
+
+ expect($tr.find('.nametext').text().trim()).toEqual('local name.txt');
+ });
+ it('groups link shares with regular shares', function() {
+ /* jshint camelcase: false */
+ var request;
+ // link share
+ ocsResponse.ocs.data.push({
+ id: 8,
+ item_type: 'file',
+ item_source: 49,
+ file_source: 49,
+ path: '/local path/local name.txt',
+ permissions: 1,
+ stime: 11111,
+ share_type: OC.Share.SHARE_TYPE_LINK,
+ share_with: null,
+ token: 'abc',
+ mimetype: 'text/plain',
+ uid_owner: 'user1',
+ displayname_owner: 'User One'
+ });
+ // another share of the same file
+ ocsResponse.ocs.data.push({
+ id: 9,
+ item_type: 'file',
+ item_source: 49,
+ file_source: 49,
+ path: '/local path/local name.txt',
+ permissions: 27,
+ stime: 22222,
+ share_type: OC.Share.SHARE_TYPE_USER,
+ share_with: 'user3',
+ share_with_displayname: 'User Three',
+ mimetype: 'text/plain',
+ uid_owner: 'user1',
+ displayname_owner: 'User One'
+ });
+ expect(fakeServer.requests.length).toEqual(1);
+ request = fakeServer.requests[0];
+ expect(request.url).toEqual(
+ OC.linkToOCS('apps/files_sharing/api/v1') +
+ 'shares?format=json&shared_with_me=false'
+ );
+
+ fakeServer.requests[0].respond(
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify(ocsResponse)
+ );
+
+ var $rows = fileList.$el.find('tbody tr');
+ var $tr = $rows.eq(0);
+ expect($rows.length).toEqual(1);
+ expect($tr.attr('data-id')).toEqual('49');
+ expect($tr.attr('data-type')).toEqual('file');
+ expect($tr.attr('data-file')).toEqual('local name.txt');
+ expect($tr.attr('data-path')).toEqual('/local path');
+ expect($tr.attr('data-size')).not.toBeDefined();
+ expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+ expect($tr.attr('data-mime')).toEqual('text/plain');
+ // always use the most recent stime
+ expect($tr.attr('data-mtime')).toEqual('22222000');
+ expect($tr.attr('data-share-owner')).not.toBeDefined();
+ expect($tr.attr('data-share-id')).toEqual('7,8,9');
+ expect($tr.find('a.name').attr('href')).toEqual(
+ OC.webroot +
+ '/index.php/apps/files/ajax/download.php' +
+ '?dir=%2Flocal%20path&files=local%20name.txt'
+ );
+ expect($tr.find('.nametext').text().trim()).toEqual('local name.txt');
+ });
+ });
+});
diff --git a/apps/files_sharing/tests/proxy.php b/apps/files_sharing/tests/proxy.php
new file mode 100644
index 0000000000000000000000000000000000000000..634ed86db54d41ada1382cd81dee499877f0a4e2
--- /dev/null
+++ b/apps/files_sharing/tests/proxy.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2014 Bjoern Schiessle <schiessle@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/>.
+ *
+ */
+
+require_once __DIR__ . '/base.php';
+
+use OCA\Files\Share;
+
+/**
+ * Class Test_Files_Sharing_Proxy
+ */
+class Test_Files_Sharing_Proxy extends Test_Files_Sharing_Base {
+
+ const TEST_FOLDER_NAME = '/folder_share_api_test';
+
+ private static $tempStorage;
+
+ function setUp() {
+ parent::setUp();
+
+ // load proxies
+ OC::$CLASSPATH['OCA\Files\Share\Proxy'] = 'files_sharing/lib/proxy.php';
+ OC_FileProxy::register(new OCA\Files\Share\Proxy());
+
+ $this->folder = self::TEST_FOLDER_NAME;
+ $this->subfolder = '/subfolder_share_api_test';
+ $this->subsubfolder = '/subsubfolder_share_api_test';
+
+ $this->filename = '/share-api-test';
+
+ // save file with content
+ $this->view->file_put_contents($this->filename, $this->data);
+ $this->view->mkdir($this->folder);
+ $this->view->mkdir($this->folder . $this->subfolder);
+ $this->view->mkdir($this->folder . $this->subfolder . $this->subsubfolder);
+ $this->view->file_put_contents($this->folder.$this->filename, $this->data);
+ $this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data);
+ }
+
+ function tearDown() {
+ $this->view->unlink($this->filename);
+ $this->view->deleteAll($this->folder);
+
+ self::$tempStorage = null;
+
+ parent::tearDown();
+ }
+
+ /**
+ * @medium
+ */
+ function testpreUnlink() {
+
+ $fileInfo1 = \OC\Files\Filesystem::getFileInfo($this->filename);
+ $fileInfo2 = \OC\Files\Filesystem::getFileInfo($this->folder);
+
+ $result = \OCP\Share::shareItem('file', $fileInfo1->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 31);
+ $this->assertTrue($result);
+
+ $result = \OCP\Share::shareItem('folder', $fileInfo2->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 31);
+ $this->assertTrue($result);
+
+ self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+ // move shared folder to 'localDir' and rename it, so that it uses the same
+ // name as the shared file
+ \OC\Files\Filesystem::mkdir('localDir');
+ $result = \OC\Files\Filesystem::rename($this->folder, '/localDir/' . $this->filename);
+ $this->assertTrue($result);
+
+ \OC\Files\Filesystem::unlink('localDir');
+
+ self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+ // after we deleted 'localDir' the share should be moved up to the root and be
+ // renamed to "filename (2)"
+ $this->assertTrue(\OC\Files\Filesystem::file_exists($this->filename));
+ $this->assertTrue(\OC\Files\Filesystem::file_exists($this->filename . ' (2)' ));
+ }
+}
diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php
index 66518a2633fb87bf48582de292456a3c72a2237f..b80ab6b4f14a51cc15a754f3d8b9ea589993e7ec 100644
--- a/apps/files_sharing/tests/sharedstorage.php
+++ b/apps/files_sharing/tests/sharedstorage.php
@@ -36,16 +36,63 @@ class Test_Files_Sharing_Storage extends Test_Files_Sharing_Base {
$this->filename = '/share-api-storage.txt';
- // save file with content
+
$this->view->mkdir($this->folder);
+
+ // save file with content
+ $this->view->file_put_contents($this->filename, "root file");
+ $this->view->file_put_contents($this->folder . $this->filename, "file in subfolder");
}
function tearDown() {
- $this->view->deleteAll($this->folder);
+ $this->view->unlink($this->folder);
+ $this->view->unlink($this->filename);
parent::tearDown();
}
+ /**
+ * @medium
+ */
+ function testDeleteParentOfMountPoint() {
+
+ // share to user
+ $fileinfo = $this->view->getFileInfo($this->folder);
+ $result = \OCP\Share::shareItem('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ self::TEST_FILES_SHARING_API_USER2, 31);
+
+ $this->assertTrue($result);
+
+ self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+ $user2View = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files');
+ $this->assertTrue($user2View->file_exists($this->folder));
+
+ // create a local folder
+ $result = $user2View->mkdir('localfolder');
+ $this->assertTrue($result);
+
+ // move mount point to local folder
+ $result = $user2View->rename($this->folder, '/localfolder/' . $this->folder);
+ $this->assertTrue($result);
+
+ // mount point in the root folder should no longer exist
+ $this->assertFalse($user2View->is_dir($this->folder));
+
+ // delete the local folder
+ $result = $user2View->unlink('/localfolder');
+ $this->assertTrue($result);
+
+ //enforce reload of the mount points
+ self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+ //mount point should be back at the root
+ $this->assertTrue($user2View->is_dir($this->folder));
+
+ //cleanup
+ self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+ $this->view->unlink($this->folder);
+ }
+
/**
* @medium
*/
@@ -79,5 +126,44 @@ class Test_Files_Sharing_Storage extends Test_Files_Sharing_Base {
self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
$this->assertTrue($this->view->file_exists( $this->folder. '/foo.txt'));
+
+ //cleanup
+ \OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ self::TEST_FILES_SHARING_API_USER2);
}
+
+ public function testFilesize() {
+
+ $fileinfoFolder = $this->view->getFileInfo($this->folder);
+ $fileinfoFile = $this->view->getFileInfo($this->filename);
+
+ $folderSize = $this->view->filesize($this->folder);
+ $file1Size = $this->view->filesize($this->folder. $this->filename);
+ $file2Size = $this->view->filesize($this->filename);
+
+ $result = \OCP\Share::shareItem('folder', $fileinfoFolder['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ self::TEST_FILES_SHARING_API_USER2, 31);
+ $this->assertTrue($result);
+
+ $result = \OCP\Share::shareItem('file', $fileinfoFile['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ self::TEST_FILES_SHARING_API_USER2, 31);
+ $this->assertTrue($result);
+
+ self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+ // compare file size between user1 and user2, should always be the same
+ $this->assertSame($folderSize, \OC\Files\Filesystem::filesize($this->folder));
+ $this->assertSame($file1Size, \OC\Files\Filesystem::filesize($this->folder . $this->filename));
+ $this->assertSame($file2Size, \OC\Files\Filesystem::filesize($this->filename));
+
+ //cleanup
+ self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+ $result = \OCP\Share::unshare('folder', $fileinfoFolder['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ self::TEST_FILES_SHARING_API_USER2);
+ $this->assertTrue($result);
+ $result = \OCP\Share::unshare('file', $fileinfoFile['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ self::TEST_FILES_SHARING_API_USER2);
+ $this->assertTrue($result);
+ }
+
}
diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php
index 3427cfe388c68cafe1b6d118cb16d606bc9c85db..1b851cccf6c7423b6b33eea86cb474e65b47f16c 100644
--- a/apps/files_sharing/tests/updater.php
+++ b/apps/files_sharing/tests/updater.php
@@ -21,47 +21,103 @@
*/
require_once __DIR__ . '/../appinfo/update.php';
+require_once __DIR__ . '/base.php';
/**
* Class Test_Files_Sharing_Updater
*/
-class Test_Files_Sharing_Updater extends \PHPUnit_Framework_TestCase {
+class Test_Files_Sharing_Updater extends Test_Files_Sharing_Base {
+
+ const TEST_FOLDER_NAME = '/folder_share_api_test';
function setUp() {
- // some previous tests didn't clean up and therefore this has to be done here
- // FIXME: DIRTY HACK - TODO: find tests, that don't clean up and fix it there
- $this->tearDown();
+ parent::setUp();
- // add items except one - because this is the test case for the broken share table
- $addItems = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache` (`storage`, `path_hash`, ' .
- '`parent`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`) ' .
- 'VALUES (1, ?, 1, 1, 1, 1, 1, 1)');
- $items = array(1, 3);
- $fileIds = array();
- foreach($items as $item) {
- // the number is used as path_hash
- $addItems->execute(array($item));
- $fileIds[] = \OC_DB::insertId('*PREFIX*filecache');
- }
+ $this->folder = self::TEST_FOLDER_NAME;
- $addShares = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`file_source`, `item_type`, `uid_owner`) VALUES (?, \'file\', 1)');
- // the number is used as item_source
- $addShares->execute(array($fileIds[0]));
- $addShares->execute(array(200)); // id of "deleted" file
- $addShares->execute(array($fileIds[1]));
+ $this->filename = '/share-api-test.txt';
+
+ // save file with content
+ $this->view->file_put_contents($this->filename, $this->data);
+ $this->view->mkdir($this->folder);
+ $this->view->file_put_contents($this->folder . '/' . $this->filename, $this->data);
}
function tearDown() {
+ $this->view->unlink($this->filename);
+ $this->view->deleteAll($this->folder);
+
$removeShares = \OC_DB::prepare('DELETE FROM `*PREFIX*share`');
$removeShares->execute();
$removeItems = \OC_DB::prepare('DELETE FROM `*PREFIX*filecache`');
$removeItems->execute();
+
+ parent::tearDown();
+ }
+
+ /**
+ * test deletion of a folder which contains share mount points. Share mount
+ * points should move up to the parent before the folder gets deleted so
+ * that the mount point doesn't end up at the trash bin
+ */
+ function testDeleteParentFolder() {
+ $status = \OC_App::isEnabled('files_trashbin');
+ \OC_App::enable('files_trashbin');
+
+ \OCA\Files_Trashbin\Trashbin::registerHooks();
+ OC_FileProxy::register(new OCA\Files\Share\Proxy());
+
+ $fileinfo = \OC\Files\Filesystem::getFileInfo($this->folder);
+ $this->assertTrue($fileinfo instanceof \OC\Files\FileInfo);
+
+ \OCP\Share::shareItem('folder', $fileinfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 31);
+
+ $this->loginHelper(self::TEST_FILES_SHARING_API_USER2);
+ $view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files');
+
+ // check if user2 can see the shared folder
+ $this->assertTrue($view->file_exists($this->folder));
+
+ $view->mkdir("localFolder");
+ $view->file_put_contents("localFolder/localFile.txt", "local file");
+
+ $view->rename($this->folder, 'localFolder/' . $this->folder);
+
+ // share mount point should now be moved to the subfolder
+ $this->assertFalse($view->file_exists($this->folder));
+ $this->assertTrue($view->file_exists('localFolder/' .$this->folder));
+
+ $view->unlink('localFolder');
+
+ $this->loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+ // mount point should move up again
+ $this->assertTrue($view->file_exists($this->folder));
+
+ // trashbin should contain the local file but not the mount point
+ $rootView = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2);
+ $dirContent = $rootView->getDirectoryContent('files_trashbin/files');
+ $this->assertSame(1, count($dirContent));
+ $firstElement = reset($dirContent);
+ $ext = pathinfo($firstElement['path'], PATHINFO_EXTENSION);
+ $this->assertTrue($rootView->file_exists('files_trashbin/files/localFolder.' . $ext . '/localFile.txt'));
+ $this->assertFalse($rootView->file_exists('files_trashbin/files/localFolder.' . $ext . '/' . $this->folder));
+
+ //cleanup
+ $rootView->deleteAll('files_trashin');
+
+ if ($status === false) {
+ \OC_App::disable('files_trashbin');
+ }
}
/**
* @medium
*/
function testRemoveBrokenShares() {
+
+ $this->prepareFileCache();
+
// check if there are just 3 shares (see setUp - precondition: empty table)
$countShares = \OC_DB::prepare('SELECT COUNT(`id`) FROM `*PREFIX*share`');
$result = $countShares->execute()->fetchOne();
@@ -114,6 +170,7 @@ class Test_Files_Sharing_Updater extends \PHPUnit_Framework_TestCase {
}
}
+ // cleanup
$this->cleanupSharedTable();
}
@@ -123,6 +180,9 @@ class Test_Files_Sharing_Updater extends \PHPUnit_Framework_TestCase {
$query->execute();
}
+ /**
+ * prepare sharing table for testRemoveSharedFolder()
+ */
private function prepareDB() {
$this->cleanupSharedTable();
// add items except one - because this is the test case for the broken share table
@@ -143,4 +203,32 @@ class Test_Files_Sharing_Updater extends \PHPUnit_Framework_TestCase {
$addItems->execute($item);
}
}
+
+ /**
+ * prepare file cache for testRemoveBrokenShares()
+ */
+ private function prepareFileCache() {
+ // some previous tests didn't clean up and therefore this has to be done here
+ // FIXME: DIRTY HACK - TODO: find tests, that don't clean up and fix it there
+ $this->tearDown();
+
+ // add items except one - because this is the test case for the broken share table
+ $addItems = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache` (`storage`, `path_hash`, ' .
+ '`parent`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`) ' .
+ 'VALUES (1, ?, 1, 1, 1, 1, 1, 1)');
+ $items = array(1, 3);
+ $fileIds = array();
+ foreach($items as $item) {
+ // the number is used as path_hash
+ $addItems->execute(array($item));
+ $fileIds[] = \OC_DB::insertId('*PREFIX*filecache');
+ }
+
+ $addShares = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`file_source`, `item_type`, `uid_owner`) VALUES (?, \'file\', 1)');
+ // the number is used as item_source
+ $addShares->execute(array($fileIds[0]));
+ $addShares->execute(array(200)); // id of "deleted" file
+ $addShares->execute(array($fileIds[1]));
+ }
+
}
diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php
index 89a5511452449ccb416cbac15ca2952c723c19a7..e1f52e814bb2f206299721e0bf8eac591ce1eee4 100644
--- a/apps/files_trashbin/ajax/list.php
+++ b/apps/files_trashbin/ajax/list.php
@@ -4,11 +4,13 @@ OCP\JSON::checkLoggedIn();
// Load the files
$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
+$sortAttribute = isset( $_GET['sort'] ) ? $_GET['sort'] : 'name';
+$sortDirection = isset( $_GET['sortdirection'] ) ? ($_GET['sortdirection'] === 'desc') : false;
$data = array();
// make filelist
try {
- $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir);
+ $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, $sortAttribute, $sortDirection);
} catch (Exception $e) {
header("HTTP/1.0 404 Not Found");
exit();
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index d30a601ef564c0282fdbed5715cf62f394cd114d..383115b8e634d241c2f9e8db8928eb03c0ca913d 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -1,7 +1,15 @@
<?php
-
-//OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php';
-//OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php';
+$l = OC_L10N::get('files_trashbin');
// register hooks
\OCA\Files_Trashbin\Trashbin::registerHooks();
+
+\OCA\Files\App::getNavigationManager()->add(
+array(
+ "id" => 'trashbin',
+ "appname" => 'files_trashbin',
+ "script" => 'list.php',
+ "order" => 50,
+ "name" => $l->t('Deleted files')
+)
+);
diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml
index 2cc7d9a7ac3a0fc2779f0ca32811260df2a72888..860d6b1242a8b023f0792a452153c4d8fe2abaa1 100644
--- a/apps/files_trashbin/appinfo/info.xml
+++ b/apps/files_trashbin/appinfo/info.xml
@@ -19,7 +19,7 @@
<licence>AGPL</licence>
<author>Bjoern Schiessle</author>
<shipped>true</shipped>
- <require>4.9</require>
+ <requiremin>4.9</requiremin>
<default_enable/>
<types>
<filesystem/>
diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css
index 7ca3e355fc211bf02aabb20bb036710279d52a6e..04b4a175c83354dfcbc0507f6d0156ee0c819066 100644
--- a/apps/files_trashbin/css/trash.css
+++ b/apps/files_trashbin/css/trash.css
@@ -1,4 +1,13 @@
-#fileList tr[data-type="file"] td a.name,
-#fileList tr[data-type="file"] td a.name span {
+/*
+ * Copyright (c) 2014
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+#app-content-trashbin tbody tr[data-type="file"] td a.name,
+#app-content-trashbin tbody tr[data-type="file"] td a.name span {
cursor: default;
}
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
deleted file mode 100644
index 6e6a8a38307faa5dc7ce5da6df14b0e32267697b..0000000000000000000000000000000000000000
--- a/apps/files_trashbin/index.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-// Check if we are a user
-OCP\User::checkLoggedIn();
-
-OCP\App::setActiveNavigationEntry('files_index');
-
-OCP\Util::addScript('files_trashbin', 'disableDefaultActions');
-OCP\Util::addScript('files', 'fileactions');
-$tmpl = new OCP\Template('files_trashbin', 'index', 'user');
-
-OCP\Util::addStyle('files', 'files');
-OCP\Util::addStyle('files_trashbin', 'trash');
-OCP\Util::addScript('files', 'filesummary');
-OCP\Util::addScript('files', 'breadcrumb');
-OCP\Util::addScript('files', 'filelist');
-// filelist overrides
-OCP\Util::addScript('files_trashbin', 'filelist');
-OCP\Util::addscript('files', 'files');
-OCP\Util::addScript('files_trashbin', 'trash');
-
-$dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
-
-$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_trashbin', 'index.php') . '#?dir=' . \OCP\Util::encodePath($dir));
- exit();
-}
-
-$tmpl->assign('dir', $dir);
-$tmpl->assign('disableSharing', true);
-
-$tmpl->printPage();
diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js
new file mode 100644
index 0000000000000000000000000000000000000000..c59a132b8c4475ea4b466441ce6d7eb188229007
--- /dev/null
+++ b/apps/files_trashbin/js/app.js
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2014
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+OCA.Trashbin = {};
+OCA.Trashbin.App = {
+ _initialized: false,
+
+ initialize: function($el) {
+ if (this._initialized) {
+ return;
+ }
+ this._initialized = true;
+ this.fileList = new OCA.Trashbin.FileList(
+ $('#app-content-trashbin'), {
+ scrollContainer: $('#app-content'),
+ fileActions: this._createFileActions()
+ }
+ );
+ },
+
+ _createFileActions: function() {
+ var fileActions = new OCA.Files.FileActions();
+ fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
+ var dir = context.fileList.getCurrentDirectory();
+ if (dir !== '/') {
+ dir = dir + '/';
+ }
+ context.fileList.changeDirectory(dir + filename);
+ });
+
+ fileActions.setDefault('dir', 'Open');
+
+ fileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history'), function(filename, context) {
+ var fileList = context.fileList;
+ var tr = fileList.findFileEl(filename);
+ var deleteAction = tr.children("td.date").children(".action.delete");
+ deleteAction.removeClass('delete-icon').addClass('progress-icon');
+ fileList.disableActions();
+ $.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'), {
+ files: JSON.stringify([filename]),
+ dir: fileList.getCurrentDirectory()
+ },
+ _.bind(fileList._removeCallback, fileList)
+ );
+ }, t('files_trashbin', 'Restore'));
+
+ fileActions.register('all', 'Delete', OC.PERMISSION_READ, function() {
+ return OC.imagePath('core', 'actions/delete');
+ }, function(filename, context) {
+ var fileList = context.fileList;
+ $('.tipsy').remove();
+ var tr = fileList.findFileEl(filename);
+ var deleteAction = tr.children("td.date").children(".action.delete");
+ deleteAction.removeClass('delete-icon').addClass('progress-icon');
+ fileList.disableActions();
+ $.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'), {
+ files: JSON.stringify([filename]),
+ dir: fileList.getCurrentDirectory()
+ },
+ _.bind(fileList._removeCallback, fileList)
+ );
+ });
+ return fileActions;
+ }
+};
+
+$(document).ready(function() {
+ $('#app-content-trashbin').one('show', function() {
+ var App = OCA.Trashbin.App;
+ App.initialize($('#app-content-trashbin'));
+ // force breadcrumb init
+ // App.fileList.changeDirectory(App.fileList.getCurrentDirectory(), false, true);
+ });
+});
+
diff --git a/apps/files_trashbin/js/disableDefaultActions.js b/apps/files_trashbin/js/disableDefaultActions.js
deleted file mode 100644
index 50ceaf4696fe1aa041dfea3c29d02b8e513dc6da..0000000000000000000000000000000000000000
--- a/apps/files_trashbin/js/disableDefaultActions.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/* disable download and sharing actions */
-var disableDownloadActions = true;
-var trashBinApp = true;
diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js
index 3bb3a92b60ddd43ca46541b3cb4ce4e221ee2a3c..826c1bd64d51a633ec34c4fa10cbb8a3682af3fa 100644
--- a/apps/files_trashbin/js/filelist.js
+++ b/apps/files_trashbin/js/filelist.js
@@ -1,8 +1,14 @@
-/* global OC, t, FileList */
+/*
+ * Copyright (c) 2014
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
(function() {
- FileList.appName = t('files_trashbin', 'Deleted files');
-
- FileList._deletedRegExp = new RegExp(/^(.+)\.d[0-9]+$/);
+ var DELETED_REGEXP = new RegExp(/^(.+)\.d[0-9]+$/);
/**
* Convert a file name in the format filename.d12345 to the real file name.
@@ -11,194 +17,248 @@
* @param name file name
* @return converted file name
*/
- FileList.getDeletedFileName = function(name) {
+ function getDeletedFileName(name) {
name = OC.basename(name);
- var match = FileList._deletedRegExp.exec(name);
+ var match = DELETED_REGEXP.exec(name);
if (match && match.length > 1) {
name = match[1];
}
return name;
- };
-
- var oldSetCurrentDir = FileList._setCurrentDir;
- FileList._setCurrentDir = function(targetDir) {
- oldSetCurrentDir.apply(this, arguments);
-
- var baseDir = OC.basename(targetDir);
- if (baseDir !== '') {
- FileList.setPageTitle(FileList.getDeletedFileName(baseDir));
- }
- };
+ }
- var oldCreateRow = FileList._createRow;
- FileList._createRow = function() {
- // FIXME: MEGAHACK until we find a better solution
- var tr = oldCreateRow.apply(this, arguments);
- tr.find('td.filesize').remove();
- return tr;
+ var FileList = function($el, options) {
+ this.initialize($el, options);
};
+ FileList.prototype = _.extend({}, OCA.Files.FileList.prototype, {
+ id: 'trashbin',
+ appName: t('files_trashbin', 'Deleted files'),
- FileList._onClickBreadCrumb = function(e) {
- var $el = $(e.target).closest('.crumb'),
- index = $el.index(),
- $targetDir = $el.data('dir');
- // first one is home, let the link makes it default action
- if (index !== 0) {
- e.preventDefault();
- FileList.changeDirectory($targetDir);
- }
- };
+ initialize: function() {
+ var result = OCA.Files.FileList.prototype.initialize.apply(this, arguments);
+ this.$el.find('.undelete').click('click', _.bind(this._onClickRestoreSelected, this));
- var oldRenderRow = FileList._renderRow;
- FileList._renderRow = function(fileData, options) {
- options = options || {};
- var dir = FileList.getCurrentDirectory();
- var dirListing = dir !== '' && dir !== '/';
- // show deleted time as mtime
- if (fileData.mtime) {
- fileData.mtime = parseInt(fileData.mtime, 10);
- }
- if (!dirListing) {
- fileData.displayName = fileData.name;
- fileData.name = fileData.name + '.d' + Math.floor(fileData.mtime / 1000);
- }
- return oldRenderRow.call(this, fileData, options);
- };
+ this.setSort('mtime', 'desc');
+ /**
+ * Override crumb making to add "Deleted Files" entry
+ * and convert files with ".d" extensions to a more
+ * user friendly name.
+ */
+ this.breadcrumb._makeCrumbs = function() {
+ var parts = OCA.Files.BreadCrumb.prototype._makeCrumbs.apply(this, arguments);
+ for (var i = 1; i < parts.length; i++) {
+ parts[i].name = getDeletedFileName(parts[i].name);
+ }
+ return parts;
+ };
- FileList.linkTo = function(dir){
- return OC.linkTo('files_trashbin', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
- };
+ return result;
+ },
- FileList.updateEmptyContent = function(){
- var $fileList = $('#fileList');
- var exists = $fileList.find('tr:first').exists();
- $('#emptycontent').toggleClass('hidden', exists);
- $('#filestable th').toggleClass('hidden', !exists);
- };
+ /**
+ * Override to only return read permissions
+ */
+ getDirectoryPermissions: function() {
+ return OC.PERMISSION_READ | OC.PERMISSION_DELETE;
+ },
- var oldInit = FileList.initialize;
- FileList.initialize = function() {
- var result = oldInit.apply(this, arguments);
- $('.undelete').click('click', FileList._onClickRestoreSelected);
- return result;
- };
+ _setCurrentDir: function(targetDir) {
+ OCA.Files.FileList.prototype._setCurrentDir.apply(this, arguments);
- FileList._removeCallback = function(result) {
- if (result.status !== 'success') {
- OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error'));
- }
+ var baseDir = OC.basename(targetDir);
+ if (baseDir !== '') {
+ this.setPageTitle(getDeletedFileName(baseDir));
+ }
+ },
- var files = result.data.success;
- var $el;
- for (var i = 0; i < files.length; i++) {
- $el = FileList.remove(OC.basename(files[i].filename), {updateSummary: false});
- FileList.fileSummary.remove({type: $el.attr('data-type'), size: $el.attr('data-size')});
- }
- FileList.fileSummary.update();
- FileList.updateEmptyContent();
- enableActions();
- }
+ _createRow: function() {
+ // FIXME: MEGAHACK until we find a better solution
+ var tr = OCA.Files.FileList.prototype._createRow.apply(this, arguments);
+ tr.find('td.filesize').remove();
+ return tr;
+ },
- FileList._onClickRestoreSelected = function(event) {
- event.preventDefault();
- var allFiles = $('#select_all').is(':checked');
- var files = [];
- var params = {};
- disableActions();
- if (allFiles) {
- FileList.showMask();
- params = {
- allfiles: true,
- dir: FileList.getCurrentDirectory()
- };
- }
- else {
- files = _.pluck(FileList.getSelectedFiles(), 'name');
- for (var i = 0; i < files.length; i++) {
- var deleteAction = FileList.findFileEl(files[i]).children("td.date").children(".action.delete");
- deleteAction.removeClass('delete-icon').addClass('progress-icon');
+ _renderRow: function(fileData, options) {
+ options = options || {};
+ var dir = this.getCurrentDirectory();
+ var dirListing = dir !== '' && dir !== '/';
+ // show deleted time as mtime
+ if (fileData.mtime) {
+ fileData.mtime = parseInt(fileData.mtime, 10);
}
- params = {
- files: JSON.stringify(files),
- dir: FileList.getCurrentDirectory()
- };
- }
+ if (!dirListing) {
+ fileData.displayName = fileData.name;
+ fileData.name = fileData.name + '.d' + Math.floor(fileData.mtime / 1000);
+ }
+ return OCA.Files.FileList.prototype._renderRow.call(this, fileData, options);
+ },
- $.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'),
- params,
- function(result) {
- if (allFiles) {
- if (result.status !== 'success') {
- OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error'));
- }
- FileList.hideMask();
- // simply remove all files
- FileList.setFiles([]);
- enableActions();
- }
- else {
- FileList._removeCallback(result);
- }
+ getAjaxUrl: function(action, params) {
+ var q = '';
+ if (params) {
+ q = '?' + OC.buildQueryString(params);
}
- );
- };
+ return OC.filePath('files_trashbin', 'ajax', action + '.php') + q;
+ },
- FileList._onClickDeleteSelected = function(event) {
- event.preventDefault();
- var allFiles = $('#select_all').is(':checked');
- var files = [];
- var params = {};
- if (allFiles) {
- params = {
- allfiles: true,
- dir: FileList.getCurrentDirectory()
- };
- }
- else {
- files = _.pluck(FileList.getSelectedFiles(), 'name');
- params = {
- files: JSON.stringify(files),
- dir: FileList.getCurrentDirectory()
- };
- }
+ setupUploadEvents: function() {
+ // override and do nothing
+ },
- disableActions();
- if (allFiles) {
- FileList.showMask();
- }
- else {
+ linkTo: function(dir){
+ return OC.linkTo('files', 'index.php')+"?view=trashbin&dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
+ },
+
+ updateEmptyContent: function(){
+ var exists = this.$fileList.find('tr:first').exists();
+ this.$el.find('#emptycontent').toggleClass('hidden', exists);
+ this.$el.find('#filestable th').toggleClass('hidden', !exists);
+ },
+
+ _removeCallback: function(result) {
+ if (result.status !== 'success') {
+ OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error'));
+ }
+
+ var files = result.data.success;
+ var $el;
for (var i = 0; i < files.length; i++) {
- var deleteAction = FileList.findFileEl(files[i]).children("td.date").children(".action.delete");
- deleteAction.removeClass('delete-icon').addClass('progress-icon');
+ $el = this.remove(OC.basename(files[i].filename), {updateSummary: false});
+ this.fileSummary.remove({type: $el.attr('data-type'), size: $el.attr('data-size')});
}
- }
+ this.fileSummary.update();
+ this.updateEmptyContent();
+ this.enableActions();
+ },
- $.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'),
+ _onClickRestoreSelected: function(event) {
+ event.preventDefault();
+ var self = this;
+ var allFiles = this.$el.find('.select-all').is(':checked');
+ var files = [];
+ var params = {};
+ this.disableActions();
+ if (allFiles) {
+ this.showMask();
+ params = {
+ allfiles: true,
+ dir: this.getCurrentDirectory()
+ };
+ }
+ else {
+ files = _.pluck(this.getSelectedFiles(), 'name');
+ for (var i = 0; i < files.length; i++) {
+ var deleteAction = this.findFileEl(files[i]).children("td.date").children(".action.delete");
+ deleteAction.removeClass('delete-icon').addClass('progress-icon');
+ }
+ params = {
+ files: JSON.stringify(files),
+ dir: this.getCurrentDirectory()
+ };
+ }
+
+ $.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'),
params,
function(result) {
if (allFiles) {
if (result.status !== 'success') {
OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error'));
}
- FileList.hideMask();
+ self.hideMask();
// simply remove all files
- FileList.setFiles([]);
- enableActions();
+ self.setFiles([]);
+ self.enableActions();
}
else {
- FileList._removeCallback(result);
+ self._removeCallback(result);
}
}
- );
- };
+ );
+ },
- var oldClickFile = FileList._onClickFile;
- FileList._onClickFile = function(event) {
- var mime = $(this).parent().parent().data('mime');
- if (mime !== 'httpd/unix-directory') {
+ _onClickDeleteSelected: function(event) {
event.preventDefault();
+ var self = this;
+ var allFiles = this.$el.find('.select-all').is(':checked');
+ var files = [];
+ var params = {};
+ if (allFiles) {
+ params = {
+ allfiles: true,
+ dir: this.getCurrentDirectory()
+ };
+ }
+ else {
+ files = _.pluck(this.getSelectedFiles(), 'name');
+ params = {
+ files: JSON.stringify(files),
+ dir: this.getCurrentDirectory()
+ };
+ }
+
+ this.disableActions();
+ if (allFiles) {
+ this.showMask();
+ }
+ else {
+ for (var i = 0; i < files.length; i++) {
+ var deleteAction = this.findFileEl(files[i]).children("td.date").children(".action.delete");
+ deleteAction.removeClass('delete-icon').addClass('progress-icon');
+ }
+ }
+
+ $.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'),
+ params,
+ function(result) {
+ if (allFiles) {
+ if (result.status !== 'success') {
+ OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error'));
+ }
+ self.hideMask();
+ // simply remove all files
+ self.setFiles([]);
+ self.enableActions();
+ }
+ else {
+ self._removeCallback(result);
+ }
+ }
+ );
+ },
+
+ _onClickFile: function(event) {
+ var mime = $(this).parent().parent().data('mime');
+ if (mime !== 'httpd/unix-directory') {
+ event.preventDefault();
+ }
+ return OCA.Files.FileList.prototype._onClickFile.apply(this, arguments);
+ },
+
+ generatePreviewUrl: function(urlSpec) {
+ return OC.generateUrl('/apps/files_trashbin/ajax/preview.php?') + $.param(urlSpec);
+ },
+
+ getDownloadUrl: function() {
+ // no downloads
+ return '#';
+ },
+
+ enableActions: function() {
+ this.$el.find('.action').css('display', 'inline');
+ this.$el.find(':input:checkbox').css('display', 'inline');
+ },
+
+ disableActions: function() {
+ this.$el.find('.action').css('display', 'none');
+ this.$el.find(':input:checkbox').css('display', 'none');
+ },
+
+ updateStorageStatistics: function() {
+ // no op because the trashbin doesn't have
+ // storage info like free space / used space
}
- return oldClickFile.apply(this, arguments);
- };
+ });
+
+ OCA.Trashbin.FileList = FileList;
})();
+
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
deleted file mode 100644
index 5f2436de8096c78bb7eaffdc50c0dc29f9ee1713..0000000000000000000000000000000000000000
--- a/apps/files_trashbin/js/trash.js
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2014
- *
- * This file is licensed under the Affero General Public License version 3
- * or later.
- *
- * See the COPYING-README file.
- *
- */
-
-/* global OC, t, BreadCrumb, FileActions, FileList, Files */
-$(document).ready(function() {
- var deletedRegExp = new RegExp(/^(.+)\.d[0-9]+$/);
-
- /**
- * Convert a file name in the format filename.d12345 to the real file name.
- * This will use basename.
- * The name will not be changed if it has no ".d12345" suffix.
- * @param name file name
- * @return converted file name
- */
- function getDeletedFileName(name) {
- name = OC.basename(name);
- var match = deletedRegExp.exec(name);
- if (match && match.length > 1) {
- name = match[1];
- }
- return name;
- }
-
- Files.updateStorageStatistics = function() {
- // no op because the trashbin doesn't have
- // storage info like free space / used space
- };
-
- if (typeof FileActions !== 'undefined') {
- FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history'), function(filename) {
- var tr = FileList.findFileEl(filename);
- var deleteAction = tr.children("td.date").children(".action.delete");
- deleteAction.removeClass('delete-icon').addClass('progress-icon');
- disableActions();
- $.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'), {
- files: JSON.stringify([filename]),
- dir: FileList.getCurrentDirectory()
- },
- FileList._removeCallback
- );
- }, t('files_trashbin', 'Restore'));
- };
-
- FileActions.register('all', 'Delete', OC.PERMISSION_READ, function() {
- return OC.imagePath('core', 'actions/delete');
- }, function(filename) {
- $('.tipsy').remove();
- var tr = FileList.findFileEl(filename);
- var deleteAction = tr.children("td.date").children(".action.delete");
- deleteAction.removeClass('delete-icon').addClass('progress-icon');
- disableActions();
- $.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'), {
- files: JSON.stringify([filename]),
- dir: FileList.getCurrentDirectory()
- },
- FileList._removeCallback
- );
- });
-
- /**
- * Override crumb URL maker (hacky!)
- */
- FileList.breadcrumb.getCrumbUrl = function(part, index) {
- if (index === 0) {
- return OC.linkTo('files', 'index.php');
- }
- return OC.linkTo('files_trashbin', 'index.php')+"?dir=" + encodeURIComponent(part.dir);
- };
-
- Files.generatePreviewUrl = function(urlSpec) {
- return OC.generateUrl('/apps/files_trashbin/ajax/preview.php?') + $.param(urlSpec);
- };
-
- Files.getDownloadUrl = function(action, params) {
- // no downloads
- return '#';
- };
-
- Files.getAjaxUrl = function(action, params) {
- var q = '';
- if (params) {
- q = '?' + OC.buildQueryString(params);
- }
- return OC.filePath('files_trashbin', 'ajax', action + '.php') + q;
- };
-
-
- /**
- * Override crumb making to add "Deleted Files" entry
- * and convert files with ".d" extensions to a more
- * user friendly name.
- */
- var oldMakeCrumbs = BreadCrumb.prototype._makeCrumbs;
- BreadCrumb.prototype._makeCrumbs = function() {
- var parts = oldMakeCrumbs.apply(this, arguments);
- // duplicate first part
- parts.unshift(parts[0]);
- parts[1] = {
- dir: '/',
- name: t('files_trashbin', 'Deleted Files')
- };
- for (var i = 2; i < parts.length; i++) {
- parts[i].name = getDeletedFileName(parts[i].name);
- }
- return parts;
- };
-
- FileActions.actions.dir = {
- // only keep 'Open' action for navigation
- 'Open': FileActions.actions.dir.Open
- };
-});
-
-function enableActions() {
- $(".action").css("display", "inline");
- $(":input:checkbox").css("display", "inline");
-}
-
-function disableActions() {
- $(".action").css("display", "none");
- $(":input:checkbox").css("display", "none");
-}
-
diff --git a/apps/files_trashbin/l10n/ar.php b/apps/files_trashbin/l10n/ar.php
index b3abc7df86ef2aff85f4edd6f3f56d7e76701daf..5a6105bda6f7413d5797c98ec24c2c21bed58b34 100644
--- a/apps/files_trashbin/l10n/ar.php
+++ b/apps/files_trashbin/l10n/ar.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "تعذّر ØØ°Ù%s بشكل دائم",
"Couldn't restore %s" => "تعذّر استرجاع %s ",
"Deleted files" => "Øذ٠الملÙات",
+"Restore" => "استعيد",
"Error" => "خطأ",
-"Deleted Files" => "الملÙات المØذوÙÙ‡",
"restored" => "تمت الاستعادة",
"Nothing in here. Your trash bin is empty!" => "لا يوجد شيء هنا. سلة المهملات خاليه.",
"Name" => "اسم",
-"Restore" => "استعيد",
"Deleted" => "تم الØØ°Ù",
"Delete" => "إلغاء"
);
diff --git a/apps/files_trashbin/l10n/ast.php b/apps/files_trashbin/l10n/ast.php
index 688e1ce3d8fa6735dfd93009d2bea9c1d2aeebd0..3240d6751c1101ce393b1c3d28cf4025d797ea5a 100644
--- a/apps/files_trashbin/l10n/ast.php
+++ b/apps/files_trashbin/l10n/ast.php
@@ -2,11 +2,12 @@
$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Nun pudo desaniciase %s dafechu",
"Couldn't restore %s" => "Nun pudo restaurase %s",
+"Deleted files" => "Ficheros desaniciaos",
+"Restore" => "Restaurar",
"Error" => "Fallu",
-"Deleted Files" => "Ficheros desaniciaos",
+"restored" => "recuperóse",
"Nothing in here. Your trash bin is empty!" => "Nun hai un res equÃ. La papelera ta balera!",
"Name" => "Nome",
-"Restore" => "Restaurar",
"Deleted" => "Desaniciáu",
"Delete" => "Desaniciar"
);
diff --git a/apps/files_trashbin/l10n/bg_BG.php b/apps/files_trashbin/l10n/bg_BG.php
index 8c9e658068c440a7e14880551e5d789dddb4c17a..62057538ce4312b451a23dd45e79fd4472fcaa81 100644
--- a/apps/files_trashbin/l10n/bg_BG.php
+++ b/apps/files_trashbin/l10n/bg_BG.php
@@ -2,11 +2,10 @@
$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Ðевъзможно перманентното изтриване на %s",
"Couldn't restore %s" => "Ðевъзможно възтановÑване на %s",
+"Restore" => "ВъзтановÑване",
"Error" => "Грешка",
-"Deleted Files" => "Изтрити файлове",
"Nothing in here. Your trash bin is empty!" => "ÐÑма нищо. Кофата е празна!",
"Name" => "Име",
-"Restore" => "ВъзтановÑване",
"Deleted" => "Изтрито",
"Delete" => "Изтриване"
);
diff --git a/apps/files_trashbin/l10n/ca.php b/apps/files_trashbin/l10n/ca.php
index 196d6ac00a4a3a7ad7823846096e44f51f776fd8..59b42797cf90e164bd48813cd1f859980c753512 100644
--- a/apps/files_trashbin/l10n/ca.php
+++ b/apps/files_trashbin/l10n/ca.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "No s'ha pogut esborrar permanentment %s",
"Couldn't restore %s" => "No s'ha pogut restaurar %s",
"Deleted files" => "Fitxers esborrats",
+"Restore" => "Recupera",
"Error" => "Error",
-"Deleted Files" => "Fitxers eliminats",
"restored" => "restaurat",
"Nothing in here. Your trash bin is empty!" => "La paperera està buida!",
"Name" => "Nom",
-"Restore" => "Recupera",
"Deleted" => "Eliminat",
"Delete" => "Esborra"
);
diff --git a/apps/files_trashbin/l10n/cs_CZ.php b/apps/files_trashbin/l10n/cs_CZ.php
index ed795582e43012534173a7d411866bc8d57bde83..3e4f9e0e15a77516009f06ad77bf7c0a86c06797 100644
--- a/apps/files_trashbin/l10n/cs_CZ.php
+++ b/apps/files_trashbin/l10n/cs_CZ.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Nelze trvale odstranit %s",
"Couldn't restore %s" => "Nelze obnovit %s",
"Deleted files" => "Odstraněné soubory",
+"Restore" => "Obnovit",
"Error" => "Chyba",
-"Deleted Files" => "Smazané soubory",
"restored" => "obnoveno",
"Nothing in here. Your trash bin is empty!" => "Žádný obsah. Váš koš je prázdný.",
"Name" => "Název",
-"Restore" => "Obnovit",
"Deleted" => "Smazáno",
"Delete" => "Smazat"
);
diff --git a/apps/files_trashbin/l10n/cy_GB.php b/apps/files_trashbin/l10n/cy_GB.php
index 7b1405777dda4bc6e266d41e6e8166b07156894f..4e76a6d25ab9cbd631ea4a9b2fde29175abd9824 100644
--- a/apps/files_trashbin/l10n/cy_GB.php
+++ b/apps/files_trashbin/l10n/cy_GB.php
@@ -3,11 +3,10 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Methwyd dileu %s yn barhaol",
"Couldn't restore %s" => "Methwyd adfer %s",
"Deleted files" => "Ffeiliau ddilewyd",
+"Restore" => "Adfer",
"Error" => "Gwall",
-"Deleted Files" => "Ffeiliau Ddilewyd",
"Nothing in here. Your trash bin is empty!" => "Does dim byd yma. Mae eich bin sbwriel yn wag!",
"Name" => "Enw",
-"Restore" => "Adfer",
"Deleted" => "Wedi dileu",
"Delete" => "Dileu"
);
diff --git a/apps/files_trashbin/l10n/da.php b/apps/files_trashbin/l10n/da.php
index 7f7b65bca2ce764837bb547fe0886765b4645c05..b651d81d1bdf7fd0fa316e925b310165a60ccd34 100644
--- a/apps/files_trashbin/l10n/da.php
+++ b/apps/files_trashbin/l10n/da.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Kunne ikke slette %s permanent",
"Couldn't restore %s" => "Kunne ikke gendanne %s",
"Deleted files" => "Slettede filer",
+"Restore" => "Gendan",
"Error" => "Fejl",
-"Deleted Files" => "Slettede filer",
"restored" => "Gendannet",
"Nothing in here. Your trash bin is empty!" => "Intet at se her. Din papirkurv er tom!",
"Name" => "Navn",
-"Restore" => "Gendan",
"Deleted" => "Slettet",
"Delete" => "Slet"
);
diff --git a/apps/files_trashbin/l10n/de.php b/apps/files_trashbin/l10n/de.php
index 4778e159e1d9cae73a9143d7fdc41efb9bf7538b..56b7ccfc7bd6b7ae49cb87d35ee55cf09d42b52d 100644
--- a/apps/files_trashbin/l10n/de.php
+++ b/apps/files_trashbin/l10n/de.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
"Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
"Deleted files" => "Gelöschte Dateien",
+"Restore" => "Wiederherstellen",
"Error" => "Fehler",
-"Deleted Files" => "Gelöschte Dateien",
"restored" => "Wiederhergestellt",
"Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, der Papierkorb ist leer!",
"Name" => "Name",
-"Restore" => "Wiederherstellen",
"Deleted" => "gelöscht",
"Delete" => "Löschen"
);
diff --git a/apps/files_trashbin/l10n/de_CH.php b/apps/files_trashbin/l10n/de_CH.php
index 603d82f5c7afbeb4de27624dd6d3456f876dbd23..be54e57d3f3a09851d51141a8e98b79bd7398dbe 100644
--- a/apps/files_trashbin/l10n/de_CH.php
+++ b/apps/files_trashbin/l10n/de_CH.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
"Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
"Deleted files" => "Gelöschte Dateien",
+"Restore" => "Wiederherstellen",
"Error" => "Fehler",
-"Deleted Files" => "Gelöschte Dateien",
"restored" => "Wiederhergestellt",
"Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!",
"Name" => "Name",
-"Restore" => "Wiederherstellen",
"Deleted" => "Gelöscht",
"Delete" => "Löschen"
);
diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php
index 603d82f5c7afbeb4de27624dd6d3456f876dbd23..be54e57d3f3a09851d51141a8e98b79bd7398dbe 100644
--- a/apps/files_trashbin/l10n/de_DE.php
+++ b/apps/files_trashbin/l10n/de_DE.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
"Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
"Deleted files" => "Gelöschte Dateien",
+"Restore" => "Wiederherstellen",
"Error" => "Fehler",
-"Deleted Files" => "Gelöschte Dateien",
"restored" => "Wiederhergestellt",
"Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!",
"Name" => "Name",
-"Restore" => "Wiederherstellen",
"Deleted" => "Gelöscht",
"Delete" => "Löschen"
);
diff --git a/apps/files_trashbin/l10n/el.php b/apps/files_trashbin/l10n/el.php
index 23b23ed93a68e4d34e1c832a3981504bcfedb5be..c77bfb7fa16bfa3872ef271dd4da3f6542893607 100644
--- a/apps/files_trashbin/l10n/el.php
+++ b/apps/files_trashbin/l10n/el.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "ΑδÏνατη η μόνιμη διαγÏαφή του %s",
"Couldn't restore %s" => "Αδυναμία επαναφοÏάς %s",
"Deleted files" => "ΔιαγÏαμμÎνα αÏχεία",
+"Restore" => "ΕπαναφοÏά",
"Error" => "Σφάλμα",
-"Deleted Files" => "ΔιαγÏαμμÎνα ΑÏχεία",
"restored" => "επαναφÎÏθηκαν",
"Nothing in here. Your trash bin is empty!" => "Δεν υπάÏχει τίποτα εδώ. Ο κάδος σας είναι άδειος!",
"Name" => "Όνομα",
-"Restore" => "ΕπαναφοÏά",
"Deleted" => "ΔιαγÏαμμÎνα",
"Delete" => "ΔιαγÏαφή"
);
diff --git a/apps/files_trashbin/l10n/en_GB.php b/apps/files_trashbin/l10n/en_GB.php
index a660b4b1ca1776a26ed70c1937ae486aaf1f3ff8..b2715dfceb77bac74e27b5d71a965e207c920447 100644
--- a/apps/files_trashbin/l10n/en_GB.php
+++ b/apps/files_trashbin/l10n/en_GB.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Couldn't delete %s permanently",
"Couldn't restore %s" => "Couldn't restore %s",
"Deleted files" => "Deleted files",
+"Restore" => "Restore",
"Error" => "Error",
-"Deleted Files" => "Deleted Files",
"restored" => "restored",
"Nothing in here. Your trash bin is empty!" => "Nothing in here. Your recycle bin is empty!",
"Name" => "Name",
-"Restore" => "Restore",
"Deleted" => "Deleted",
"Delete" => "Delete"
);
diff --git a/apps/files_trashbin/l10n/eo.php b/apps/files_trashbin/l10n/eo.php
index d644f0f6420b768e25e1387176220c9c6cc734fe..67617f448d09e69e1a0778a32eb50038a393284b 100644
--- a/apps/files_trashbin/l10n/eo.php
+++ b/apps/files_trashbin/l10n/eo.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Ne povis foriÄi %s por ĉiam",
"Couldn't restore %s" => "Ne povis restaÅriÄi %s",
"Deleted files" => "Forigitaj dosieroj",
+"Restore" => "RestaÅri",
"Error" => "Eraro",
-"Deleted Files" => "Forigitaj dosieroj",
"restored" => "restaÅrita",
"Nothing in here. Your trash bin is empty!" => "Nenio estas ĉi tie. Via rubujo malplenas!",
"Name" => "Nomo",
-"Restore" => "RestaÅri",
"Deleted" => "Forigita",
"Delete" => "Forigi"
);
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
index c0dc6bb45c29e375dacf88b377b7efc611ba9a21..c3db7765154ae4b27f4c5451a7c4a132e33c0945 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "No se puede eliminar %s permanentemente",
"Couldn't restore %s" => "No se puede restaurar %s",
"Deleted files" => "Archivos eliminados",
+"Restore" => "Recuperar",
"Error" => "Error",
-"Deleted Files" => "Archivos Eliminados",
"restored" => "recuperado",
"Nothing in here. Your trash bin is empty!" => "No hay nada aquÃ. ¡Tu papelera esta vacÃa!",
"Name" => "Nombre",
-"Restore" => "Recuperar",
"Deleted" => "Eliminado",
"Delete" => "Eliminar"
);
diff --git a/apps/files_trashbin/l10n/es_AR.php b/apps/files_trashbin/l10n/es_AR.php
index b354dd656b1c287ac1a6fed572bcf8607a5fcf5e..2991ea507b00880aa9a049337ed5367108e110ee 100644
--- a/apps/files_trashbin/l10n/es_AR.php
+++ b/apps/files_trashbin/l10n/es_AR.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "No fue posible borrar %s de manera permanente",
"Couldn't restore %s" => "No se pudo restaurar %s",
"Deleted files" => "Archivos borrados",
+"Restore" => "Recuperar",
"Error" => "Error",
-"Deleted Files" => "Archivos eliminados",
"restored" => "recuperado",
"Nothing in here. Your trash bin is empty!" => "No hay nada acá. ¡La papelera está vacÃa!",
"Name" => "Nombre",
-"Restore" => "Recuperar",
"Deleted" => "Borrado",
"Delete" => "Borrar"
);
diff --git a/apps/files_trashbin/l10n/es_MX.php b/apps/files_trashbin/l10n/es_MX.php
index c0dc6bb45c29e375dacf88b377b7efc611ba9a21..c3db7765154ae4b27f4c5451a7c4a132e33c0945 100644
--- a/apps/files_trashbin/l10n/es_MX.php
+++ b/apps/files_trashbin/l10n/es_MX.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "No se puede eliminar %s permanentemente",
"Couldn't restore %s" => "No se puede restaurar %s",
"Deleted files" => "Archivos eliminados",
+"Restore" => "Recuperar",
"Error" => "Error",
-"Deleted Files" => "Archivos Eliminados",
"restored" => "recuperado",
"Nothing in here. Your trash bin is empty!" => "No hay nada aquÃ. ¡Tu papelera esta vacÃa!",
"Name" => "Nombre",
-"Restore" => "Recuperar",
"Deleted" => "Eliminado",
"Delete" => "Eliminar"
);
diff --git a/apps/files_trashbin/l10n/et_EE.php b/apps/files_trashbin/l10n/et_EE.php
index 69d20cb195ff7a35b1e40bf3d283288ff3d018ba..c1c9ea66c4f56a0e21ac900dc0617b7864102628 100644
--- a/apps/files_trashbin/l10n/et_EE.php
+++ b/apps/files_trashbin/l10n/et_EE.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "%s jäädavalt kustutamine ebaõnnestus",
"Couldn't restore %s" => "%s ei saa taastada",
"Deleted files" => "Kustutatud failid",
+"Restore" => "Taasta",
"Error" => "Viga",
-"Deleted Files" => "Kustutatud failid",
"restored" => "taastatud",
"Nothing in here. Your trash bin is empty!" => "Siin pole midagi. Sinu prügikast on tühi!",
"Name" => "Nimi",
-"Restore" => "Taasta",
"Deleted" => "Kustutatud",
"Delete" => "Kustuta"
);
diff --git a/apps/files_trashbin/l10n/eu.php b/apps/files_trashbin/l10n/eu.php
index 42476bccfe4d05388999124e2e4e6c63f3a25b90..63c1245da061fcc762edff372f0ddfdeb850f779 100644
--- a/apps/files_trashbin/l10n/eu.php
+++ b/apps/files_trashbin/l10n/eu.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Ezin izan da %s betirako ezabatu",
"Couldn't restore %s" => "Ezin izan da %s berreskuratu",
"Deleted files" => "Ezabatutako fitxategiak",
+"Restore" => "Berrezarri",
"Error" => "Errorea",
-"Deleted Files" => "Ezabatutako Fitxategiak",
"restored" => "Berrezarrita",
"Nothing in here. Your trash bin is empty!" => "Ez dago ezer ez. Zure zakarrontzia hutsik dago!",
"Name" => "Izena",
-"Restore" => "Berrezarri",
"Deleted" => "Ezabatuta",
"Delete" => "Ezabatu"
);
diff --git a/apps/files_trashbin/l10n/fa.php b/apps/files_trashbin/l10n/fa.php
index 407524eb62050960823df51fd14e65f5985e274f..0823e98ea1c758c0a54daa78e7e4472db5ca0573 100644
--- a/apps/files_trashbin/l10n/fa.php
+++ b/apps/files_trashbin/l10n/fa.php
@@ -3,11 +3,10 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "%s را نمی توان برای همیشه Øذ٠کرد",
"Couldn't restore %s" => "%s را نمی توان بازگرداند",
"Deleted files" => "Ùایل های Øذ٠شده",
+"Restore" => "بازیابی",
"Error" => "خطا",
-"Deleted Files" => "Ùایلهای Øذ٠شده",
"Nothing in here. Your trash bin is empty!" => "هیچ چیزی اینجا نیست. سطل زباله ی شما خالی است.",
"Name" => "نام",
-"Restore" => "بازیابی",
"Deleted" => "Øذ٠شده",
"Delete" => "ØØ°Ù"
);
diff --git a/apps/files_trashbin/l10n/fi_FI.php b/apps/files_trashbin/l10n/fi_FI.php
index da56baf0bd7fa08b48f19bb2e37ddb830d456615..158fc7dac55c88ae772fdfbdea59298aa8bd03aa 100644
--- a/apps/files_trashbin/l10n/fi_FI.php
+++ b/apps/files_trashbin/l10n/fi_FI.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Kohdetta %s ei voitu poistaa pysyvästi",
"Couldn't restore %s" => "Kohteen %s palautus epäonnistui",
"Deleted files" => "Poistetut tiedostot",
+"Restore" => "Palauta",
"Error" => "Virhe",
-"Deleted Files" => "Poistetut tiedostot",
"restored" => "palautettu",
"Nothing in here. Your trash bin is empty!" => "Tyhjää täynnä! Roskakorissa ei ole mitään.",
"Name" => "Nimi",
-"Restore" => "Palauta",
"Deleted" => "Poistettu",
"Delete" => "Poista"
);
diff --git a/apps/files_trashbin/l10n/fr.php b/apps/files_trashbin/l10n/fr.php
index b71fbea96ad09bc657905a869ee1a9d5b773d31f..0e6330bb2d0f915b7a4560f315b712ae7f811afa 100644
--- a/apps/files_trashbin/l10n/fr.php
+++ b/apps/files_trashbin/l10n/fr.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Impossible d'effacer %s de façon permanente",
"Couldn't restore %s" => "Impossible de restaurer %s",
"Deleted files" => "Fichiers supprimés",
+"Restore" => "Restaurer",
"Error" => "Erreur",
-"Deleted Files" => "Fichiers effacés",
"restored" => "restauré",
"Nothing in here. Your trash bin is empty!" => "Il n'y a rien ici. Votre corbeille est vide !",
"Name" => "Nom",
-"Restore" => "Restaurer",
"Deleted" => "Effacé",
"Delete" => "Supprimer"
);
diff --git a/apps/files_trashbin/l10n/gl.php b/apps/files_trashbin/l10n/gl.php
index fe74ab34a02d5655ae03155958a787797dc4df5b..143cf0e6df564d3fff90c8d72124e38ffb53882e 100644
--- a/apps/files_trashbin/l10n/gl.php
+++ b/apps/files_trashbin/l10n/gl.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Non foi posÃbel eliminar %s permanente",
"Couldn't restore %s" => "Non foi posÃbel restaurar %s",
"Deleted files" => "Ficheiros eliminados",
+"Restore" => "Restablecer",
"Error" => "Erro",
-"Deleted Files" => "Ficheiros eliminados",
"restored" => "restaurado",
"Nothing in here. Your trash bin is empty!" => "Aquà non hai nada. O cesto do lixo está baleiro!",
"Name" => "Nome",
-"Restore" => "Restablecer",
"Deleted" => "Eliminado",
"Delete" => "Eliminar"
);
diff --git a/apps/files_trashbin/l10n/he.php b/apps/files_trashbin/l10n/he.php
index 6cdc5c05c9d0985fd52a13c0dcef7914c4cdaf90..90b3fd11ab52a65f39a6980fb226f2b92831e59c 100644
--- a/apps/files_trashbin/l10n/he.php
+++ b/apps/files_trashbin/l10n/he.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "×œ× × ×™×ª×Ÿ למחוק ×ת %s לצמיתות",
"Couldn't restore %s" => "×œ× × ×™×ª×Ÿ לשחזר ×ת %s",
"Deleted files" => "×§×‘×¦×™× ×©× ×ž×—×§×•",
+"Restore" => "שחזור",
"Error" => "שגי××”",
-"Deleted Files" => "×§×‘×¦×™× ×©× ×ž×—×§×•",
"restored" => "שוחזר",
"Nothing in here. Your trash bin is empty!" => "×ין ×›×ן ×©×•× ×“×‘×¨. סל המיחזור שלך ריק!",
"Name" => "ש×",
-"Restore" => "שחזור",
"Deleted" => "× ×ž×—×§",
"Delete" => "מחיקה"
);
diff --git a/apps/files_trashbin/l10n/hu_HU.php b/apps/files_trashbin/l10n/hu_HU.php
index 2912821d96f97c32c4f7d3af58589b0f7d92592f..60f3ebad8569938d6120dd16fc964affe1a2cb56 100644
--- a/apps/files_trashbin/l10n/hu_HU.php
+++ b/apps/files_trashbin/l10n/hu_HU.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Nem sikerült %s végleges törlése",
"Couldn't restore %s" => "Nem sikerült %s visszaállÃtása",
"Deleted files" => "Törölt fájlok",
+"Restore" => "VisszaállÃtás",
"Error" => "Hiba",
-"Deleted Files" => "Törölt fájlok",
"restored" => "visszaállÃtva",
"Nothing in here. Your trash bin is empty!" => "Itt nincs semmi. Az Ön szemetes mappája üres!",
"Name" => "Név",
-"Restore" => "VisszaállÃtás",
"Deleted" => "Törölve",
"Delete" => "Törlés"
);
diff --git a/apps/files_trashbin/l10n/id.php b/apps/files_trashbin/l10n/id.php
index 166b9aa811a2441f4099c091c1fbee3a4c6336dd..bba9e329eebcc0890ed7b63658c8da099fe74876 100644
--- a/apps/files_trashbin/l10n/id.php
+++ b/apps/files_trashbin/l10n/id.php
@@ -3,11 +3,10 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Tidak dapat menghapus permanen %s",
"Couldn't restore %s" => "Tidak dapat memulihkan %s",
"Deleted files" => "Berkas yang dihapus",
+"Restore" => "Pulihkan",
"Error" => "Galat",
-"Deleted Files" => "Berkas yang Dihapus",
"Nothing in here. Your trash bin is empty!" => "Tempat sampah anda kosong!",
"Name" => "Nama",
-"Restore" => "Pulihkan",
"Deleted" => "Dihapus",
"Delete" => "Hapus"
);
diff --git a/apps/files_trashbin/l10n/it.php b/apps/files_trashbin/l10n/it.php
index 057305ac517e6b09be9904d7890a0976d271ea54..905384b82bb96c72d99ca6cc01c82dbe1bb130fc 100644
--- a/apps/files_trashbin/l10n/it.php
+++ b/apps/files_trashbin/l10n/it.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Impossibile eliminare %s definitivamente",
"Couldn't restore %s" => "Impossibile ripristinare %s",
"Deleted files" => "File eliminati",
+"Restore" => "Ripristina",
"Error" => "Errore",
-"Deleted Files" => "File eliminati",
"restored" => "ripristinati",
"Nothing in here. Your trash bin is empty!" => "Qui non c'è niente. Il tuo cestino è vuoto.",
"Name" => "Nome",
-"Restore" => "Ripristina",
"Deleted" => "Eliminati",
"Delete" => "Elimina"
);
diff --git a/apps/files_trashbin/l10n/ja.php b/apps/files_trashbin/l10n/ja.php
index 13ca95e6fb4e38fa70d66d1259c59e2b02825faf..b24e40aa23d5b0e76e4c2ec8d31034e6703b7961 100644
--- a/apps/files_trashbin/l10n/ja.php
+++ b/apps/files_trashbin/l10n/ja.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "%s を完全ã«å‰Šé™¤ã§ãã¾ã›ã‚“ã§ã—ãŸ",
"Couldn't restore %s" => "%s を復元ã§ãã¾ã›ã‚“ã§ã—ãŸ",
"Deleted files" => "ゴミ箱",
+"Restore" => "復元",
"Error" => "エラー",
-"Deleted Files" => "ゴミ箱",
"restored" => "復元済",
"Nothing in here. Your trash bin is empty!" => "ã“ã“ã«ã¯ä½•ã‚‚ã‚ã‚Šã¾ã›ã‚“。ゴミ箱ã¯ç©ºã§ã™ï¼",
"Name" => "åå‰",
-"Restore" => "復元",
"Deleted" => "削除済ã¿",
"Delete" => "削除"
);
diff --git a/apps/files_trashbin/l10n/ka_GE.php b/apps/files_trashbin/l10n/ka_GE.php
index 4e3ad4260e3ab9e15e520342dc960b7cd1275f11..16e147bd416f72648391987de5d744f536c73512 100644
--- a/apps/files_trashbin/l10n/ka_GE.php
+++ b/apps/files_trashbin/l10n/ka_GE.php
@@ -3,11 +3,10 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "ფáƒáƒ˜áƒšáƒ˜ %s–ის სრულáƒáƒ“ წáƒáƒ¨áƒšáƒ ვერმáƒáƒ®áƒ”რხდáƒ",
"Couldn't restore %s" => "%s–ის áƒáƒ¦áƒ“გენრვერმáƒáƒ®áƒ”რხდáƒ",
"Deleted files" => "წáƒáƒ¨áƒšáƒ˜áƒšáƒ˜ ფáƒáƒ˜áƒšáƒ”ბი",
+"Restore" => "áƒáƒ¦áƒ“გენáƒ",
"Error" => "შეცდáƒáƒ›áƒ",
-"Deleted Files" => "წáƒáƒ¨áƒšáƒ˜áƒšáƒ˜ ფáƒáƒ˜áƒšáƒ”ბი",
"Nothing in here. Your trash bin is empty!" => "áƒáƒ¥ áƒáƒ áƒáƒ¤áƒ”რი áƒáƒ áƒáƒ ის. სáƒáƒœáƒáƒ’ვე ყუთი ცáƒáƒ იელიáƒ!",
"Name" => "სáƒáƒ®áƒ”ლი",
-"Restore" => "áƒáƒ¦áƒ“გენáƒ",
"Deleted" => "წáƒáƒ¨áƒšáƒ˜áƒšáƒ˜",
"Delete" => "წáƒáƒ¨áƒšáƒ"
);
diff --git a/apps/files_trashbin/l10n/km.php b/apps/files_trashbin/l10n/km.php
index 1df805de2d607d18271e3561686eab3f08410362..40119afc8781a9a4d75ec68fd6c1b3545c75da2d 100644
--- a/apps/files_trashbin/l10n/km.php
+++ b/apps/files_trashbin/l10n/km.php
@@ -1,8 +1,14 @@
<?php
$TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "មិន​អាច​លុប %s ចោល​ជា​អចិន្ážáŸ’រៃយáŸâ€‹áž‘áŸ",
+"Couldn't restore %s" => "មិន​អាច​ស្ដារ %s ឡើង​វិញ​បាន​ទáŸ",
+"Deleted files" => "ឯកសារ​ដែល​បាន​លុប",
+"Restore" => "ស្ដារ​មក​វិញ",
"Error" => "កំហុស",
+"restored" => "បាន​ស្ដារ​វិញ",
+"Nothing in here. Your trash bin is empty!" => "គ្មាន​អ្វី​នៅ​ទីនáŸáŸ‡â€‹áž‘áŸáŸ” ធុង​សំរាម​របស់​អ្នក​គឺ​ទទáŸ!",
"Name" => "ឈ្មោះ",
-"Restore" => "ស្ដារ​មក​វិញ",
+"Deleted" => "បាន​លុប",
"Delete" => "លុប"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ko.php b/apps/files_trashbin/l10n/ko.php
index d9d870708047b562deee62c9e193e70f71d0e048..98800fd2e583911c42792d30271ef9f596bf6012 100644
--- a/apps/files_trashbin/l10n/ko.php
+++ b/apps/files_trashbin/l10n/ko.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "%sì„(를_ ì˜êµ¬ì 으로 ì‚ì œí• ìˆ˜ 없습니다",
"Couldn't restore %s" => "%sì„(를) ë³µì›í• 수 없습니다",
"Deleted files" => "ì‚ì œëœ íŒŒì¼",
+"Restore" => "ë³µì›",
"Error" => "오류",
-"Deleted Files" => "ì‚ì œëœ íŒŒì¼",
"restored" => "ë³µì›ë¨",
"Nothing in here. Your trash bin is empty!" => "íœ´ì§€í†µì´ ë¹„ì–´ 있습니다!",
"Name" => "ì´ë¦„",
-"Restore" => "ë³µì›",
"Deleted" => "ì‚ì œë¨",
"Delete" => "ì‚ì œ"
);
diff --git a/apps/files_trashbin/l10n/lt_LT.php b/apps/files_trashbin/l10n/lt_LT.php
index 2bf545483f6ec1e30efdb95908b8288084cb31d3..fa65d7eabac0b32e756c3b9347ae764f0c1116af 100644
--- a/apps/files_trashbin/l10n/lt_LT.php
+++ b/apps/files_trashbin/l10n/lt_LT.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Nepavyko negrįžtamai ištrinti %s",
"Couldn't restore %s" => "Nepavyko atkurti %s",
"Deleted files" => "IÅ¡trinti failai",
+"Restore" => "Atstatyti",
"Error" => "Klaida",
-"Deleted Files" => "IÅ¡trinti failai",
"restored" => "atstatyta",
"Nothing in here. Your trash bin is empty!" => "Nieko nÄ—ra. JÅ«sų Å¡iukÅ¡liadėžė tuÅ¡Äia!",
"Name" => "Pavadinimas",
-"Restore" => "Atstatyti",
"Deleted" => "IÅ¡trinti",
"Delete" => "IÅ¡trinti"
);
diff --git a/apps/files_trashbin/l10n/lv.php b/apps/files_trashbin/l10n/lv.php
index c173d0501477774111301adfd2f5d28dc21acc18..3432f9ac75eff98a8a347ee0c8d75e1f8d38f32f 100644
--- a/apps/files_trashbin/l10n/lv.php
+++ b/apps/files_trashbin/l10n/lv.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "NevarÄ“ja pilnÄ«bÄ izdzÄ“st %s",
"Couldn't restore %s" => "Nevarēja atjaunot %s",
"Deleted files" => "DzÄ“stÄs datnes",
+"Restore" => "Atjaunot",
"Error" => "Kļūda",
-"Deleted Files" => "DzÄ“stÄs datnes",
"restored" => "atjaunots",
"Nothing in here. Your trash bin is empty!" => "Å eit nekÄ nav. JÅ«su miskaste ir tukÅ¡a!",
"Name" => "Nosaukums",
-"Restore" => "Atjaunot",
"Deleted" => "Dzēsts",
"Delete" => "Dzēst"
);
diff --git a/apps/files_trashbin/l10n/mk.php b/apps/files_trashbin/l10n/mk.php
index 910b11e21e603de847d78ea8742285a8e687940f..66c2d0a2961b6e83758c02426c7619749f8e8f87 100644
--- a/apps/files_trashbin/l10n/mk.php
+++ b/apps/files_trashbin/l10n/mk.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Ðе можеше трајно да Ñе избрише %s",
"Couldn't restore %s" => "Ðе можеше да Ñе поврати %s",
"Deleted files" => "Избришани датотеки",
+"Restore" => "Поврати",
"Error" => "Грешка",
-"Deleted Files" => "Избришани датотеки",
"restored" => "повратени",
"Nothing in here. Your trash bin is empty!" => "Тука нема ништо. Вашата корпа за отпадоци е празна!",
"Name" => "Име",
-"Restore" => "Поврати",
"Deleted" => "Избришан",
"Delete" => "Избриши"
);
diff --git a/apps/files_trashbin/l10n/ms_MY.php b/apps/files_trashbin/l10n/ms_MY.php
index f084f58465dca8e4afa59f44c3dca3e0a92db11f..fdfd922438c5105723ee6509969129111dac85a7 100644
--- a/apps/files_trashbin/l10n/ms_MY.php
+++ b/apps/files_trashbin/l10n/ms_MY.php
@@ -2,12 +2,11 @@
$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Tidak dapat menghapuskan %s secara kekal",
"Couldn't restore %s" => "Tidak dapat memulihkan %s",
+"Restore" => "Pulihkan",
"Error" => "Ralat",
-"Deleted Files" => "Fail Dihapus",
"restored" => "dipulihkan",
"Nothing in here. Your trash bin is empty!" => "Tiada apa disini. Tong sampah anda kosong!",
"Name" => "Nama",
-"Restore" => "Pulihkan",
"Deleted" => "Dihapuskan",
"Delete" => "Padam"
);
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php
index 2293e5a4e7b3265459fc282f34957fe06523a193..519b4e5aa24b2b142cfcb986944a9931ea14afc3 100644
--- a/apps/files_trashbin/l10n/nb_NO.php
+++ b/apps/files_trashbin/l10n/nb_NO.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Kunne ikke slette %s fullstendig",
"Couldn't restore %s" => "Kunne ikke gjenopprette %s",
"Deleted files" => "Slettede filer",
+"Restore" => "Gjenopprett",
"Error" => "Feil",
-"Deleted Files" => "Slettede filer",
"restored" => "gjenopprettet",
"Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!",
"Name" => "Navn",
-"Restore" => "Gjenopprett",
"Deleted" => "Slettet",
"Delete" => "Slett"
);
diff --git a/apps/files_trashbin/l10n/nl.php b/apps/files_trashbin/l10n/nl.php
index c8fb12885387f371d23cbf296e7cdc6f313bb99a..41dfa86b7a705d238c248d0473c635ff2121ecec 100644
--- a/apps/files_trashbin/l10n/nl.php
+++ b/apps/files_trashbin/l10n/nl.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Kon %s niet permanent verwijderen",
"Couldn't restore %s" => "Kon %s niet herstellen",
"Deleted files" => "Verwijderde bestanden",
+"Restore" => "Herstellen",
"Error" => "Fout",
-"Deleted Files" => "Verwijderde bestanden",
"restored" => "hersteld",
"Nothing in here. Your trash bin is empty!" => "Niets te vinden. Uw prullenbak is leeg!",
"Name" => "Naam",
-"Restore" => "Herstellen",
"Deleted" => "Verwijderd",
"Delete" => "Verwijder"
);
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index 38bc64e6ce505bcca607a141660fb2c0869ffd94..aa18927b1fd34eb516c11bd6aa3386d7fdc90777 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Klarte ikkje sletta %s for godt",
"Couldn't restore %s" => "Klarte ikkje gjenoppretta %s",
"Deleted files" => "Sletta filer",
+"Restore" => "Gjenopprett",
"Error" => "Feil",
-"Deleted Files" => "Sletta filer",
"restored" => "gjenoppretta",
"Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!",
"Name" => "Namn",
-"Restore" => "Gjenopprett",
"Deleted" => "Sletta",
"Delete" => "Slett"
);
diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php
index b961efd7daeee7dcbefb2d6d0ab3dfe0e032f5be..16bb9dbfa2fd8373219396c0ae254f8337ab1651 100644
--- a/apps/files_trashbin/l10n/pl.php
+++ b/apps/files_trashbin/l10n/pl.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Nie można trwale usunąć %s",
"Couldn't restore %s" => "Nie można przywrócić %s",
"Deleted files" => "Pliki usunięte",
+"Restore" => "Przywróć",
"Error" => "BÅ‚Ä…d",
-"Deleted Files" => "Usunięte pliki",
"restored" => "przywrócony",
"Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. Twój kosz jest pusty!",
"Name" => "Nazwa",
-"Restore" => "Przywróć",
"Deleted" => "Usunięte",
"Delete" => "Usuń"
);
diff --git a/apps/files_trashbin/l10n/pt_BR.php b/apps/files_trashbin/l10n/pt_BR.php
index d524d8879e23f3040215e6a1fc58dbf941fbe16c..b7dd346b40a061128e8caf014cbe9c393cd3eeb5 100644
--- a/apps/files_trashbin/l10n/pt_BR.php
+++ b/apps/files_trashbin/l10n/pt_BR.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Não foi possÃvel excluir %s permanentemente",
"Couldn't restore %s" => "Não foi possÃvel restaurar %s",
"Deleted files" => "Arquivos apagados",
+"Restore" => "Restaurar",
"Error" => "Erro",
-"Deleted Files" => "Arquivos Apagados",
"restored" => "restaurado",
"Nothing in here. Your trash bin is empty!" => "Nada aqui. Sua lixeira está vazia!",
"Name" => "Nome",
-"Restore" => "Restaurar",
"Deleted" => "ExcluÃdo",
"Delete" => "Excluir"
);
diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php
index 94dd0eb707a99af065bdd2557b876b94a2a17a1e..8a18d842c937d2843a3e63ec17b28d08bbd816a0 100644
--- a/apps/files_trashbin/l10n/pt_PT.php
+++ b/apps/files_trashbin/l10n/pt_PT.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Não foi possÃvel eliminar %s de forma permanente",
"Couldn't restore %s" => "Não foi possÃvel restaurar %s",
"Deleted files" => "Ficheiros eliminados",
+"Restore" => "Restaurar",
"Error" => "Erro",
-"Deleted Files" => "Ficheiros Apagados",
"restored" => "Restaurado",
"Nothing in here. Your trash bin is empty!" => "Não hà ficheiros. O lixo está vazio!",
"Name" => "Nome",
-"Restore" => "Restaurar",
"Deleted" => "Apagado",
"Delete" => "Eliminar"
);
diff --git a/apps/files_trashbin/l10n/ru.php b/apps/files_trashbin/l10n/ru.php
index d10369b9ca1eee47448d45af38857729d8aa73ea..8d00e0824183e00b5c6094296f2fe8dac59e53f5 100644
--- a/apps/files_trashbin/l10n/ru.php
+++ b/apps/files_trashbin/l10n/ru.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "%s не может быть удалён навÑегда",
"Couldn't restore %s" => "%s не может быть воÑÑтановлен",
"Deleted files" => "Удалённые файлы",
+"Restore" => "ВоÑÑтановить",
"Error" => "Ошибка",
-"Deleted Files" => "Удаленные файлы",
"restored" => "воÑÑтановлен",
"Nothing in here. Your trash bin is empty!" => "ЗдеÑÑŒ ничего нет. Ваша корзина пуÑта!",
"Name" => "ИмÑ",
-"Restore" => "ВоÑÑтановить",
"Deleted" => "Удалён",
"Delete" => "Удалить"
);
diff --git a/apps/files_trashbin/l10n/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php
index 3badd3a423bd1798ff3f024ad424a8644265bdc8..7588b555d96f4d35281e42616df9c5e63d9a2a00 100644
--- a/apps/files_trashbin/l10n/sk_SK.php
+++ b/apps/files_trashbin/l10n/sk_SK.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Nemožno zmazať %s navždy",
"Couldn't restore %s" => "Nemožno obnoviť %s",
"Deleted files" => "Zmazané súbory",
+"Restore" => "Obnoviť",
"Error" => "Chyba",
-"Deleted Files" => "Zmazané súbory",
"restored" => "obnovené",
"Nothing in here. Your trash bin is empty!" => "Žiadny obsah. Kôš je prázdny!",
"Name" => "Názov",
-"Restore" => "Obnoviť",
"Deleted" => "Zmazané",
"Delete" => "Zmazať"
);
diff --git a/apps/files_trashbin/l10n/sl.php b/apps/files_trashbin/l10n/sl.php
index 08da9b1c6e90c8c4b78ca6ef2c16838559a1a66f..f9dc5112ac30850c8480ffcc3d6402a13ed0af4e 100644
--- a/apps/files_trashbin/l10n/sl.php
+++ b/apps/files_trashbin/l10n/sl.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Datoteke %s ni mogoÄe trajno izbrisati.",
"Couldn't restore %s" => "Ni mogoÄe obnoviti %s",
"Deleted files" => "Izbrisane datoteke",
+"Restore" => "Obnovi",
"Error" => "Napaka",
-"Deleted Files" => "Izbrisane datoteke",
"restored" => "obnovljeno",
"Nothing in here. Your trash bin is empty!" => "Mapa smeti je prazna.",
"Name" => "Ime",
-"Restore" => "Obnovi",
"Deleted" => "Izbrisano",
"Delete" => "Izbriši"
);
diff --git a/apps/files_trashbin/l10n/sq.php b/apps/files_trashbin/l10n/sq.php
index 60d16f9b913a397525b35c81a6c8071ff7b8ade0..9e16b7a7bfd97a499f4699dc3aa8bbb35817374e 100644
--- a/apps/files_trashbin/l10n/sq.php
+++ b/apps/files_trashbin/l10n/sq.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Nuk munda ta eliminoj përfundimisht %s",
"Couldn't restore %s" => "Nuk munda ta rivendos %s",
"Deleted files" => "Skedarë të fshirë ",
+"Restore" => "Rivendos",
"Error" => "Veprim i gabuar",
-"Deleted Files" => "Skedarë të eliminuar",
"restored" => "rivendosur",
"Nothing in here. Your trash bin is empty!" => "Këtu nuk ka asgjë. Koshi juaj është bosh!",
"Name" => "Emri",
-"Restore" => "Rivendos",
"Deleted" => "Eliminuar",
"Delete" => "Elimino"
);
diff --git a/apps/files_trashbin/l10n/sr.php b/apps/files_trashbin/l10n/sr.php
index 7fb4c85ab634ce64caa93d62813b49a7467b6948..d4abc908c911220bd0ee14f12238e5575fbdf3e5 100644
--- a/apps/files_trashbin/l10n/sr.php
+++ b/apps/files_trashbin/l10n/sr.php
@@ -1,10 +1,10 @@
<?php
$TRANSLATIONS = array(
"Deleted files" => "ОбриÑане датотеке",
+"Restore" => "Врати",
"Error" => "Грешка",
"Nothing in here. Your trash bin is empty!" => "Овде нема ништа. Корпа за отпатке је празна.",
"Name" => "Име",
-"Restore" => "Врати",
"Deleted" => "ОбриÑано",
"Delete" => "Обриши"
);
diff --git a/apps/files_trashbin/l10n/sv.php b/apps/files_trashbin/l10n/sv.php
index fd9ca8653f3e58856f0058b315846756d7d2118f..330bcc3482174482ce88a9d3fd23aebd28d93203 100644
--- a/apps/files_trashbin/l10n/sv.php
+++ b/apps/files_trashbin/l10n/sv.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Kunde inte radera %s permanent",
"Couldn't restore %s" => "Kunde inte återställa %s",
"Deleted files" => "Raderade filer",
+"Restore" => "Ã…terskapa",
"Error" => "Fel",
-"Deleted Files" => "Raderade filer",
"restored" => "återställd",
"Nothing in here. Your trash bin is empty!" => "Ingenting här. Din papperskorg är tom!",
"Name" => "Namn",
-"Restore" => "Ã…terskapa",
"Deleted" => "Raderad",
"Delete" => "Radera"
);
diff --git a/apps/files_trashbin/l10n/th_TH.php b/apps/files_trashbin/l10n/th_TH.php
index 857737c59e86a873b3a88493b7e93887194f1848..47c3450d2eaa33455775000e404a64c34ee05898 100644
--- a/apps/files_trashbin/l10n/th_TH.php
+++ b/apps/files_trashbin/l10n/th_TH.php
@@ -1,10 +1,9 @@
<?php
$TRANSLATIONS = array(
+"Restore" => "คืนค่า",
"Error" => "ข้à¸à¸œà¸´à¸”พลาด",
-"Deleted Files" => "ไฟล์ที่ลบทิ้ง",
"Nothing in here. Your trash bin is empty!" => "ไม่มีà¸à¸°à¹„รà¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸™à¸µà¹‰ ถังขยะขà¸à¸‡à¸„ุณยังว่างà¸à¸¢à¸¹à¹ˆ",
"Name" => "ชื่à¸",
-"Restore" => "คืนค่า",
"Deleted" => "ลบà¹à¸¥à¹‰à¸§",
"Delete" => "ลบ"
);
diff --git a/apps/files_trashbin/l10n/tr.php b/apps/files_trashbin/l10n/tr.php
index ff4227e38c74a8d2c99b423b7e63e760a0237209..b69d29498d7c50f37aea51160714a38e71be425b 100644
--- a/apps/files_trashbin/l10n/tr.php
+++ b/apps/files_trashbin/l10n/tr.php
@@ -1,15 +1,14 @@
<?php
$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "%s alıcı olarak silinemedi",
+"Couldn't delete %s permanently" => "%s kalıcı olarak silinemedi",
"Couldn't restore %s" => "%s geri yüklenemedi",
"Deleted files" => "SilinmiÅŸ dosyalar",
+"Restore" => "Geri yükle",
"Error" => "Hata",
-"Deleted Files" => "Silinen Dosyalar",
"restored" => "geri yüklendi",
"Nothing in here. Your trash bin is empty!" => "Burada hiçbir şey yok. Çöp kutunuz tamamen boş!",
"Name" => "Ä°sim",
-"Restore" => "Geri yükle",
-"Deleted" => "Silindi",
+"Deleted" => "Silinme",
"Delete" => "Sil"
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/uk.php b/apps/files_trashbin/l10n/uk.php
index fa523fa3218685fbff12f8678c441d5699f12a89..328e8da5e02cc0633f5c32420a9b93b413f96b86 100644
--- a/apps/files_trashbin/l10n/uk.php
+++ b/apps/files_trashbin/l10n/uk.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Ðеможливо видалити %s назавжди",
"Couldn't restore %s" => "Ðеможливо відновити %s",
"Deleted files" => "Видалено файлів",
+"Restore" => "Відновити",
"Error" => "Помилка",
-"Deleted Files" => "Видалено Файлів",
"restored" => "відновлено",
"Nothing in here. Your trash bin is empty!" => "Ðічого немає. Ваший кошик Ð´Ð»Ñ ÑÐ¼Ñ–Ñ‚Ñ‚Ñ Ð¿ÑƒÑтий!",
"Name" => "Ім'Ñ",
-"Restore" => "Відновити",
"Deleted" => "Видалено",
"Delete" => "Видалити"
);
diff --git a/apps/files_trashbin/l10n/ur_PK.php b/apps/files_trashbin/l10n/ur_PK.php
index 49c82f53872c84830aff3465f8f713e57363bded..fc71b528ced8dec79cecac7b2277b8b9f9fa1393 100644
--- a/apps/files_trashbin/l10n/ur_PK.php
+++ b/apps/files_trashbin/l10n/ur_PK.php
@@ -1,5 +1,14 @@
<?php
$TRANSLATIONS = array(
-"Error" => "ایرر"
+"Couldn't delete %s permanently" => "ØØ°Ù Ù†Ûیں ÛÙˆ سکتا %s مستقل طور پر",
+"Couldn't restore %s" => "بØال Ù†ÛÙŠÚº کيا جا سکتا %s",
+"Deleted files" => "ØØ°Ù Ø´Ø¯Û Ùائليں",
+"Restore" => "بØال",
+"Error" => "ایرر",
+"restored" => "بØال شدÛ",
+"Nothing in here. Your trash bin is empty!" => " ÛŒÛاں Ú©Ú†Ú¾ بھی Ù†Ûیں .آپکی ردی Ú©ÛŒ ٹوکری خالی ÛÛ’.",
+"Name" => "اسم",
+"Deleted" => "ØØ°Ù Ø´Ø¯Û ",
+"Delete" => "Øذ٠کریں"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/vi.php b/apps/files_trashbin/l10n/vi.php
index 57c82cea5f75d99f206278464948e2c40d745b46..d374effcabb36165dd97c4bc45baac23740c0212 100644
--- a/apps/files_trashbin/l10n/vi.php
+++ b/apps/files_trashbin/l10n/vi.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Không thể xóa %s vĩnh viễn",
"Couldn't restore %s" => "Không thể khôi phục %s",
"Deleted files" => "File đã bị xóa",
+"Restore" => "Khôi phục",
"Error" => "Lá»—i",
-"Deleted Files" => "File đã xóa",
"restored" => "khôi phục",
"Nothing in here. Your trash bin is empty!" => "Không có gì ở đây. Thùng rác của bạn rỗng!",
"Name" => "Tên",
-"Restore" => "Khôi phục",
"Deleted" => "Äã xóa",
"Delete" => "Xóa"
);
diff --git a/apps/files_trashbin/l10n/zh_CN.php b/apps/files_trashbin/l10n/zh_CN.php
index ef6a63b29593e72ddd96e05c06cdc842a607de08..49cd412299e7d85cff296e4d4268b371485af624 100644
--- a/apps/files_trashbin/l10n/zh_CN.php
+++ b/apps/files_trashbin/l10n/zh_CN.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "æ— æ³•å½»åº•åˆ é™¤æ–‡ä»¶%s",
"Couldn't restore %s" => "æ— æ³•æ¢å¤%s",
"Deleted files" => "å·²åˆ é™¤æ–‡ä»¶",
+"Restore" => "æ¢å¤",
"Error" => "错误",
-"Deleted Files" => "å·²åˆ é™¤æ–‡ä»¶",
"restored" => "å·²æ¢å¤",
"Nothing in here. Your trash bin is empty!" => "这里没有东西. ä½ çš„å›žæ”¶ç«™æ˜¯ç©ºçš„!",
"Name" => "å称",
-"Restore" => "æ¢å¤",
"Deleted" => "å·²åˆ é™¤",
"Delete" => "åˆ é™¤"
);
diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php
index c42d70790e92e3f2e5cf5a060288a668f00f0d7b..014527083e3d082c2eff0a9de96a18c022b48783 100644
--- a/apps/files_trashbin/l10n/zh_TW.php
+++ b/apps/files_trashbin/l10n/zh_TW.php
@@ -3,12 +3,11 @@ $TRANSLATIONS = array(
"Couldn't delete %s permanently" => "無法永久刪除 %s",
"Couldn't restore %s" => "無法還原 %s",
"Deleted files" => "回收桶",
+"Restore" => "還原",
"Error" => "錯誤",
-"Deleted Files" => "已刪除的檔案",
"restored" => "已還原",
"Nothing in here. Your trash bin is empty!" => "您的回收桶是空的ï¼",
"Name" => "å稱",
-"Restore" => "還原",
"Deleted" => "已刪除",
"Delete" => "刪除"
);
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index e6ca73520a6fe5bb747d7ff06e3c4ea5152e7afe..ebedce31abe107c6af6126d819a01c5fdc589b35 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -8,16 +8,19 @@ 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
+ * @param string $sortAttribute attribute to sort on or empty to disable sorting
+ * @param bool $sortDescending true for descending sort, false otherwise
* @return \OCP\Files\FileInfo[]
*/
- public static function getTrashFiles($dir){
+ public static function getTrashFiles($dir, $sortAttribute = '', $sortDescending = false){
$result = array();
$timestamp = null;
$user = \OCP\User::getUser();
- $view = new \OC_Filesystemview('/' . $user . '/files_trashbin/files');
+ $view = new \OC\Files\View('/' . $user . '/files_trashbin/files');
if (ltrim($dir, '/') !== '' && !$view->is_dir($dir)) {
throw new \Exception('Directory does not exists');
@@ -57,8 +60,9 @@ class Helper
closedir($dirContent);
}
- usort($result, array('\OCA\Files\Helper', 'fileCmp'));
-
+ if ($sortAttribute !== '') {
+ return \OCA\Files\Helper::sortFiles($result, $sortAttribute, $sortDescending);
+ }
return $result;
}
diff --git a/apps/files_trashbin/lib/hooks.php b/apps/files_trashbin/lib/hooks.php
index b2c6bc1df50988c960f5dfb54a96ab29f4aad8a2..b6f0fb7e547882bb2bccd80945b5298070a5b1e0 100644
--- a/apps/files_trashbin/lib/hooks.php
+++ b/apps/files_trashbin/lib/hooks.php
@@ -29,8 +29,8 @@ namespace OCA\Files_Trashbin;
class Hooks {
/**
- * @brief Copy files to trash bin
- * @param array
+ * Copy files to trash bin
+ * @param array $params
*
* This function is connected to the delete signal of OC_Filesystem
* to copy the file to the trash bin
@@ -44,8 +44,8 @@ class Hooks {
}
/**
- * @brief clean up user specific settings if user gets deleted
- * @param array with uid
+ * clean up user specific settings if user gets deleted
+ * @param array $params array with uid
*
* This function is connected to the pre_deleteUser signal of OC_Users
* to remove the used space for the trash bin stored in the database
@@ -56,7 +56,7 @@ class Hooks {
Trashbin::deleteUser($uid);
}
}
-
+
public static function post_write_hook($params) {
Trashbin::resizeTrash(\OCP\User::getUser());
}
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 173eb2164cf55713a9ca944629325a9090129924..e95f1b13c37fbfb98dc9226530188860740bb4f2 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -62,7 +62,7 @@ class Trashbin {
/**
- * @brief copy file to owners trash
+ * copy file to owners trash
* @param string $sourcePath
* @param string $owner
* @param string $ownerPath
@@ -96,7 +96,7 @@ class Trashbin {
/**
* move file to the trash bin
*
- * @param $file_path path to the deleted file/directory relative to the files root directory
+ * @param string $file_path path to the deleted file/directory relative to the files root directory
*/
public static function move2trash($file_path) {
$user = \OCP\User::getUser();
@@ -155,11 +155,11 @@ class Trashbin {
/**
* Move file versions to trash so that they can be restored later
*
- * @param $file_path path to original file
- * @param $filename of deleted file
+ * @param string $file_path path to original file
+ * @param string $filename of deleted file
* @param integer $timestamp when the file was deleted
*
- * @return size of stored versions
+ * @return int size of stored versions
*/
private static function retainVersions($file_path, $filename, $timestamp) {
$size = 0;
@@ -200,11 +200,11 @@ class Trashbin {
/**
* Move encryption keys to trash so that they can be restored later
*
- * @param $file_path path to original file
- * @param $filename of deleted file
+ * @param string $file_path path to original file
+ * @param string $filename of deleted file
* @param integer $timestamp when the file was deleted
*
- * @return size of encryption keys
+ * @return int size of encryption keys
*/
private static function retainEncryptionKeys($file_path, $filename, $timestamp) {
$size = 0;
@@ -216,7 +216,7 @@ class Trashbin {
list($owner, $ownerPath) = self::getUidAndFilename($file_path);
- $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $user);
+ $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $user);
// disable proxy to prevent recursive calls
$proxyStatus = \OC_FileProxy::$enabled;
@@ -299,9 +299,9 @@ class Trashbin {
/**
* restore files from trash bin
*
- * @param $file path to the deleted file
- * @param $filename name of the file
- * @param $timestamp time when the file was deleted
+ * @param string $file path to the deleted file
+ * @param string $filename name of the file
+ * @param int $timestamp time when the file was deleted
*
* @return bool
*/
@@ -373,14 +373,14 @@ class Trashbin {
}
/**
- * @brief restore versions from trash bin
+ * restore versions from trash bin
*
* @param \OC\Files\View $view file view
- * @param $file complete path to file
- * @param $filename name of file once it was deleted
+ * @param string $file complete path to file
+ * @param string $filename name of file once it was deleted
* @param string $uniqueFilename new file name to restore the file without overwriting existing files
- * @param $location location if file
- * @param $timestamp deleteion time
+ * @param string $location location if file
+ * @param int $timestamp deleteion time
*
*/
private static function restoreVersions($view, $file, $filename, $uniqueFilename, $location, $timestamp) {
@@ -421,14 +421,14 @@ class Trashbin {
}
/**
- * @brief restore encryption keys from trash bin
+ * restore encryption keys from trash bin
*
* @param \OC\Files\View $view
- * @param $file complete path to file
- * @param $filename name of file
+ * @param string $file complete path to file
+ * @param string $filename name of file
* @param string $uniqueFilename new file name to restore the file without overwriting existing files
- * @param $location location of file
- * @param $timestamp deleteion time
+ * @param string $location location of file
+ * @param int $timestamp deleteion time
*
*/
private static function restoreEncryptionKeys($view, $file, $filename, $uniqueFilename, $location, $timestamp) {
@@ -441,7 +441,7 @@ class Trashbin {
list($owner, $ownerPath) = self::getUidAndFilename($target);
- $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $user);
+ $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $user);
if ($util->isSystemWideMountPoint($ownerPath)) {
$baseDir = '/files_encryption/';
@@ -498,7 +498,7 @@ class Trashbin {
$rootView->rename($ownerShareKey, $baseDir . '/share-keys/' . $ownerPath . '.' . $user . '.shareKey');
// try to re-share if file is shared
- $filesystemView = new \OC_FilesystemView('/');
+ $filesystemView = new \OC\Files\View('/');
$session = new \OCA\Encryption\Session($filesystemView);
$util = new \OCA\Encryption\Util($filesystemView, $user);
@@ -523,7 +523,7 @@ class Trashbin {
}
/**
- * @brief delete all files from the trash
+ * delete all files from the trash
*/
public static function deleteAll() {
$user = \OCP\User::getUser();
@@ -537,12 +537,12 @@ class Trashbin {
/**
- * @brief delete file from trash bin permanently
+ * delete file from trash bin permanently
*
- * @param $filename path to the file
- * @param $timestamp of deletion time
+ * @param string $filename path to the file
+ * @param int $timestamp of deletion time
*
- * @return size of deleted files
+ * @return int size of deleted files
*/
public static function delete($filename, $timestamp = null) {
$user = \OCP\User::getUser();
@@ -634,9 +634,9 @@ class Trashbin {
/**
* check to see whether a file exists in trashbin
*
- * @param $filename path to the file
- * @param $timestamp of deletion time
- * @return true if file exists, otherwise false
+ * @param string $filename path to the file
+ * @param int $timestamp of deletion time
+ * @return bool true if file exists, otherwise false
*/
public static function file_exists($filename, $timestamp = null) {
$user = \OCP\User::getUser();
@@ -653,10 +653,10 @@ class Trashbin {
}
/**
- * @brief deletes used space for trash bin in db if user was deleted
+ * deletes used space for trash bin in db if user was deleted
*
* @param type $uid id of deleted user
- * @return result of db delete operation
+ * @return bool result of db delete operation
*/
public static function deleteUser($uid) {
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=?');
@@ -672,7 +672,7 @@ class Trashbin {
* calculate remaining free space for trash bin
*
* @param integer $trashbinSize current size of the trash bin
- * @return available free space for trash bin
+ * @return int available free space for trash bin
*/
private static function calculateFreeSpace($trashbinSize) {
$softQuota = true;
@@ -707,7 +707,7 @@ class Trashbin {
}
/**
- * @brief resize trash bin if necessary after a new file was added to ownCloud
+ * resize trash bin if necessary after a new file was added to ownCloud
* @param string $user user id
*/
public static function resizeTrash($user) {
@@ -808,8 +808,8 @@ class Trashbin {
/**
* find all versions which belong to the file we want to restore
*
- * @param $filename name of the file which should be restored
- * @param $timestamp timestamp when the file was deleted
+ * @param string $filename name of the file which should be restored
+ * @param int $timestamp timestamp when the file was deleted
*/
private static function getVersionsFromTrash($filename, $timestamp) {
$view = new \OC\Files\View('/' . \OCP\User::getUser() . '/files_trashbin/versions');
@@ -841,8 +841,8 @@ class Trashbin {
/**
* find unique extension for restored file if a file with the same name already exists
*
- * @param $location where the file should be restored
- * @param $filename name of the file
+ * @param string $location where the file should be restored
+ * @param string $filename name of the file
* @param \OC\Files\View $view filesystem view relative to users root directory
* @return string with unique extension
*/
@@ -871,7 +871,7 @@ class Trashbin {
}
/**
- * @brief get the size from a given root folder
+ * get the size from a given root folder
* @param \OC\Files\View $view file view on the root folder
* @return integer size of the folder
*/
@@ -903,7 +903,7 @@ class Trashbin {
/**
* get current size of trash bin from a given user
*
- * @param $user user who owns the trash bin
+ * @param string $user user who owns the trash bin
* @return mixed trash bin size or false if no trash bin size is stored
*/
private static function getTrashbinSize($user) {
@@ -925,7 +925,7 @@ class Trashbin {
}
/**
- * @brief check if trash bin is empty for a given user
+ * check if trash bin is empty for a given user
* @param string $user
*/
public static function isEmpty($user) {
diff --git a/apps/files_trashbin/list.php b/apps/files_trashbin/list.php
new file mode 100644
index 0000000000000000000000000000000000000000..b4047b82ef9b6681c6ef59610dabac60ee4925ae
--- /dev/null
+++ b/apps/files_trashbin/list.php
@@ -0,0 +1,11 @@
+<?php
+
+// Check if we are a user
+OCP\User::checkLoggedIn();
+
+
+$tmpl = new OCP\Template('files_trashbin', 'index', '');
+OCP\Util::addStyle('files_trashbin', 'trash');
+OCP\Util::addScript('files_trashbin', 'app');
+OCP\Util::addScript('files_trashbin', 'filelist');
+$tmpl->printPage();
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index 323e7495535ad08ba10b65aa95a43bb3e1e1a1e4..fc18e88c41e02d2c28746ec1b6cb3ed592e632e6 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -1,3 +1,4 @@
+<?php /** @var $l OC_L10N */ ?>
<div id="controls">
<div id="file_action_panel"></div>
</div>
@@ -5,29 +6,27 @@
<div id="emptycontent" class="hidden"><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div>
-<input type="hidden" id="permissions" value="0"></input>
-<input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>"></input>
-<input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
+<input type="hidden" name="dir" value="" id="dir">
<table id="filestable">
<thead>
<tr>
- <th id='headerName'>
+ <th id='headerName' class="hidden column-name">
<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'>
+ <input type="checkbox" id="select_all_trash" class="select-all"/>
+ <label for="select_all_trash"></label>
+ <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+ <span id="selectedActionsList" class='selectedActions'>
<a href="" class="undelete">
<img class="svg" alt="<?php p($l->t( 'Restore' )); ?>"
src="<?php print_unescaped(OCP\image_path("core", "actions/history.svg")); ?>" />
<?php p($l->t('Restore'))?>
</a>
- </span>
+ </span>
</div>
</th>
- <th id="headerDate">
- <span id="modified"><?php p($l->t( 'Deleted' )); ?></span>
+ <th id="headerDate" class="hidden column-mtime">
+ <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Deleted' )); ?></span><span class="sort-indicator"></span></a>
<span class="selectedActions">
<a href="" class="delete-selected">
<?php p($l->t('Delete'))?>
diff --git a/apps/files_trashbin/tests/js/appSpec.js b/apps/files_trashbin/tests/js/appSpec.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca7d71831f8a33df82e2bfc3423070365b1c6fd3
--- /dev/null
+++ b/apps/files_trashbin/tests/js/appSpec.js
@@ -0,0 +1,69 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2014 Vincent Petry <pvince81@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/>.
+*
+*/
+
+describe('OCA.Trashbin.App tests', function() {
+ var App = OCA.Trashbin.App;
+
+ beforeEach(function() {
+ $('#testArea').append(
+ '<div id="app-navigation">' +
+ '<ul><li data-id="files"><a>Files</a></li>' +
+ '<li data-id="trashbin"><a>Trashbin</a></li>' +
+ '</div>' +
+ '<div id="app-content">' +
+ '<div id="app-content-files" class="hidden">' +
+ '</div>' +
+ '<div id="app-content-trashbin" class="hidden">' +
+ '</div>' +
+ '</div>' +
+ '</div>'
+ );
+ App.initialize($('#app-content-trashbin'));
+ });
+ afterEach(function() {
+ App._initialized = false;
+ App.fileList = null;
+ });
+
+ describe('initialization', function() {
+ it('creates a custom filelist instance', function() {
+ App.initialize();
+ expect(App.fileList).toBeDefined();
+ expect(App.fileList.$el.is('#app-content-trashbin')).toEqual(true);
+ });
+
+ it('registers custom file actions', function() {
+ var fileActions;
+ App.initialize();
+
+ fileActions = App.fileList.fileActions;
+
+ expect(fileActions.actions.all).toBeDefined();
+ expect(fileActions.actions.all.Restore).toBeDefined();
+ expect(fileActions.actions.all.Delete).toBeDefined();
+
+ expect(fileActions.actions.all.Rename).not.toBeDefined();
+ expect(fileActions.actions.all.Download).not.toBeDefined();
+
+ expect(fileActions.defaults.dir).toEqual('Open');
+ });
+ });
+});
diff --git a/apps/files_trashbin/tests/js/filelistSpec.js b/apps/files_trashbin/tests/js/filelistSpec.js
new file mode 100644
index 0000000000000000000000000000000000000000..11eeff68df81caf353410ba04a5bce9330e15839
--- /dev/null
+++ b/apps/files_trashbin/tests/js/filelistSpec.js
@@ -0,0 +1,312 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2014 Vincent Petry <pvince81@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/>.
+*
+*/
+
+describe('OCA.Trashbin.FileList tests', function() {
+ var testFiles, alertStub, notificationStub, fileList;
+
+ beforeEach(function() {
+ alertStub = sinon.stub(OC.dialogs, 'alert');
+ notificationStub = sinon.stub(OC.Notification, 'show');
+
+ // init parameters and test table elements
+ $('#testArea').append(
+ '<div id="app-content-trashbin">' +
+ // init horrible parameters
+ '<input type="hidden" id="dir" value="/"></input>' +
+ // set this but it shouldn't be used (could be the one from the
+ // files app)
+ '<input type="hidden" id="permissions" value="31"></input>' +
+ // dummy controls
+ '<div id="controls">' +
+ ' <div class="actions creatable"></div>' +
+ ' <div class="notCreatable"></div>' +
+ '</div>' +
+ // dummy table
+ // TODO: at some point this will be rendered by the fileList class itself!
+ '<table id="filestable">' +
+ '<thead><tr><th id="headerName" class="hidden">' +
+ '<input type="checkbox" id="select_all_trash" class="select-all">' +
+ '<span class="name">Name</span>' +
+ '<span class="selectedActions hidden">' +
+ '<a href class="undelete">Restore</a>' +
+ '<a href class="delete-selected">Delete</a></span>' +
+ '</th></tr></thead>' +
+ '<tbody id="fileList"></tbody>' +
+ '<tfoot></tfoot>' +
+ '</table>' +
+ '<div id="emptycontent">Empty content message</div>' +
+ '</div>'
+ );
+
+ testFiles = [{
+ id: 1,
+ type: 'file',
+ name: 'One.txt',
+ mtime: 11111000,
+ mimetype: 'text/plain',
+ etag: 'abc'
+ }, {
+ id: 2,
+ type: 'file',
+ name: 'Two.jpg',
+ mtime: 22222000,
+ mimetype: 'image/jpeg',
+ etag: 'def',
+ }, {
+ id: 3,
+ type: 'file',
+ name: 'Three.pdf',
+ mtime: 33333000,
+ mimetype: 'application/pdf',
+ etag: '123',
+ }, {
+ id: 4,
+ type: 'dir',
+ mtime: 99999000,
+ name: 'somedir',
+ mimetype: 'httpd/unix-directory',
+ etag: '456'
+ }];
+
+ // register file actions like the trashbin App does
+ var fileActions = OCA.Trashbin.App._createFileActions(fileList);
+ fileList = new OCA.Trashbin.FileList(
+ $('#app-content-trashbin'), {
+ fileActions: fileActions
+ }
+ );
+ });
+ afterEach(function() {
+ testFiles = undefined;
+ fileList = undefined;
+
+ $('#dir').remove();
+ notificationStub.restore();
+ alertStub.restore();
+ });
+ describe('Initialization', function() {
+ it('Sorts by mtime by default', function() {
+ expect(fileList._sort).toEqual('mtime');
+ expect(fileList._sortDirection).toEqual('desc');
+ });
+ it('Always returns read and delete permission', function() {
+ expect(fileList.getDirectoryPermissions()).toEqual(OC.PERMISSION_READ | OC.PERMISSION_DELETE);
+ });
+ });
+ describe('Breadcrumbs', function() {
+ beforeEach(function() {
+ var data = {
+ status: 'success',
+ data: {
+ files: testFiles,
+ permissions: 1
+ }
+ };
+ fakeServer.respondWith(/\/index\.php\/apps\/files_trashbin\/ajax\/list.php\?dir=%2Fsubdir/, [
+ 200, {
+ "Content-Type": "application/json"
+ },
+ JSON.stringify(data)
+ ]);
+ });
+ it('links the breadcrumb to the trashbin view', function() {
+ fileList.changeDirectory('/subdir', false, true);
+ fakeServer.respond();
+ var $crumbs = fileList.$el.find('#controls .crumb');
+ expect($crumbs.length).toEqual(2);
+ expect($crumbs.eq(0).find('a').text()).toEqual('');
+ expect($crumbs.eq(0).find('a').attr('href'))
+ .toEqual(OC.webroot + '/index.php/apps/files?view=trashbin&dir=/');
+ expect($crumbs.eq(1).find('a').text()).toEqual('subdir');
+ expect($crumbs.eq(1).find('a').attr('href'))
+ .toEqual(OC.webroot + '/index.php/apps/files?view=trashbin&dir=/subdir');
+ });
+ });
+ describe('Rendering rows', function() {
+ it('renders rows with the correct data when in root', function() {
+ // dir listing is false when in root
+ $('#dir').val('/');
+ fileList.setFiles(testFiles);
+ var $rows = fileList.$el.find('tbody tr');
+ var $tr = $rows.eq(0);
+ expect($rows.length).toEqual(4);
+ expect($tr.attr('data-id')).toEqual('1');
+ expect($tr.attr('data-type')).toEqual('file');
+ expect($tr.attr('data-file')).toEqual('One.txt.d11111');
+ expect($tr.attr('data-size')).not.toBeDefined();
+ expect($tr.attr('data-etag')).toEqual('abc');
+ expect($tr.attr('data-permissions')).toEqual('9'); // read and delete
+ expect($tr.attr('data-mime')).toEqual('text/plain');
+ expect($tr.attr('data-mtime')).toEqual('11111000');
+ expect($tr.find('a.name').attr('href')).toEqual('#');
+
+ expect($tr.find('.nametext').text().trim()).toEqual('One.txt');
+
+ expect(fileList.findFileEl('One.txt.d11111')[0]).toEqual($tr[0]);
+ });
+ it('renders rows with the correct data when in subdirectory', function() {
+ // dir listing is true when in a subdir
+ $('#dir').val('/subdir');
+
+ fileList.setFiles(testFiles);
+ var $rows = fileList.$el.find('tbody tr');
+ var $tr = $rows.eq(0);
+ expect($rows.length).toEqual(4);
+ expect($tr.attr('data-id')).toEqual('1');
+ expect($tr.attr('data-type')).toEqual('file');
+ expect($tr.attr('data-file')).toEqual('One.txt');
+ expect($tr.attr('data-size')).not.toBeDefined();
+ expect($tr.attr('data-etag')).toEqual('abc');
+ expect($tr.attr('data-permissions')).toEqual('9'); // read and delete
+ expect($tr.attr('data-mime')).toEqual('text/plain');
+ expect($tr.attr('data-mtime')).toEqual('11111000');
+ expect($tr.find('a.name').attr('href')).toEqual('#');
+
+ expect($tr.find('.nametext').text().trim()).toEqual('One.txt');
+
+ expect(fileList.findFileEl('One.txt')[0]).toEqual($tr[0]);
+ });
+ it('does not render a size column', function() {
+ expect(fileList.$el.find('tbody tr .filesize').length).toEqual(0);
+ });
+ });
+ describe('File actions', function() {
+ describe('Deleting single files', function() {
+ // TODO: checks ajax call
+ // TODO: checks spinner
+ // TODO: remove item after delete
+ // TODO: bring back item if delete failed
+ });
+ describe('Restoring single files', function() {
+ // TODO: checks ajax call
+ // TODO: checks spinner
+ // TODO: remove item after restore
+ // TODO: bring back item if restore failed
+ });
+ });
+ describe('file previews', function() {
+ // TODO: check that preview URL is going through files_trashbin
+ });
+ describe('loading file list', function() {
+ // TODO: check that ajax URL is going through files_trashbin
+ });
+ describe('breadcrumbs', function() {
+ // TODO: test label + URL
+ });
+ describe('Global Actions', function() {
+ beforeEach(function() {
+ fileList.setFiles(testFiles);
+ fileList.findFileEl('One.txt.d11111').find('input:checkbox').click();
+ fileList.findFileEl('Three.pdf.d33333').find('input:checkbox').click();
+ fileList.findFileEl('somedir.d99999').find('input:checkbox').click();
+ });
+ describe('Delete', function() {
+ it('Deletes selected files when "Delete" clicked', function() {
+ var request;
+ $('.selectedActions .delete-selected').click();
+ expect(fakeServer.requests.length).toEqual(1);
+ request = fakeServer.requests[0];
+ expect(request.url).toEqual(OC.webroot + '/index.php/apps/files_trashbin/ajax/delete.php');
+ expect(OC.parseQueryString(request.requestBody))
+ .toEqual({'dir': '/', files: '["One.txt.d11111","Three.pdf.d33333","somedir.d99999"]'});
+ fakeServer.requests[0].respond(
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify({
+ status: 'success',
+ data: {
+ success: [
+ {filename: 'One.txt.d11111'},
+ {filename: 'Three.pdf.d33333'},
+ {filename: 'somedir.d99999'}
+ ]
+ }
+ })
+ );
+ expect(fileList.findFileEl('One.txt.d11111').length).toEqual(0);
+ expect(fileList.findFileEl('Three.pdf.d33333').length).toEqual(0);
+ expect(fileList.findFileEl('somedir.d99999').length).toEqual(0);
+ expect(fileList.findFileEl('Two.jpg.d22222').length).toEqual(1);
+ });
+ it('Deletes all files when all selected when "Delete" clicked', function() {
+ var request;
+ $('.select-all').click();
+ $('.selectedActions .delete-selected').click();
+ expect(fakeServer.requests.length).toEqual(1);
+ request = fakeServer.requests[0];
+ expect(request.url).toEqual(OC.webroot + '/index.php/apps/files_trashbin/ajax/delete.php');
+ expect(OC.parseQueryString(request.requestBody))
+ .toEqual({'dir': '/', allfiles: 'true'});
+ fakeServer.requests[0].respond(
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify({status: 'success'})
+ );
+ expect(fileList.isEmpty).toEqual(true);
+ });
+ });
+ describe('Restore', function() {
+ it('Restores selected files when "Restore" clicked', function() {
+ var request;
+ $('.selectedActions .undelete').click();
+ expect(fakeServer.requests.length).toEqual(1);
+ request = fakeServer.requests[0];
+ expect(request.url).toEqual(OC.webroot + '/index.php/apps/files_trashbin/ajax/undelete.php');
+ expect(OC.parseQueryString(request.requestBody))
+ .toEqual({'dir': '/', files: '["One.txt.d11111","Three.pdf.d33333","somedir.d99999"]'});
+ fakeServer.requests[0].respond(
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify({
+ status: 'success',
+ data: {
+ success: [
+ {filename: 'One.txt.d11111'},
+ {filename: 'Three.pdf.d33333'},
+ {filename: 'somedir.d99999'}
+ ]
+ }
+ })
+ );
+ expect(fileList.findFileEl('One.txt.d11111').length).toEqual(0);
+ expect(fileList.findFileEl('Three.pdf.d33333').length).toEqual(0);
+ expect(fileList.findFileEl('somedir.d99999').length).toEqual(0);
+ expect(fileList.findFileEl('Two.jpg.d22222').length).toEqual(1);
+ });
+ it('Restores all files when all selected when "Restore" clicked', function() {
+ var request;
+ $('.select-all').click();
+ $('.selectedActions .undelete').click();
+ expect(fakeServer.requests.length).toEqual(1);
+ request = fakeServer.requests[0];
+ expect(request.url).toEqual(OC.webroot + '/index.php/apps/files_trashbin/ajax/undelete.php');
+ expect(OC.parseQueryString(request.requestBody))
+ .toEqual({'dir': '/', allfiles: 'true'});
+ fakeServer.requests[0].respond(
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify({status: 'success'})
+ );
+ expect(fileList.isEmpty).toEqual(true);
+ });
+ });
+ });
+});
diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index a735caee945c3fd8cd5d3d98aa2db474b6397fe2..5d536638fe849a1ea347f7bd9873258a7563967d 100644
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@@ -3,8 +3,8 @@
<id>files_versions</id>
<name>Versions</name>
<licence>AGPL</licence>
- <author>Frank Karlitschek</author>
- <require>4.93</require>
+ <author>Frank Karlitschek, Bjoern Schiessle</author>
+ <requiremin>4.93</requiremin>
<shipped>true</shipped>
<description>
ownCloud supports simple version control for files. The versioning app
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index b452bc25b13d4c3c9bf5dd6d5afcdea78d8fb96d..942a1a929f796b56e8603e822a8e129113349a0a 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -1,3 +1,14 @@
+/*
+ * Copyright (c) 2014
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+/* global scanFiles, escapeHTML, formatDate */
$(document).ready(function(){
if ($('#isPublic').val()){
@@ -7,21 +18,20 @@ $(document).ready(function(){
return;
}
- if (typeof FileActions !== 'undefined') {
+ if (OCA.Files) {
// Add versions button to 'files/index.php'
- FileActions.register(
- 'file'
- , 'Versions'
- , OC.PERMISSION_UPDATE
- , function() {
+ OCA.Files.fileActions.register(
+ 'file',
+ 'Versions',
+ OC.PERMISSION_UPDATE,
+ function() {
// Specify icon for hitory button
return OC.imagePath('core','actions/history');
- }
- ,function(filename){
+ }, function(filename, context){
// Action to perform when clicked
if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
- var file = $('#dir').val().replace(/(?!<=\/)$|\/$/, '/' + filename);
+ var file = context.dir.replace(/(?!<=\/)$|\/$/, '/' + filename);
var createDropDown = true;
// Check if drop down is already visible for a different file
if (($('#dropdown').length > 0) ) {
@@ -33,10 +43,9 @@ $(document).ready(function(){
}
if(createDropDown === true) {
- createVersionsDropdown(filename, file);
+ createVersionsDropdown(filename, file, context.fileList);
}
- }
- , t('files_versions', 'Versions')
+ }, t('files_versions', 'Versions')
);
}
@@ -75,7 +84,7 @@ function goToVersionPage(url){
window.location.assign(url);
}
-function createVersionsDropdown(filename, files) {
+function createVersionsDropdown(filename, files, fileList) {
var start = 0;
var fileEl;
@@ -88,7 +97,7 @@ function createVersionsDropdown(filename, files) {
html += '<input type="button" value="'+ t('files_versions', 'More versions...') + '" name="show-more-versions" id="show-more-versions" style="display: none;" />';
if (filename) {
- fileEl = FileList.findFileEl(filename);
+ fileEl = fileList.findFileEl(filename);
fileEl.addClass('mouseOver');
$(html).appendTo(fileEl.find('td.filename'));
} else {
diff --git a/apps/files_versions/l10n/tr.php b/apps/files_versions/l10n/tr.php
index 998c61e9270257c5ec0f4ded961639d936439aea..73b77360a2f2b82687891509c0a00139267eeb42 100644
--- a/apps/files_versions/l10n/tr.php
+++ b/apps/files_versions/l10n/tr.php
@@ -1,6 +1,6 @@
<?php
$TRANSLATIONS = array(
-"Could not revert: %s" => "Geri alınamıyor: %s",
+"Could not revert: %s" => "Geri alınamayan: %s",
"Versions" => "Sürümler",
"Failed to revert {file} to revision {timestamp}." => "{file} dosyası {timestamp} gözden geçirmesine geri alınamadı.",
"More versions..." => "Daha fazla sürüm...",
diff --git a/apps/files_versions/l10n/ur_PK.php b/apps/files_versions/l10n/ur_PK.php
new file mode 100644
index 0000000000000000000000000000000000000000..bbf2391a93e4c1d03343dcf010e4312d663b2f39
--- /dev/null
+++ b/apps/files_versions/l10n/ur_PK.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Restore" => "بØال"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index 5d3882cc3e3cca1ee4c303e48b2e5c94395d1662..2de4001affd05822a2672d7f2a0806bd63e16834 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -29,8 +29,8 @@ class Hooks {
/**
- * @brief Erase versions of deleted file
- * @param array
+ * Erase versions of deleted file
+ * @param array $params
*
* This function is connected to the delete signal of OC_Filesystem
* cleanup the versions directory if the actual file gets deleted
@@ -46,7 +46,7 @@ class Hooks {
}
/**
- * @brief mark file as "deleted" so that we can clean up the versions if the file is gone
+ * mark file as "deleted" so that we can clean up the versions if the file is gone
* @param array $params
*/
public static function pre_remove_hook($params) {
@@ -57,8 +57,8 @@ class Hooks {
}
/**
- * @brief rename/move versions of renamed/moved files
- * @param array with oldpath and newpath
+ * rename/move versions of renamed/moved files
+ * @param array $params array with oldpath and newpath
*
* This function is connected to the rename signal of OC_Filesystem and adjust the name and location
* of the stored versions along the actual file
@@ -75,8 +75,8 @@ class Hooks {
}
/**
- * @brief clean up user specific settings if user gets deleted
- * @param array with uid
+ * clean up user specific settings if user gets deleted
+ * @param array $params array with uid
*
* This function is connected to the pre_deleteUser signal of OC_Users
* to remove the used space for versions stored in the database
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 290264a90cc9a51bd6f779c41bd3b085b2d8d89a..56e1dfc2e2416cb7fd8ad49e48ef2a608288cb34 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -53,7 +53,7 @@ class Storage {
/**
* get current size of all versions from a given user
*
- * @param $user user who owns the versions
+ * @param string $user user who owns the versions
* @return mixed versions size or false if no versions size is stored
*/
private static function getVersionsSize($user) {
@@ -69,8 +69,8 @@ class Storage {
/**
* write to the database how much space is in use for versions
*
- * @param $user owner of the versions
- * @param $size size of the versions
+ * @param string $user owner of the versions
+ * @param int $size size of the versions
*/
private static function setVersionsSize($user, $size) {
if ( self::getVersionsSize($user) === false) {
@@ -147,7 +147,7 @@ class Storage {
/**
- * @brief mark file as deleted so that we can remove the versions if the file is gone
+ * mark file as deleted so that we can remove the versions if the file is gone
* @param string $path
*/
public static function markDeletedFile($path) {
@@ -261,11 +261,11 @@ class Storage {
/**
- * @brief get a list of all available versions of a file in descending chronological order
+ * get a list of all available versions of a file in descending chronological order
* @param string $uid user id from the owner of the file
* @param string $filename file to find versions of, relative to the user files dir
* @param string $userFullPath
- * @returns array versions newest version first
+ * @return array versions newest version first
*/
public static function getVersions($uid, $filename, $userFullPath = '') {
$versions = array();
@@ -307,7 +307,7 @@ class Storage {
}
/**
- * @brief translate a timestamp into a string like "5 days ago"
+ * translate a timestamp into a string like "5 days ago"
* @param int $timestamp
* @return string for example "5 days ago"
*/
@@ -334,9 +334,9 @@ class Storage {
}
/**
- * @brief deletes used space for files versions in db if user was deleted
+ * deletes used space for files versions in db if user was deleted
*
- * @param type $uid id of deleted user
+ * @param string $uid id of deleted user
* @return \OC_DB_StatementWrapper of db delete operation
*/
public static function deleteUser($uid) {
@@ -345,9 +345,9 @@ class Storage {
}
/**
- * @brief get the size of all stored versions from a given user
- * @param $uid id from the user
- * @return size of vesions
+ * get the size of all stored versions from a given user
+ * @param string $uid id from the user
+ * @return int size of versions
*/
private static function calculateSize($uid) {
if (\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED) == 'true') {
@@ -372,7 +372,7 @@ class Storage {
}
/**
- * @brief returns all stored file versions from a given user
+ * returns all stored file versions from a given user
* @param string $uid id of the user
* @return array with contains two arrays 'all' which contains all versions sorted by age and 'by_file' which contains all versions sorted by filename
*/
@@ -420,7 +420,7 @@ class Storage {
}
/**
- * @brief get list of files we want to expire
+ * get list of files we want to expire
* @param array $versions list of versions
* @param integer $time
* @return array containing the list of to deleted versions and the size of them
@@ -477,7 +477,7 @@ class Storage {
}
/**
- * @brief Erase a file's versions which exceed the set quota
+ * Erase a file's versions which exceed the set quota
*/
private static function expire($filename, $versionsSize = null, $offset = 0) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
@@ -574,12 +574,12 @@ class Storage {
}
/**
- * @brief create recursively missing directories
+ * create recursively missing directories
* @param string $filename $path to a file
* @param \OC\Files\View $view view on data/user/
*/
private static function createMissingDirectories($filename, $view) {
- $dirname = \OC_Filesystem::normalizePath(dirname($filename));
+ $dirname = \OC\Files\Filesystem::normalizePath(dirname($filename));
$dirParts = explode('/', $dirname);
$dir = "/files_versions";
foreach ($dirParts as $part) {
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index 9f15b86d981452e167f83ee475087b9b35173f48..aa66faffcbfe0a19a304b4f0aef5f4fc751140db 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -24,14 +24,14 @@ require_once __DIR__ . '/../lib/versions.php';
/**
* Class Test_Files_versions
- * @brief this class provide basic files versions test
+ * this class provide basic files versions test
*/
class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
/**
* @medium
- * @brief test expire logic
+ * test expire logic
* @dataProvider versionsProvider
*/
function testGetExpireList($versions, $sizeOfAllDeletedFiles) {
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index e4a4375a737fed5eaf489e7e9013ad9e6d8ab96f..b70f0c543559c0722e8e0c9bc108cbdcf0b7c2f8 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -9,7 +9,7 @@
</description>
<licence>AGPL</licence>
<author>Dominik Schmidt and Arthur Schiwon</author>
- <require>4.93</require>
+ <requiremin>4.93</requiremin>
<shipped>true</shipped>
<types>
<authentication/>
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index e5bec602f6218857fa6934ecfc38110bf595ccc2..4051b1d8cae2ad062c309630efcb6d08cf42df2b 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -39,10 +39,10 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
}
/**
- * @brief is user in group?
- * @param $uid uid of the user
- * @param $gid gid of the group
- * @returns true/false
+ * is user in group?
+ * @param string $uid uid of the user
+ * @param string $gid gid of the group
+ * @return bool
*
* Checks whether the user is member of a group or not.
*/
@@ -126,9 +126,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
}
/**
- * @brief Get all groups a user belongs to
- * @param $uid Name of the user
- * @returns array with group names
+ * Get all groups a user belongs to
+ * @param string $uid Name of the user
+ * @return array with group names
*
* This function fetches all groups a user belongs to. It does not check
* if the user exists at all.
@@ -177,8 +177,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
}
$allGroups = array();
if (array_key_exists($dn, $seen)) {
- // avoid loops
- return array();
+ // avoid loops
+ return array();
}
$seen[$dn] = true;
$filter = $this->access->combineFilterWithAnd(array(
@@ -204,8 +204,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
}
/**
- * @brief get a list of all users in a group
- * @returns array with user ids
+ * get a list of all users in a group
+ * @return array with user ids
*/
public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
if(!$this->enabled) {
@@ -285,10 +285,10 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
}
/**
- * @brief returns the number of users in a group, who match the search term
- * @param string the internal group name
- * @param string optional, a search string
- * @returns int | bool
+ * returns the number of users in a group, who match the search term
+ * @param string $gid the internal group name
+ * @param string $search optional, a search string
+ * @return int|bool
*/
public function countUsersInGroup($gid, $search = '') {
$cachekey = 'countUsersInGroup-'.$gid.'-'.$search;
@@ -363,8 +363,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
}
/**
- * @brief get a list of all groups
- * @returns array with group names
+ * get a list of all groups
+ * @return array with group names
*
* Returns a list with all groups (used by getGroups)
*/
@@ -402,8 +402,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
}
/**
- * @brief get a list of all groups using a paged search
- * @returns array with group names
+ * get a list of all groups using a paged search
+ * @return array with group names
*
* Returns a list with all groups
* Uses a paged search if available to override a
@@ -480,9 +480,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
}
/**
- * @brief Check if backend implements actions
- * @param $actions bitwise-or'ed actions
- * @returns boolean
+ * Check if backend implements actions
+ * @param int $actions bitwise-or'ed actions
+ * @return boolean
*
* Returns the supported actions as int to be
* compared with OC_USER_BACKEND_CREATE_USER etc.
diff --git a/apps/user_ldap/group_proxy.php b/apps/user_ldap/group_proxy.php
index ea94990ffe40d8e8a7cba821cc7da69ab30a86e6..1a36953676bad82e065c63a9b2045a0117ae2e71 100644
--- a/apps/user_ldap/group_proxy.php
+++ b/apps/user_ldap/group_proxy.php
@@ -30,13 +30,13 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
private $refBackend = null;
/**
- * @brief Constructor
- * @param $serverConfigPrefixes array containing the config Prefixes
+ * Constructor
+ * @param string[] $serverConfigPrefixes array containing the config Prefixes
*/
public function __construct($serverConfigPrefixes, ILDAPWrapper $ldap) {
parent::__construct($ldap);
foreach($serverConfigPrefixes as $configPrefix) {
- $this->backends[$configPrefix] =
+ $this->backends[$configPrefix] =
new \OCA\user_ldap\GROUP_LDAP($this->getAccess($configPrefix));
if(is_null($this->refBackend)) {
$this->refBackend = &$this->backends[$configPrefix];
@@ -45,29 +45,29 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
}
/**
- * @brief Tries the backends one after the other until a positive result is returned from the specified method
- * @param $gid string, the gid connected to the request
- * @param $method string, the method of the group backend that shall be called
- * @param $parameters an array of parameters to be passed
+ * Tries the backends one after the other until a positive result is returned from the specified method
+ * @param string $gid the gid connected to the request
+ * @param string $method the method of the group backend that shall be called
+ * @param array $parameters an array of parameters to be passed
* @return mixed, the result of the method or false
*/
protected function walkBackends($gid, $method, $parameters) {
$cacheKey = $this->getGroupCacheKey($gid);
foreach($this->backends as $configPrefix => $backend) {
- if($result = call_user_func_array(array($backend, $method), $parameters)) {
+ if($result = call_user_func_array(array($backend, $method), $parameters)) {
$this->writeToCache($cacheKey, $configPrefix);
return $result;
- }
+ }
}
return false;
}
/**
- * @brief Asks the backend connected to the server that supposely takes care of the gid from the request.
- * @param $gid string, the gid connected to the request
- * @param $method string, the method of the group backend that shall be called
- * @param $parameters an array of parameters to be passed
- * @param $passOnWhen the result matches this variable
+ * Asks the backend connected to the server that supposely takes care of the gid from the request.
+ * @param string $gid the gid connected to the request
+ * @param string $method the method of the group backend that shall be called
+ * @param array $parameters an array of parameters to be passed
+ * @param mixed $passOnWhen the result matches this variable
* @return mixed, the result of the method or false
*/
protected function callOnLastSeenOn($gid, $method, $parameters, $passOnWhen) {
@@ -95,10 +95,10 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
}
/**
- * @brief is user in group?
- * @param $uid uid of the user
- * @param $gid gid of the group
- * @returns true/false
+ * is user in group?
+ * @param string $uid uid of the user
+ * @param string $gid gid of the group
+ * @return bool
*
* Checks whether the user is member of a group or not.
*/
@@ -107,9 +107,9 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
}
/**
- * @brief Get all groups a user belongs to
- * @param $uid Name of the user
- * @returns array with group names
+ * Get all groups a user belongs to
+ * @param string $uid Name of the user
+ * @return string[] with group names
*
* This function fetches all groups a user belongs to. It does not check
* if the user exists at all.
@@ -118,7 +118,7 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
$groups = array();
foreach($this->backends as $backend) {
- $backendGroups = $backend->getUserGroups($uid);
+ $backendGroups = $backend->getUserGroups($uid);
if (is_array($backendGroups)) {
$groups = array_merge($groups, $backendGroups);
}
@@ -128,14 +128,14 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
}
/**
- * @brief get a list of all users in a group
- * @returns array with user ids
+ * get a list of all users in a group
+ * @return string[] with user ids
*/
public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
$users = array();
foreach($this->backends as $backend) {
- $backendUsers = $backend->usersInGroup($gid, $search, $limit, $offset);
+ $backendUsers = $backend->usersInGroup($gid, $search, $limit, $offset);
if (is_array($backendUsers)) {
$users = array_merge($users, $backendUsers);
}
@@ -145,10 +145,10 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
}
/**
- * @brief returns the number of users in a group, who match the search term
- * @param string the internal group name
- * @param string optional, a search string
- * @returns int | bool
+ * returns the number of users in a group, who match the search term
+ * @param string $gid the internal group name
+ * @param string $search optional, a search string
+ * @return int|bool
*/
public function countUsersInGroup($gid, $search = '') {
return $this->handleRequest(
@@ -156,8 +156,8 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
}
/**
- * @brief get a list of all groups
- * @returns array with group names
+ * get a list of all groups
+ * @return string[] with group names
*
* Returns a list with all groups
*/
@@ -165,7 +165,7 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
$groups = array();
foreach($this->backends as $backend) {
- $backendGroups = $backend->getGroups($search, $limit, $offset);
+ $backendGroups = $backend->getGroups($search, $limit, $offset);
if (is_array($backendGroups)) {
$groups = array_merge($groups, $backendGroups);
}
@@ -184,9 +184,9 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
}
/**
- * @brief Check if backend implements actions
- * @param $actions bitwise-or'ed actions
- * @returns boolean
+ * Check if backend implements actions
+ * @param int $actions bitwise-or'ed actions
+ * @return boolean
*
* Returns the supported actions as int to be
* compared with OC_USER_BACKEND_CREATE_USER etc.
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index fca2dc13d1518e7a5a30b92cb1b398f1fc625b41..8c18cc4c58c6005e1b9e685ee048d3e58d813121 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -90,7 +90,7 @@ var LdapConfiguration = {
);
}
$('#ldap_serverconfig_chooser option:selected').removeAttr('selected');
- var html = '<option value="'+result.configPrefix+'" selected="selected">'+$('#ldap_serverconfig_chooser option').length+'. Server</option>';
+ var html = '<option value="'+result.configPrefix+'" selected="selected">'+t('user_ldap','{nbServer}. Server', {nbServer: $('#ldap_serverconfig_chooser option').length})+'</option>';
$('#ldap_serverconfig_chooser option:last').before(html);
LdapWizard.init();
} else {
@@ -241,8 +241,8 @@ var LdapWizard = {
},
function (result) {
LdapWizard.hideSpinner('#ldap_base');
- LdapWizard.showInfoBox('Please specify a Base DN');
- LdapWizard.showInfoBox('Could not determine Base DN');
+ LdapWizard.showInfoBox(t('user_ldap', 'Please specify a Base DN'));
+ LdapWizard.showInfoBox(t('user_ldap', 'Could not determine Base DN'));
$('#ldap_base').prop('disabled', false);
}
);
@@ -273,7 +273,7 @@ var LdapWizard = {
function (result) {
LdapWizard.hideSpinner('#ldap_port');
$('#ldap_port').prop('disabled', false);
- LdapWizard.showInfoBox('Please specify the port');
+ LdapWizard.showInfoBox(t('user_ldap', 'Please specify the port'));
}
);
}
@@ -688,7 +688,7 @@ var LdapWizard = {
},
showInfoBox: function(text) {
- $('#ldapWizard1 .ldapWizardInfo').text(t('user_ldap', text));
+ $('#ldapWizard1 .ldapWizardInfo').text(text);
$('#ldapWizard1 .ldapWizardInfo').removeClass('invisible');
LdapWizard.checkInfoShown = true;
},
diff --git a/apps/user_ldap/l10n/af_ZA.php b/apps/user_ldap/l10n/af_ZA.php
index 483a30b8e482b317516a9f61f768816b01872fe0..e4e599e059e3017e1511d15666071cc77cce93a8 100644
--- a/apps/user_ldap/l10n/af_ZA.php
+++ b/apps/user_ldap/l10n/af_ZA.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("",""),
"Help" => "Hulp",
"Password" => "Wagwoord",
-"Continue" => "Gaan voort"
+"Continue" => "Gaan voort",
+"Advanced" => "Gevorderd"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ar.php b/apps/user_ldap/l10n/ar.php
index a2152dde852a5a3ed461eb157d4a285a332d1282..1b0b1e8d41341f384f624c139cd366220be955b6 100644
--- a/apps/user_ldap/l10n/ar.php
+++ b/apps/user_ldap/l10n/ar.php
@@ -14,6 +14,7 @@ $TRANSLATIONS = array(
"Port" => "المنÙØ°",
"Password" => "كلمة المرور",
"Back" => "رجوع",
+"Advanced" => "تعديلات متقدمه",
"Email Field" => "خانة البريد الإلكتروني"
);
$PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/apps/user_ldap/l10n/ast.php b/apps/user_ldap/l10n/ast.php
index 032de8aedbcd77be3b4572351c0fdfa5ee697a5e..620454a9561e1c296646f101ee6317bbbca29918 100644
--- a/apps/user_ldap/l10n/ast.php
+++ b/apps/user_ldap/l10n/ast.php
@@ -1,5 +1,8 @@
<?php
$TRANSLATIONS = array(
+"Failed to delete the server configuration" => "Fallu al desaniciar la configuración del sevidor",
+"The configuration is valid and the connection could be established!" => "¡La configuración ye válida y pudo afitase la conexón!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuración ye válida, pero falló'l vÃnculu. Por favor, comprueba la configuración y les credenciales nel servidor.",
"The configuration is invalid. Please have a look at the logs for further details." => "La configuración nun ye válida. Por favor, écha-y un güeyu a los rexistros pa más detalles.",
"No action specified" => "Nun s'especificó l'aición",
"No configuration specified" => "Nun s'especificó la configuración",
@@ -14,10 +17,13 @@ $TRANSLATIONS = array(
"Configuration incomplete" => "Configuración incompleta",
"Select groups" => "Esbillar grupos",
"Select attributes" => "Esbillar atributos",
+"Connection test succeeded" => "Test de conexón esitosu",
+"Connection test failed" => "Falló'l test de conexón",
"_%s group found_::_%s groups found_" => array("%s grupu alcontráu","%s grupos alcontraos"),
"_%s user found_::_%s users found_" => array("%s usuariu alcontráu","%s usuarios alcontraos"),
"Could not find the desired feature" => "Nun pudo alcontrase la carauterÃstica deseyada",
"Save" => "Guardar",
+"Help" => "Ayuda",
"groups found" => "grupos alcontraos",
"Users login with this attribute:" => "Aniciu de sesión d'usuarios con esti atributu:",
"LDAP Username:" => "Nome d'usuariu LDAP",
@@ -29,6 +35,7 @@ $TRANSLATIONS = array(
"For anonymous access, leave DN and Password empty." => "Pa un accesu anónimu, dexar el DN y la contraseña baleros.",
"users found" => "usuarios alcontraos",
"Continue" => "Continuar",
+"Advanced" => "Avanzáu",
"Connection Settings" => "Axustes de conexón",
"Configuration Active" => "Configuración activa",
"When unchecked, this configuration will be skipped." => "Cuando nun tea conseñáu, saltaráse esta configuración.",
diff --git a/apps/user_ldap/l10n/be.php b/apps/user_ldap/l10n/be.php
index 089b92efe7b1a114cdfa71fcbc7e546c1fcb23c3..b55e4595318eba25d2cff221fb064807f8794675 100644
--- a/apps/user_ldap/l10n/be.php
+++ b/apps/user_ldap/l10n/be.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"Error" => "Памылка",
"_%s group found_::_%s groups found_" => array("","","",""),
-"_%s user found_::_%s users found_" => array("","","","")
+"_%s user found_::_%s users found_" => array("","","",""),
+"Advanced" => "ДаÑведчаны"
);
$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/user_ldap/l10n/bg_BG.php b/apps/user_ldap/l10n/bg_BG.php
index 588f6d448b4f24f86b137dea2d629f4997229817..3c274ea3c733a7de427bc36f5e212f440fbffc71 100644
--- a/apps/user_ldap/l10n/bg_BG.php
+++ b/apps/user_ldap/l10n/bg_BG.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("",""),
"Save" => "ЗапиÑ",
"Help" => "Помощ",
-"Password" => "Парола"
+"Password" => "Парола",
+"Advanced" => "Разширено"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/bn_BD.php b/apps/user_ldap/l10n/bn_BD.php
index 90f7b572a952c71e5c0476d57e6a9b14ae23d623..17c9fb603dde067e0f79127459641d03f6029a7c 100644
--- a/apps/user_ldap/l10n/bn_BD.php
+++ b/apps/user_ldap/l10n/bn_BD.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
"Error" => "সমসà§à¦¯à¦¾",
"_%s group found_::_%s groups found_" => array("",""),
"_%s user found_::_%s users found_" => array("",""),
+"Group Filter" => "গোষà§à¦ ী ছাà¦à¦•à¦¨à§€",
"Save" => "সংরকà§à¦·à¦£",
"Help" => "সহায়িকা",
"Host" => "হোসà§à¦Ÿ",
@@ -13,6 +14,7 @@ $TRANSLATIONS = array(
"Password" => "কূটশবà§à¦¦",
"For anonymous access, leave DN and Password empty." => "অজà§à¦žà¦¾à¦¤à¦•à§à¦²à¦¶à§€à¦² অধিগমনের জনà§à¦¯ DN à¦à¦¬à¦‚ কূটশবà§à¦¦à¦Ÿà¦¿ ফাà¦à¦•à¦¾ রাখà§à¦¨à¥¤",
"You can specify Base DN for users and groups in the Advanced tab" => "সà§à¦šà¦¾à¦°à§ টà§à¦¯à¦…বে গিয়ে আপনি বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à¦¿ à¦à¦¬à¦‚ গোষà§à¦ ীসমূহের জনà§à¦¯ à¦à¦¿à¦¤à§à¦¤à¦¿ DN নিরà§à¦§à¦¾à¦°à¦£ করতে পারেন।",
+"Advanced" => "সà§à¦šà¦¾à¦°à§",
"Turn off SSL certificate validation." => "SSL সনদপতà§à¦° যাচাইকরণ বনà§à¦§ রাক।",
"in seconds. A change empties the cache." => "সেকেনà§à¦¡à§‡à¥¤ কোন পরিবরà§à¦¤à¦¨ কà§à¦¯à¦¾à¦¸à§‡ খালি করবে।",
"User Display Name Field" => "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦° পà§à¦°à¦¦à¦°à§à¦¶à¦¿à¦¤à¦¬à§à¦¯ নামের কà§à¦·à§‡à¦¤à§à¦°",
diff --git a/apps/user_ldap/l10n/bn_IN.php b/apps/user_ldap/l10n/bn_IN.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a1e002311cd9c1851bda1b96f71bc4d3e3e047b
--- /dev/null
+++ b/apps/user_ldap/l10n/bn_IN.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index c8542586f82bc091ad82cd1f9e364c9b86054c2b..fe9268cb9fb5d40094280db37c0725498f3cda50 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("S'ha trobat %s usuari","S'han trobat %s usuaris"),
"Invalid Host" => "Ordinador central no và lid",
"Could not find the desired feature" => "La caracterÃstica desitjada no s'ha trobat",
+"Group Filter" => "Filtre de grup",
"Save" => "Desa",
"Test Configuration" => "Comprovació de la configuració",
"Help" => "Ajuda",
@@ -60,6 +61,7 @@ $TRANSLATIONS = array(
"users found" => "usuaris trobats",
"Back" => "Enrera",
"Continue" => "Continua",
+"Advanced" => "Avançat",
"<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>AvÃs:</b> Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments inesperats. Demaneu a l'administrador del sistema que en desactivi una.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>AvÃs:</b> El mòdul PHP LDAP no està instal·lat, el dorsal no funcionarà . Demaneu a l'administrador del sistema que l'instal·li.",
"Connection Settings" => "Arranjaments de connexió",
@@ -73,8 +75,8 @@ $TRANSLATIONS = array(
"Case insensitive LDAP server (Windows)" => "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)",
"Turn off SSL certificate validation." => "Desactiva la validació de 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." => "No es recomana, useu-ho només com a prova! Importeu el certificat SSL del servidor LDAP al servidor %s només si la connexió funciona amb aquesta opció.",
-"Cache Time-To-Live" => "Memòria de cau Time-To-Live",
-"in seconds. A change empties the cache." => "en segons. Un canvi buidarà la memòria de cau.",
+"Cache Time-To-Live" => "Memòria cau Time-To-Live",
+"in seconds. A change empties the cache." => "en segons. Un canvi buidarà la memòria cau.",
"Directory Settings" => "Arranjaments de carpetes",
"User Display Name Field" => "Camp per mostrar el nom d'usuari",
"The LDAP attribute to use to generate the user's display name." => "Atribut LDAP a usar per generar el nom a mostrar de l'usuari.",
@@ -107,7 +109,7 @@ $TRANSLATIONS = array(
"UUID Attribute for Users:" => "Atribut UUID per Usuaris:",
"UUID Attribute for Groups:" => "Atribut UUID per Grups:",
"Username-LDAP User Mapping" => "Mapatge d'usuari Nom d'usuari-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." => "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisió i reconèixer els usuaris, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A més, la DN es posa a la memòria de cau per reduir la interacció LDAP, però no s'usa per identificació. En cas que la DN canvïi, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producció, només en un estadi de prova o experimental.",
+"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." => "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisió i reconèixer els usuaris, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A més, la DN es posa a la memòria cau per reduir la interacció LDAP, però no s'usa per identificació. En cas que la DN canvïi, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producció, només en un estadi de prova o experimental.",
"Clear Username-LDAP User Mapping" => "Elimina el mapatge d'usuari Nom d'usuari-LDAP",
"Clear Groupname-LDAP Group Mapping" => "Elimina el mapatge de grup Nom de grup-LDAP"
);
diff --git a/apps/user_ldap/l10n/ca@valencia.php b/apps/user_ldap/l10n/ca@valencia.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a1e002311cd9c1851bda1b96f71bc4d3e3e047b
--- /dev/null
+++ b/apps/user_ldap/l10n/ca@valencia.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$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 b7dfa5a4c414865e1376026cb52eb7bc0784ab4e..be976b4ccffb28c95cc2cbc7db75d30eca28e8b1 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("nalezen %s uživatel","nalezeni %s uživatelé","nalezeno %s uživatelů"),
"Invalid Host" => "Neplatný hostitel",
"Could not find the desired feature" => "Nelze nalézt požadovanou vlastnost",
+"Group Filter" => "Filtr skupin",
"Save" => "Uložit",
"Test Configuration" => "VyzkouÅ¡et nastavenÃ",
"Help" => "Nápověda",
@@ -60,6 +61,7 @@ $TRANSLATIONS = array(
"users found" => "nalezenà uživatelé",
"Back" => "Zpět",
"Continue" => "PokraÄovat",
+"Advanced" => "PokroÄilé",
"<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>VarovánÃ:</b> Aplikace user_ldap a user_webdavauth jsou vzájemnÄ› nekompatibilnÃ. Můžete zaznamenat neoÄekávané chovánÃ. Požádejte prosÃm vaÅ¡eho systémového administrátora o zakázánà jednoho z nich.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>VarovánÃ:</b> nenà nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosÃm, správce systému, aby jej nainstaloval.",
"Connection Settings" => "Nastavenà spojenÃ",
diff --git a/apps/user_ldap/l10n/cy_GB.php b/apps/user_ldap/l10n/cy_GB.php
index 65a78432c752903d243ce7a44477c7fc5985ff41..905c0401b3fd1b6cc59b5d71ba82ce63c4613e84 100644
--- a/apps/user_ldap/l10n/cy_GB.php
+++ b/apps/user_ldap/l10n/cy_GB.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("","","",""),
"Save" => "Cadw",
"Help" => "Cymorth",
-"Password" => "Cyfrinair"
+"Password" => "Cyfrinair",
+"Advanced" => "Uwch"
);
$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php
index 8264a18116c9292427e8189f9e8653379ab2998b..73a183cb76e075268451eedf80311b2e7d70087a 100644
--- a/apps/user_ldap/l10n/da.php
+++ b/apps/user_ldap/l10n/da.php
@@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Confirm Deletion" => "Bekræft Sletning",
"_%s group found_::_%s groups found_" => array("",""),
"_%s user found_::_%s users found_" => array("",""),
+"Group Filter" => "Gruppe Filter",
"Save" => "Gem",
"Test Configuration" => "Test Konfiguration",
"Help" => "Hjælp",
@@ -28,6 +29,7 @@ $TRANSLATIONS = array(
"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",
"Back" => "Tilbage",
"Continue" => "Videre",
+"Advanced" => "Avanceret",
"Connection Settings" => "Forbindelsesindstillinger ",
"Configuration Active" => "Konfiguration Aktiv",
"Backup (Replica) Host" => "Backup (Replika) Vært",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index 43336520739fd3d6db89f89bfbd459902a1799e4..99e40b1f0d8aab5021eb739444d45ff0dad255d9 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
"Deletion failed" => "Löschen fehlgeschlagen",
"Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
"Keep settings?" => "Einstellungen beibehalten?",
+"{nbServer}. Server" => "{nbServer}. Server",
"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
"mappings cleared" => "Zuordnungen gelöscht",
"Success" => "Erfolgreich",
"Error" => "Fehler",
+"Please specify a Base DN" => "Bitte ein Base-DN spezifizieren",
+"Could not determine Base DN" => "Base-DN konnte nicht festgestellt werden",
+"Please specify the port" => "Bitte Port spezifizieren",
"Configuration OK" => "Konfiguration OK",
"Configuration incorrect" => "Konfiguration nicht korrekt",
"Configuration incomplete" => "Konfiguration nicht vollständig",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s Benutzer gefunden","%s Benutzer gefunden"),
"Invalid Host" => "Ungültiger Host",
"Could not find the desired feature" => "Konnte die gewünschte Funktion nicht finden",
+"Server" => "Server",
+"User Filter" => "Nutzer-Filter",
+"Login Filter" => "Anmeldefilter",
+"Group Filter" => "Gruppen-Filter",
"Save" => "Speichern",
"Test Configuration" => "Testkonfiguration",
"Help" => "Hilfe",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
"LDAP Email Address:" => "LDAP E-Mail-Adresse:",
"Other Attributes:" => "Andere Attribute:",
"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\"",
+"1. Server" => "1. Server",
+"%s. Server:" => "%s. Server:",
"Add Server Configuration" => "Serverkonfiguration hinzufügen",
+"Delete Configuration" => "Konfiguration löschen",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://",
"Port" => "Port",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
"users found" => "Benutzer gefunden",
"Back" => "Zurück",
"Continue" => "Fortsetzen",
+"Expert" => "Experte",
+"Advanced" => "Fortgeschritten",
"<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. Bitte\ndeinen 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. Bitte Deinen Systemadministrator das Modul zu installieren.",
"Connection Settings" => "Verbindungseinstellungen",
diff --git a/apps/user_ldap/l10n/de_AT.php b/apps/user_ldap/l10n/de_AT.php
index a4e97dfcadde95488c38c8c53e73c56e9c36803a..f74fc7967751e0d670e18921bdaa4f7c1d5ed8f5 100644
--- a/apps/user_ldap/l10n/de_AT.php
+++ b/apps/user_ldap/l10n/de_AT.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
"_%s group found_::_%s groups found_" => array("",""),
"_%s user found_::_%s users found_" => array("",""),
"Save" => "Speichern",
-"Password" => "Passwort"
+"Password" => "Passwort",
+"Advanced" => "Erweitert"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/de_CH.php b/apps/user_ldap/l10n/de_CH.php
index f60d425a2e6adb04dbd3af4a96913ff116b2a8fb..c0b5c80728e2af4ac83b3679ee6b291a0cd6644c 100644
--- a/apps/user_ldap/l10n/de_CH.php
+++ b/apps/user_ldap/l10n/de_CH.php
@@ -18,6 +18,7 @@ $TRANSLATIONS = array(
"Confirm Deletion" => "Löschung bestätigen",
"_%s group found_::_%s groups found_" => array("",""),
"_%s user found_::_%s users found_" => array("",""),
+"Group Filter" => "Gruppen-Filter",
"Save" => "Speichern",
"Test Configuration" => "Testkonfiguration",
"Help" => "Hilfe",
@@ -32,6 +33,7 @@ $TRANSLATIONS = array(
"For anonymous access, leave DN and Password empty." => "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
"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",
+"Advanced" => "Erweitert",
"<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.",
"Connection Settings" => "Verbindungseinstellungen",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 21c149d1a1d243ca47bc88ce6a50507abc293cf8..43cc5e80777e126d32520c83b365f48e667ea73b 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
"Deletion failed" => "Löschen fehlgeschlagen",
"Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
"Keep settings?" => "Einstellungen beibehalten?",
+"{nbServer}. Server" => "{nbServer}. Server",
"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
"mappings cleared" => "Zuordnungen gelöscht",
"Success" => "Erfolg",
"Error" => "Fehler",
+"Please specify a Base DN" => "Bitte ein Base-DN spezifizieren",
+"Could not determine Base DN" => "Base-DN konnte nicht festgestellt werden",
+"Please specify the port" => "Bitte Port spezifizieren",
"Configuration OK" => "Konfiguration OK",
"Configuration incorrect" => "Konfiguration nicht korrekt",
"Configuration incomplete" => "Konfiguration nicht vollständig",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s Benutzer gefunden","%s Benutzer gefunden"),
"Invalid Host" => "Ungültiger Host",
"Could not find the desired feature" => "Konnte die gewünschte Funktion nicht finden",
+"Server" => "Server",
+"User Filter" => "Nutzer-Filter",
+"Login Filter" => "Anmeldefilter",
+"Group Filter" => "Gruppen-Filter",
"Save" => "Speichern",
"Test Configuration" => "Testkonfiguration",
"Help" => "Hilfe",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
"LDAP Email Address:" => "LDAP E-Mail-Adresse:",
"Other Attributes:" => "Andere Attribute:",
"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\"",
+"1. Server" => "1. Server",
+"%s. Server:" => "%s. Server:",
"Add Server Configuration" => "Serverkonfiguration hinzufügen",
+"Delete Configuration" => "Konfiguration löschen",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
"Port" => "Port",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
"users found" => "Benutzer gefunden",
"Back" => "Zurück",
"Continue" => "Fortsetzen",
+"Expert" => "Experte",
+"Advanced" => "Fortgeschritten",
"<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.",
"Connection Settings" => "Verbindungseinstellungen",
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index cfc5286a4084bbe498f91376d62aa2a0db1ba06b..bbafe123174d991c4d17d326936e56e401ef29d8 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -16,6 +16,9 @@ $TRANSLATIONS = array(
"mappings cleared" => "αντιστοιχίες εκκαθαÏίστηκαν",
"Success" => "Επιτυχία",
"Error" => "Σφάλμα",
+"Please specify a Base DN" => "ΠαÏακαλώ οÏίστε Îνα βασικό ΔιακεκÏιμÎνο Όνομα",
+"Could not determine Base DN" => "Δεν ήταν δυνατό να καθοÏιστεί το βασικό ΔιακεκÏιμÎνο Όνομα",
+"Please specify the port" => "ΠαÏακαλώ οÏίστε την θÏÏα",
"Configuration OK" => "Η διαμόÏφωση είναι εντάξει",
"Configuration incorrect" => "Η διαμόÏφωση είναι λανθασμÎνη",
"Configuration incomplete" => "Η διαμόÏφωση είναι ελλιπής",
@@ -30,6 +33,9 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s χÏήστης βÏÎθηκε","%s χÏήστες βÏÎθηκαν"),
"Invalid Host" => "ΆκυÏος εξυπηÏετητής",
"Could not find the desired feature" => "Αδυναμία εÏÏεσης επιθυμητου χαÏακτηÏιστικοÏ",
+"Server" => "Διακομιστής",
+"User Filter" => "ΦίλτÏο χÏηστών",
+"Group Filter" => "Group Filter",
"Save" => "Αποθήκευση",
"Test Configuration" => "Δοκιμαστικες Ïυθμισεις",
"Help" => "Βοήθεια",
@@ -45,7 +51,9 @@ $TRANSLATIONS = array(
"LDAP Email Address:" => "ΔιεÏθυνση ηλ. ταχυδÏομείου LDAP:",
"Other Attributes:" => "Άλλες Ιδιότητες:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "ΟÏίζει το φίλτÏο που θα εφαÏμοστεί, όταν επιχειÏιθεί σÏνδεση. Το %%uid αντικαθιστά το όνομα χÏήστη κατά τη σÏνδεση. ΠαÏάδειγμα: \"uid=%%uid\"",
+"1. Server" => "1. Διακομιστής",
"Add Server Configuration" => "Î Ïοσθήκη Ρυθμίσεων Διακομιστή",
+"Delete Configuration" => "Απαλοιφή Ïυθμίσεων",
"Host" => "Διακομιστής",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "ΜποÏείτε να παÏαλείψετε το Ï€Ïωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την πεÏίπτωση ξεκινήστε με ldaps://",
"Port" => "ΘÏÏα",
@@ -60,6 +68,7 @@ $TRANSLATIONS = array(
"users found" => "χÏήστες βÏÎθηκαν",
"Back" => "ΕπιστÏοφή",
"Continue" => "ΣυνÎχεια",
+"Advanced" => "Για Ï€ÏοχωÏημÎνους",
"<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>Î Ïοσοχή:</b> Οι εφαÏμογÎÏ‚ user_ldap και user_webdavauth είναι ασÏμβατες. ΜποÏεί να αντιμετωπίσετε απÏόβλεπτη συμπεÏιφοÏά. ΠαÏακαλώ ζητήστε από τον διαχειÏιστή συστήματος να απενεÏγοποιήσει μία από αυτÎÏ‚.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Î Ïοσοχή:</b> Το άÏθÏωμα PHP LDAP δεν είναι εγκατεστημÎνο και το σÏστημα υποστήÏιξης δεν θα δουλÎψει. ΠαÏακαλώ ζητήστε από τον διαχειÏιστή συστήματος να το εγκαταστήσει.",
"Connection Settings" => "Ρυθμίσεις ΣÏνδεσης",
@@ -70,6 +79,7 @@ $TRANSLATIONS = array(
"Backup (Replica) Port" => "ΔημιουÏγία αντιγÏάφων ασφαλείας (Replica) Υποδοχη",
"Disable Main Server" => "ΑπενεÏγοποιηση του κεντÏικου διακομιστη",
"Only connect to the replica server." => "ΣÏνδεση μόνο με το διακομιστή-αντίγÏαφο.",
+"Case insensitive 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." => "Δεν Ï€Ïοτείνεται, χÏησιμοποιείστε το μόνο για δοκιμÎÏ‚! Εάν η σÏνδεση λειτουÏγεί μόνο με αυτή την επιλογή, εισάγετε το πιστοποιητικό SSL του διακομιστή LDAP στο %s διακομιστή σας.",
"Cache Time-To-Live" => "Cache Time-To-Live",
@@ -88,6 +98,9 @@ $TRANSLATIONS = array(
"Group Search Attributes" => "Ομάδα ΧαÏακτηÏιστικων Αναζήτηση",
"Group-Member association" => "Group-Member association",
"Nested Groups" => "ΦωλιασμÎνες ομάδες",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Όταν ενεÏγοποιηθεί, οι ομάδες που πεÏιÎχουν ομάδες υποστηÏίζονται. (ΛειτουÏγεί μόνο αν το χαÏακτηÏιστικό μÎλους ομάδες πεÏιÎχει ΔιακεκÏιμÎνα Ονόματα.)",
+"Paging chunksize" => "ÎœÎγεθος σελιδοποίησης",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "ÎœÎγεθος τμήματος που χÏησιμοποιείται για την σελιδοποίηση αναζητήσεων LDAP που μποÏεί να επιστÏÎψουν πολλά δεδομÎνα, όπως απαÏίθμηση χÏηστών ή ομάδων. (Η τιμή 0 απενεÏγοποιεί την σελιδοποίηση των αναζητήσεων LDAP σε αυτÎÏ‚ τις πεÏιπτώσεις.)",
"Special Attributes" => "Ειδικά ΧαÏακτηÏιστικά ",
"Quota Field" => "Ποσοσταση πεδιου",
"Quota Default" => "Î Ïοκαθισμενο πεδιο",
diff --git a/apps/user_ldap/l10n/en_GB.php b/apps/user_ldap/l10n/en_GB.php
index cb0ac1a5497c8c47905b1b4bee2474fd43d2627d..59ff86cb2411762ecae8c910e73fc8c8fdd01a51 100644
--- a/apps/user_ldap/l10n/en_GB.php
+++ b/apps/user_ldap/l10n/en_GB.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
"Deletion failed" => "Deletion failed",
"Take over settings from recent server configuration?" => "Take over settings from recent server configuration?",
"Keep settings?" => "Keep settings?",
+"{nbServer}. Server" => "{nbServer}. Server",
"Cannot add server configuration" => "Cannot add server configuration",
"mappings cleared" => "mappings cleared",
"Success" => "Success",
"Error" => "Error",
+"Please specify a Base DN" => "Please specify a Base DN",
+"Could not determine Base DN" => "Could not determine Base DN",
+"Please specify the port" => "Please specify the port",
"Configuration OK" => "Configuration OK",
"Configuration incorrect" => "Configuration incorrect",
"Configuration incomplete" => "Configuration incomplete",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s user found","%s users found"),
"Invalid Host" => "Invalid Host",
"Could not find the desired feature" => "Could not find the desired feature",
+"Server" => "Server",
+"User Filter" => "User Filter",
+"Login Filter" => "Login Filter",
+"Group Filter" => "Group Filter",
"Save" => "Save",
"Test Configuration" => "Test Configuration",
"Help" => "Help",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
"LDAP Email Address:" => "LDAP Email Address:",
"Other Attributes:" => "Other Attributes:",
"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\"",
+"1. Server" => "1. Server",
+"%s. Server:" => "%s. Server:",
"Add Server Configuration" => "Add Server Configuration",
+"Delete Configuration" => "Delete 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://",
"Port" => "Port",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
"users found" => "users found",
"Back" => "Back",
"Continue" => "Continue",
+"Expert" => "Expert",
+"Advanced" => "Advanced",
"<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.",
"Connection Settings" => "Connection Settings",
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index 74928899c8a39623cab319eec90ac84f67d0ed92..3dccb192daf8fc5e983423021188d6013eedd81e 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"_%s group found_::_%s groups found_" => array("%s grupo troviÄis","%s grupoj troviÄis"),
"_%s user found_::_%s users found_" => array("%s uzanto troviÄis","%s uzanto troviÄis"),
"Invalid Host" => "Nevalida gastigo",
+"Group Filter" => "Filtrilo de grupo",
"Save" => "Konservi",
"Test Configuration" => "Provi agordon",
"Help" => "Helpo",
@@ -33,6 +34,7 @@ $TRANSLATIONS = array(
"For anonymous access, leave DN and Password empty." => "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj.",
"users found" => "uzantoj trovitaj",
"Back" => "AntaÅen",
+"Advanced" => "Progresinta",
"Connection Settings" => "Agordo de konekto",
"Disable Main Server" => "Malkapabligi la ĉefan servilon",
"Turn off SSL certificate validation." => "Malkapabligi validkontrolon de SSL-atestiloj.",
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index bb1c9acb2abf5a6cb412ce27631beeeaab56fe70..50c19f5634caa773dac9ea0228fe1ae2ac3d6368 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
"Deletion failed" => "Falló el borrado",
"Take over settings from recent server configuration?" => "¿Asumir los ajustes actuales de la configuración del servidor?",
"Keep settings?" => "¿Mantener la configuración?",
+"{nbServer}. Server" => "{nbServer}. Servidor",
"Cannot add server configuration" => "No se puede añadir la configuración del servidor",
"mappings cleared" => "Asignaciones borradas",
"Success" => "Éxito",
"Error" => "Error",
+"Please specify a Base DN" => "Especifique un DN base",
+"Could not determine Base DN" => "No se pudo determinar un DN base",
+"Please specify the port" => "Especifique el puerto",
"Configuration OK" => "Configuración Correcta",
"Configuration incorrect" => "Configuración Incorrecta",
"Configuration incomplete" => "Configuración incompleta",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("Usuario %s encontrado","Usuarios %s encontrados"),
"Invalid Host" => "Host inválido",
"Could not find the desired feature" => "No se puede encontrar la función deseada.",
+"Server" => "Servidor",
+"User Filter" => "Filtro de Usuario",
+"Login Filter" => "Filtro de Login",
+"Group Filter" => "Filtro de grupo",
"Save" => "Guardar",
"Test Configuration" => "Configuración de prueba",
"Help" => "Ayuda",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
"LDAP Email Address:" => "Dirección e-mail LDAP:",
"Other Attributes:" => "Otros atributos:",
"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\"",
+"1. Server" => "1. Servidor",
+"%s. Server:" => "%s. Servidor:",
"Add Server Configuration" => "Agregar configuracion del servidor",
+"Delete Configuration" => "Borrar Configuración",
"Host" => "Servidor",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
"Port" => "Puerto",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
"users found" => "usuarios encontrados",
"Back" => "Atrás",
"Continue" => "Continuar",
+"Expert" => "Experto",
+"Advanced" => "Avanzado",
"<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.",
"Connection Settings" => "Configuración de conexión",
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index 4a8047c6d91b52920b45cad39a3ade51af8b150d..acd92e5e379a73faa2e3abb8461ca59b94ab87fc 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s usuario encontrado","%s usuarios encontrados"),
"Invalid Host" => "Host inválido",
"Could not find the desired feature" => "No se pudo encontrar la caracterÃstica deseada",
+"Group Filter" => "Filtro de grupo",
"Save" => "Guardar",
"Test Configuration" => "Probar configuración",
"Help" => "Ayuda",
@@ -60,6 +61,7 @@ $TRANSLATIONS = array(
"users found" => "usuarios encontrados",
"Back" => "Volver",
"Continue" => "Continuar",
+"Advanced" => "Avanzado",
"<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.",
"Connection Settings" => "Configuración de Conección",
diff --git a/apps/user_ldap/l10n/es_BO.php b/apps/user_ldap/l10n/es_BO.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a1e002311cd9c1851bda1b96f71bc4d3e3e047b
--- /dev/null
+++ b/apps/user_ldap/l10n/es_BO.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_CO.php b/apps/user_ldap/l10n/es_CO.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a1e002311cd9c1851bda1b96f71bc4d3e3e047b
--- /dev/null
+++ b/apps/user_ldap/l10n/es_CO.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_EC.php b/apps/user_ldap/l10n/es_EC.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a1e002311cd9c1851bda1b96f71bc4d3e3e047b
--- /dev/null
+++ b/apps/user_ldap/l10n/es_EC.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_MX.php b/apps/user_ldap/l10n/es_MX.php
index bb4c3700ec56d9a374dc11e5e391740cddef7fd7..1b3220e106332fb82dd88e0609ba8425a26c25f8 100644
--- a/apps/user_ldap/l10n/es_MX.php
+++ b/apps/user_ldap/l10n/es_MX.php
@@ -57,6 +57,7 @@ $TRANSLATIONS = array(
"users found" => "usuarios encontrados",
"Back" => "Atrás",
"Continue" => "Continuar",
+"Advanced" => "Avanzado",
"<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.",
"Connection Settings" => "Configuración de conexión",
diff --git a/apps/user_ldap/l10n/es_PE.php b/apps/user_ldap/l10n/es_PE.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a1e002311cd9c1851bda1b96f71bc4d3e3e047b
--- /dev/null
+++ b/apps/user_ldap/l10n/es_PE.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_PY.php b/apps/user_ldap/l10n/es_PY.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a1e002311cd9c1851bda1b96f71bc4d3e3e047b
--- /dev/null
+++ b/apps/user_ldap/l10n/es_PY.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_US.php b/apps/user_ldap/l10n/es_US.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a1e002311cd9c1851bda1b96f71bc4d3e3e047b
--- /dev/null
+++ b/apps/user_ldap/l10n/es_US.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_UY.php b/apps/user_ldap/l10n/es_UY.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a1e002311cd9c1851bda1b96f71bc4d3e3e047b
--- /dev/null
+++ b/apps/user_ldap/l10n/es_UY.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index 11941bf4ac95cbb1ac40f93d3c3c4f91145f837c..3af3915588a75fecf7a1a99d80ac9988350e8714 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
"Deletion failed" => "Kustutamine ebaõnnestus",
"Take over settings from recent server configuration?" => "Võta sätted viimasest serveri seadistusest?",
"Keep settings?" => "Säilitada seadistused?",
+"{nbServer}. Server" => "{nbServer}. Server",
"Cannot add server configuration" => "Ei suuda lisada serveri seadistust",
"mappings cleared" => "vastendused puhastatud",
"Success" => "Korras",
"Error" => "Viga",
+"Please specify a Base DN" => "Palun määra baas DN",
+"Could not determine Base DN" => "Baas DN-i tuvastamine ebaõnnestus",
+"Please specify the port" => "Palun määra post",
"Configuration OK" => "Seadistus on korras",
"Configuration incorrect" => "Seadistus on vigane",
"Configuration incomplete" => "Seadistus on puudulik",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s kasutaja leitud","%s kasutajat leitud"),
"Invalid Host" => "Vigane server",
"Could not find the desired feature" => "Ei suuda leida soovitud funktsioonaalsust",
+"Server" => "Server",
+"User Filter" => "Kasutaja filter",
+"Login Filter" => "Kasutajanime filter",
+"Group Filter" => "Grupi filter",
"Save" => "Salvesta",
"Test Configuration" => "Testi seadistust",
"Help" => "Abiinfo",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
"LDAP Email Address:" => "LDAP e-posti aadress:",
"Other Attributes:" => "Muud atribuudid:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime. Näide: \"uid=%%uid\"",
+"1. Server" => "1. Server",
+"%s. Server:" => "%s. Server:",
"Add Server Configuration" => "Lisa serveri seadistus",
+"Delete Configuration" => "Kustuta seadistused",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://",
"Port" => "Port",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
"users found" => "kasutajat leitud",
"Back" => "Tagasi",
"Continue" => "Jätka",
+"Expert" => "Ekspert",
+"Advanced" => "Täpsem",
"<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>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Hoiatus:</b>PHP LDAP moodul pole paigaldatud ning LDAP kasutamine ei ole võimalik. Palu oma süsteeihaldurit see paigaldada.",
"Connection Settings" => "Ãœhenduse seaded",
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index c19cb034ad0c3ab0986eca900309dedd8dfd7681..cebf2a53cc387e2db9e2779f011549ee07c47600 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("Erabiltzaile %s aurkitu da","%s erabiltzaile aurkitu dira"),
"Invalid Host" => "Baliogabeko hostalaria",
"Could not find the desired feature" => "Ezin izan da nahi zen ezaugarria aurkitu",
+"Group Filter" => "Taldeen iragazkia",
"Save" => "Gorde",
"Test Configuration" => "Egiaztatu Konfigurazioa",
"Help" => "Laguntza",
@@ -52,6 +53,7 @@ $TRANSLATIONS = array(
"users found" => "erabiltzaile aurkituta",
"Back" => "Atzera",
"Continue" => "Jarraitu",
+"Advanced" => "Aurreratua",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan.",
"Connection Settings" => "Konexio Ezarpenak",
"Configuration Active" => "Konfigurazio Aktiboa",
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
index 62a949f88bd58211b6e82b3a6146bf1b3eb3747a..1e149a11207d30519a018a778bc439fad65dad79 100644
--- a/apps/user_ldap/l10n/fa.php
+++ b/apps/user_ldap/l10n/fa.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
"Confirm Deletion" => "تایید ØØ°Ù",
"_%s group found_::_%s groups found_" => array(""),
"_%s user found_::_%s users found_" => array(""),
+"Group Filter" => "Ùیلتر گروه",
"Save" => "ذخیره",
"Test Configuration" => "امتØان پیکربندی",
"Help" => "راه‌نما",
@@ -28,6 +29,8 @@ $TRANSLATIONS = array(
"One Base DN per line" => "یک پایه DN در هر خط",
"You can specify Base DN for users and groups in the Advanced tab" => "شما می توانید پایه DN را برای کاربران و گروه ها در زبانه Advanced مشخص کنید.",
"Back" => "بازگشت",
+"Continue" => "ادامه",
+"Advanced" => "پیشرÙته",
"Connection Settings" => "تنظیمات اتصال",
"Configuration Active" => "پیکربندی Ùعال",
"When unchecked, this configuration will be skipped." => "زمانیکه انتخاب نشود، این پیکربندی نادیده گرÙته خواهد شد.",
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index 552fd9f923bbf63906083533d0bcf7bd40167651..f558fa78977510bba6954c7da46095155a1f678b 100644
--- a/apps/user_ldap/l10n/fi_FI.php
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -1,18 +1,35 @@
<?php
$TRANSLATIONS = array(
+"Failed to delete the server configuration" => "Palvelinmäärityksen poistaminen epäonnistui",
+"The configuration is valid and the connection could be established!" => "Määritys on kelvollinen ja yhteys kyettiin muodostamaan!",
"Deletion failed" => "Poisto epäonnistui",
"Keep settings?" => "Säilytetäänkö asetukset?",
"Cannot add server configuration" => "Palvelinasetusten lisäys epäonnistui",
"Success" => "Onnistui!",
"Error" => "Virhe",
+"Please specify the port" => "Määritä portti",
+"Configuration OK" => "Määritykset OK",
+"Configuration incorrect" => "Määritykset väärin",
+"Configuration incomplete" => "Määritykset puutteelliset",
"Select groups" => "Valitse ryhmät",
"Connection test succeeded" => "Yhteystesti onnistui",
"Connection test failed" => "Yhteystesti epäonnistui",
+"Do you really want to delete the current Server Configuration?" => "Haluatko varmasti poistaa nykyisen palvelinmäärityksen?",
"Confirm Deletion" => "Vahvista poisto",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
+"_%s group found_::_%s groups found_" => array("%s ryhmä löytynyt","%s ryhmää löytynyt"),
+"_%s user found_::_%s users found_" => array("%s käyttäjä löytynyt","%s käyttäjää löytynyt"),
+"Server" => "Palvelin",
+"Group Filter" => "Ryhmien suodatus",
"Save" => "Tallenna",
+"Test Configuration" => "Testaa määritys",
"Help" => "Ohje",
+"groups found" => "ryhmää löytynyt",
+"LDAP Username:" => "LDAP-käyttäjätunnus:",
+"LDAP Email Address:" => "LDAP-sähköpostiosoite:",
+"1. Server" => "1. Palvelin",
+"%s. Server:" => "%s. Palvelin:",
+"Add Server Configuration" => "Lisää palvelinmääritys",
+"Delete Configuration" => "Poista määritys",
"Host" => "Isäntä",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Voit jättää protokollan määrittämättä, paitsi kun vaadit SSL:ää. Aloita silloin ldaps://",
"Port" => "Portti",
@@ -21,10 +38,15 @@ $TRANSLATIONS = array(
"Password" => "Salasana",
"For anonymous access, leave DN and Password empty." => "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi ",
"You can specify Base DN for users and groups in the Advanced tab" => "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset'-välilehdeltä ",
+"users found" => "käyttäjää löytynyt",
"Back" => "Takaisin",
"Continue" => "Jatka",
+"Advanced" => "Lisäasetukset",
"Connection Settings" => "Yhteysasetukset",
+"Backup (Replica) Port" => "Varmuuskopioinnin (replikoinnin) portti",
"Disable Main Server" => "Poista pääpalvelin käytöstä",
+"Only connect to the replica server." => "Yhdistä vain replikointipalvelimeen.",
+"Case insensitive LDAP server (Windows)" => "Kirjainkoosta piittamaton LDAP-palvelin (Windows)",
"Turn off SSL certificate validation." => "Poista käytöstä SSL-varmenteen vahvistus",
"in seconds. A change empties the cache." => "sekunneissa. Muutos tyhjentää välimuistin.",
"Directory Settings" => "Hakemistoasetukset",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 44b92077b92de30d7920fbc70bb924b6731304fa..97b8387f2f1eedcee066f7b044e3f997ddc35911 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -12,10 +12,12 @@ $TRANSLATIONS = array(
"Deletion failed" => "La suppression a échoué",
"Take over settings from recent server configuration?" => "Récupérer les paramètres depuis une configuration récente du serveur ?",
"Keep settings?" => "Garder ces paramètres ?",
+"{nbServer}. Server" => "{nbServer}. Serveur",
"Cannot add server configuration" => "Impossible d'ajouter la configuration du serveur",
"mappings cleared" => "associations supprimées",
"Success" => "Succès",
"Error" => "Erreur",
+"Please specify the port" => "Veuillez indiquer le port",
"Configuration OK" => "Configuration OK",
"Configuration incorrect" => "Configuration incorrecte",
"Configuration incomplete" => "Configuration incomplète",
@@ -30,6 +32,10 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s utilisateur trouvé","%s utilisateurs trouvés"),
"Invalid Host" => "Hôte invalide",
"Could not find the desired feature" => "Impossible de trouver la fonction souhaitée",
+"Server" => "Serveur",
+"User Filter" => "Filtre utilisateur",
+"Login Filter" => "Filtre par nom d'utilisateur",
+"Group Filter" => "Filtre de groupes",
"Save" => "Sauvegarder",
"Test Configuration" => "Tester la configuration",
"Help" => "Aide",
@@ -45,7 +51,10 @@ $TRANSLATIONS = array(
"LDAP Email Address:" => "Adresse email LDAP :",
"Other Attributes:" => "Autres attributs :",
"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\"",
+"1. Server" => "1. Serveur",
+"%s. Server:" => "%s. Serveur:",
"Add Server Configuration" => "Ajouter une configuration du serveur",
+"Delete Configuration" => "Suppression de la configuration",
"Host" => "Hôte",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
"Port" => "Port",
@@ -60,6 +69,8 @@ $TRANSLATIONS = array(
"users found" => "utilisateurs trouvés",
"Back" => "Retour",
"Continue" => "Poursuivre",
+"Expert" => "Expert",
+"Advanced" => "Avancé",
"<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.",
"Connection Settings" => "Paramètres de connexion",
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index 82c484bb95d44eb77786a87a8bc4d98e56fea337..07c99e32bc4419a89f882462b35ddf617f2e50ec 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
"Deletion failed" => "Produciuse un fallo ao eliminar",
"Take over settings from recent server configuration?" => "Tomar os recentes axustes de configuración do servidor?",
"Keep settings?" => "Manter os axustes?",
+"{nbServer}. Server" => "{nbServer}. Servidor",
"Cannot add server configuration" => "Non é posÃbel engadir a configuración do servidor",
"mappings cleared" => "limpadas as asignacións",
"Success" => "Correcto",
"Error" => "Erro",
+"Please specify a Base DN" => "Por favor indique un DN base",
+"Could not determine Base DN" => "Non se puido determinar o DN base",
+"Please specify the port" => "Por favor indique un porto",
"Configuration OK" => "Configuración correcta",
"Configuration incorrect" => "Configuración incorrecta",
"Configuration incomplete" => "Configuración incompleta",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("Atopouse %s usuario","Atopáronse %s usuarios"),
"Invalid Host" => "Máquina incorrecta",
"Could not find the desired feature" => "Non foi posÃbel atopar a función desexada",
+"Server" => "Servidor",
+"User Filter" => "Filtro do usuario",
+"Login Filter" => "Filtro de acceso",
+"Group Filter" => "Filtro de grupo",
"Save" => "Gardar",
"Test Configuration" => "Probar a configuración",
"Help" => "Axuda",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
"LDAP Email Address:" => "Enderezo de correo LDAP:",
"Other Attributes:" => "Outros atributos:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso. Exemplo: «uid=%%uid»",
+"1. Server" => "1. Servidor",
+"%s. Server:" => "%s. Servidor:",
"Add Server Configuration" => "Engadir a configuración do servidor",
+"Delete Configuration" => "Eliminar a configuración",
"Host" => "Servidor",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://",
"Port" => "Porto",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
"users found" => "atopáronse usuarios",
"Back" => "Atrás",
"Continue" => "Continuar",
+"Expert" => "Experto",
+"Advanced" => "Avanzado",
"<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>Aviso:</b> Os aplicativos user_ldap e user_webdavauth son incompatÃbeis. Pode acontecer un comportamento estraño. Consulte co administrador do sistema para desactivar un deles.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP non está instalado, o servidor non funcionará. Consulte co administrador do sistema para instalalo.",
"Connection Settings" => "Axustes da conexión",
diff --git a/apps/user_ldap/l10n/he.php b/apps/user_ldap/l10n/he.php
index 0dcf85278497136d94705f1ac40a361e7e2ba1e7..629ade5e977ff01023138fa099a9b343487995cb 100644
--- a/apps/user_ldap/l10n/he.php
+++ b/apps/user_ldap/l10n/he.php
@@ -10,6 +10,7 @@ $TRANSLATIONS = array(
"Confirm Deletion" => "×ישור המחיקה",
"_%s group found_::_%s groups found_" => array("",""),
"_%s user found_::_%s users found_" => array("",""),
+"Group Filter" => "×¡× ×Ÿ קבוצה",
"Save" => "שמירה",
"Help" => "עזרה",
"Add Server Configuration" => "הוספת הגדרות השרת",
@@ -19,6 +20,7 @@ $TRANSLATIONS = array(
"Password" => "סיסמ×",
"For anonymous access, leave DN and Password empty." => "לגישה ×× ×•× ×™×ž×™×ª, הש×ר ×ת ×”DM ×•×”×¡×™×¡×ž× ×¨×™×§×™×.",
"Back" => "×חורה",
+"Advanced" => "מתקד×",
"in seconds. A change empties the cache." => "×‘×©× ×™×•×ª. ×©×™× ×•×™ מרוקן ×ת המטמון.",
"in bytes" => "בבתי×"
);
diff --git a/apps/user_ldap/l10n/hi.php b/apps/user_ldap/l10n/hi.php
index 386134547eb07ee756ea589b47617af961f00213..41fbe29856fb0ef2f0747014d22bb6275fb2f4b9 100644
--- a/apps/user_ldap/l10n/hi.php
+++ b/apps/user_ldap/l10n/hi.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("",""),
"Save" => "सहेजें",
"Help" => "सहयोग",
-"Password" => "पासवरà¥à¤¡"
+"Password" => "पासवरà¥à¤¡",
+"Advanced" => "उनà¥à¤¨à¤¤"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/hr.php b/apps/user_ldap/l10n/hr.php
index b28175994eb0d298c5c6d8f8de3ba8c218afb922..c5cc17d14231aab69121d64f19c4e73c5b7f5af3 100644
--- a/apps/user_ldap/l10n/hr.php
+++ b/apps/user_ldap/l10n/hr.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
"Save" => "Snimi",
"Help" => "Pomoć",
"Password" => "Lozinka",
-"Back" => "Natrag"
+"Back" => "Natrag",
+"Advanced" => "Napredno"
);
$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_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index 5e05eefd1d716e9991d2f6424bd1890e270f2009..47c5bd2d57bef53c159421381b6f792646609f7c 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s felhasználó van","%s felhasználó van"),
"Invalid Host" => "Érvénytelen gépnév",
"Could not find the desired feature" => "A kÃvánt funkció nem található",
+"Group Filter" => "A csoportok szűrője",
"Save" => "Mentés",
"Test Configuration" => "A beállÃtások tesztelése",
"Help" => "Súgó",
@@ -57,6 +58,7 @@ $TRANSLATIONS = array(
"users found" => "felhasználó van",
"Back" => "Vissza",
"Continue" => "Folytatás",
+"Advanced" => "Haladó",
"<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!",
"Connection Settings" => "Kapcsolati beállÃtások",
diff --git a/apps/user_ldap/l10n/ia.php b/apps/user_ldap/l10n/ia.php
index b29ecbb1d243814acbeb910fec9c23eb3fed7292..3d7699525c9f87050a1a27de4621bb719ed0404f 100644
--- a/apps/user_ldap/l10n/ia.php
+++ b/apps/user_ldap/l10n/ia.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
"Help" => "Adjuta",
"Password" => "Contrasigno",
"Back" => "Retro",
-"Continue" => "Continuar"
+"Continue" => "Continuar",
+"Advanced" => "Avantiate"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
index 1d42031a4982f7efdf91d9600789b2688ce2e8b8..b6e581952fad8dc72d9332cc45e1f087b289739f 100644
--- a/apps/user_ldap/l10n/id.php
+++ b/apps/user_ldap/l10n/id.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
"Confirm Deletion" => "Konfirmasi Penghapusan",
"_%s group found_::_%s groups found_" => array(""),
"_%s user found_::_%s users found_" => array(""),
+"Group Filter" => "saringan grup",
"Save" => "Simpan",
"Test Configuration" => "Uji Konfigurasi",
"Help" => "Bantuan",
@@ -31,6 +32,7 @@ $TRANSLATIONS = array(
"You can specify Base DN for users and groups in the Advanced tab" => "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan",
"Back" => "Kembali",
"Continue" => "Lanjutkan",
+"Advanced" => "Lanjutan",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.",
"Connection Settings" => "Pengaturan Koneksi",
"Configuration Active" => "Konfigurasi Aktif",
diff --git a/apps/user_ldap/l10n/is.php b/apps/user_ldap/l10n/is.php
index e146c93cb8174db0294f2b8442255dab0b9230a7..148eb064030173d41dd90b0faa2e7c32896af856 100644
--- a/apps/user_ldap/l10n/is.php
+++ b/apps/user_ldap/l10n/is.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
"Test Configuration" => "Prúfa uppsetningu",
"Help" => "Hjálp",
"Host" => "Netþjónn",
-"Password" => "Lykilorð"
+"Password" => "Lykilorð",
+"Advanced" => "Ãtarlegt"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index 095a0619ee1fc0e2d48d40f3e1208358ec4c8bd6..23ced96cf8cbb8d26bb924c18dc4053be164c71b 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
"Deletion failed" => "Eliminazione non riuscita",
"Take over settings from recent server configuration?" => "Vuoi recuperare le impostazioni dalla configurazione recente del server?",
"Keep settings?" => "Vuoi mantenere le impostazioni?",
+"{nbServer}. Server" => "{nbServer}. server",
"Cannot add server configuration" => "Impossibile aggiungere la configurazione del server",
"mappings cleared" => "associazioni cancellate",
"Success" => "Riuscito",
"Error" => "Errore",
+"Please specify a Base DN" => "Specifica un DN base",
+"Could not determine Base DN" => "Impossibile determinare il DN base",
+"Please specify the port" => "Specifica la porta",
"Configuration OK" => "Configurazione corretta",
"Configuration incorrect" => "Configurazione non corretta",
"Configuration incomplete" => "Configurazione incompleta",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s utente trovato","%s utenti trovati"),
"Invalid Host" => "Host non valido",
"Could not find the desired feature" => "Impossibile trovare la funzionalità desiderata",
+"Server" => "Server",
+"User Filter" => "Filtro utente",
+"Login Filter" => "Filtro accesso",
+"Group Filter" => "Filtro gruppo",
"Save" => "Salva",
"Test Configuration" => "Prova configurazione",
"Help" => "Aiuto",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
"LDAP Email Address:" => "Indirizzo email LDAP:",
"Other Attributes:" => "Altri attributi:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso. Esempio: \"uid=%%uid\"",
+"1. Server" => "1. server",
+"%s. Server:" => "%s. server:",
"Add Server Configuration" => "Aggiungi configurazione del server",
+"Delete Configuration" => "Elimina configurazione",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://",
"Port" => "Porta",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
"users found" => "utenti trovati",
"Back" => "Indietro",
"Continue" => "Continua",
+"Expert" => "Esperto",
+"Advanced" => "Avanzate",
"<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>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne una.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avviso:</b> il modulo PHP LDAP non è installato, il motore non funzionerà . Chiedi al tuo amministratore di sistema di installarlo.",
"Connection Settings" => "Impostazioni di connessione",
diff --git a/apps/user_ldap/l10n/ja.php b/apps/user_ldap/l10n/ja.php
index 198047216424b8103781591692a6672ada59b32d..eb85c055eff0ccd130a2570fc2b4449d56397534 100644
--- a/apps/user_ldap/l10n/ja.php
+++ b/apps/user_ldap/l10n/ja.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s ユーザーãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸ"),
"Invalid Host" => "無効ãªãƒ›ã‚¹ãƒˆ",
"Could not find the desired feature" => "望ã¾ã—ã„機能ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ",
+"Group Filter" => "グループフィルタ",
"Save" => "ä¿å˜",
"Test Configuration" => "è¨å®šã‚’テスト",
"Help" => "ヘルプ",
@@ -60,6 +61,7 @@ $TRANSLATIONS = array(
"users found" => "ユーザーãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸ",
"Back" => "戻る",
"Continue" => "続ã‘ã‚‹",
+"Advanced" => "詳細è¨å®š",
"<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>è¦å‘Š:</b> user_ldap 㨠user_webdavauth ã®ã‚¢ãƒ—リã«ã¯äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“。予期ã›ã¬å‹•ä½œã‚’ã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚システム管ç†è€…ã«ã©ã¡ã‚‰ã‹ã‚’無効ã«ã™ã‚‹ã‚ˆã†å•ã„åˆã‚ã›ã¦ãã ã•ã„。",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>è¦å‘Š:</b> PHP LDAP モジュールãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“。ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãŒæ£ã—ã動作ã—ã¾ã›ã‚“。システム管ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã‚ˆã†å•ã„åˆã‚ã›ã¦ãã ã•ã„。",
"Connection Settings" => "接続è¨å®š",
@@ -90,6 +92,8 @@ $TRANSLATIONS = array(
"Group-Member association" => "グループã¨ãƒ¡ãƒ³ãƒãƒ¼ã®é–¢é€£ä»˜ã‘",
"Nested Groups" => "ãƒã‚¹ãƒˆåŒ–ブãƒãƒƒã‚¯",
"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "オンã«åˆ‡ã‚Šæ›¿ãˆãŸã‚‰ã€ã‚°ãƒ«ãƒ¼ãƒ—ã‚’å«ã‚€ã‚°ãƒ«ãƒ¼ãƒ—ãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¾ã™ã€‚(グループメンãƒãƒ¼ã®å±žæ€§ãŒDNã‚’å«ã‚€å ´åˆã®ã¿æœ‰åŠ¹ã§ã™ã€‚)",
+"Paging chunksize" => "ページ分割サイズ",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "ページ分割サイズã¯ã€LDAP検索時ã«ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚„グループã®ãƒªã‚¹ãƒˆä¸€è¦§ãƒ‡ãƒ¼ã‚¿ã‚’一括ã§è¿”ã™ãƒ‡ãƒ¼ã‚¿é‡ã‚’指定ã—ã¾ã™ã€‚(è¨å®šãŒ0ã®å ´åˆã«ã¯ã€LDAP検索ã®åˆ†å‰²è»¢é€ã¯ç„¡åŠ¹)",
"Special Attributes" => "特殊属性",
"Quota Field" => "クォータフィールド",
"Quota Default" => "クォータã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆ",
diff --git a/apps/user_ldap/l10n/ka_GE.php b/apps/user_ldap/l10n/ka_GE.php
index 3ee307b55ccb88e9986444c5e9a7f163be37b54d..7ff2c4034b6f1e9c689421dfbb8aa260b6a9c67a 100644
--- a/apps/user_ldap/l10n/ka_GE.php
+++ b/apps/user_ldap/l10n/ka_GE.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
"Confirm Deletion" => "წáƒáƒ¨áƒšáƒ˜áƒ¡ დáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ ებáƒ",
"_%s group found_::_%s groups found_" => array(""),
"_%s user found_::_%s users found_" => array(""),
+"Group Filter" => "ჯგუფის ფილტრი",
"Save" => "შენáƒáƒ®áƒ•áƒ",
"Test Configuration" => "კáƒáƒ•áƒ¨áƒ˜áƒ ის ტესტირებáƒ",
"Help" => "დáƒáƒ®áƒ›áƒáƒ ებáƒ",
@@ -29,6 +30,7 @@ $TRANSLATIONS = array(
"For anonymous access, leave DN and Password empty." => "áƒáƒœáƒáƒœáƒ˜áƒ›áƒ£áƒ ი დáƒáƒ¨áƒ•áƒ”ბისთვის, დáƒáƒ¢áƒáƒ•áƒ”თ DN–ის დრპáƒáƒ áƒáƒšáƒ˜áƒ¡ ველები ცáƒáƒ იელი.",
"One Base DN per line" => "ერთი სáƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ DN ერთ ხáƒáƒ–ზე",
"You can specify Base DN for users and groups in the Advanced tab" => "თქვენ შეგიძლიáƒáƒ— მიუთითáƒáƒ— სáƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ DN მáƒáƒ›áƒ®áƒ›áƒáƒ ებლებისთვის დრჯგუფებისთვის Advanced ტáƒáƒ‘ში",
+"Advanced" => "დáƒáƒ›áƒáƒ¢áƒ”ბითი ფუნქციები",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>გáƒáƒ¤áƒ თხილებáƒ:</b> PHP LDAP მáƒáƒ“ული áƒáƒ áƒáƒ ის ინსტáƒáƒšáƒ˜áƒ ებული, ბექენდი áƒáƒ იმუშáƒáƒ•áƒ”ბს. თხáƒáƒ•áƒ”თ თქვენს áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ს დáƒáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒáƒ¡ ის.",
"Connection Settings" => "კáƒáƒ•áƒ¨áƒ˜áƒ ის პáƒáƒ áƒáƒ›áƒ”ტრები",
"Configuration Active" => "კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ áƒáƒ¥áƒ¢áƒ˜áƒ£áƒ იáƒ",
diff --git a/apps/user_ldap/l10n/km.php b/apps/user_ldap/l10n/km.php
index ad3cc4882c12239e1393bf68d980c164c1e4f684..edbb22949a7661f72dcbbfda1a65dcecfa705e2f 100644
--- a/apps/user_ldap/l10n/km.php
+++ b/apps/user_ldap/l10n/km.php
@@ -15,6 +15,9 @@ $TRANSLATIONS = array(
"Help" => "ជំនួយ",
"Add Server Configuration" => "បន្ážáŸ‚ម​ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ម៉ាស៊ីន​បម្រើ",
"Host" => "ម៉ាស៊ីន​ផ្ទុក",
-"Password" => "ពាក្យសម្ងាážáŸ‹"
+"Port" => "ច្រក",
+"Password" => "ពាក្យសម្ងាážáŸ‹",
+"Continue" => "បន្áž",
+"Advanced" => "កម្រិážâ€‹ážáŸ’ពស់"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php
index 1ae63bd4d2146228e4e8dfac309cc759da011707..4430045d6e8c8e12161a85fa6a9f14bc129ca9ea 100644
--- a/apps/user_ldap/l10n/ko.php
+++ b/apps/user_ldap/l10n/ko.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("ì‚¬ìš©ìž %s명 ì°¾ìŒ"),
"Invalid Host" => "ìž˜ëª»ëœ í˜¸ìŠ¤íŠ¸",
"Could not find the desired feature" => "필요한 ê¸°ëŠ¥ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ",
+"Group Filter" => "그룹 필터",
"Save" => "ì €ìž¥",
"Test Configuration" => "ì„¤ì • 시험",
"Help" => "ë„움ë§",
@@ -57,6 +58,7 @@ $TRANSLATIONS = array(
"users found" => "ì‚¬ìš©ìž ì°¾ìŒ",
"Back" => "뒤로",
"Continue" => "계ì†",
+"Advanced" => "ê³ ê¸‰",
"<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>ê²½ê³ :</b> user_ldap, user_webdavauth ì•±ì€ ì„œë¡œ 호환ë˜ì§€ 않습니다. 예ìƒí•˜ì§€ 못한 í–‰ë™ì„ í• ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. 시스템 관리ìžì—게 ì—°ë½í•˜ì—¬ 둘 중 í•˜ë‚˜ì˜ ì•±ì˜ ì‚¬ìš©ì„ ì¤‘ë‹¨í•˜ì‹ì‹œì˜¤.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>ê²½ê³ :</b> PHP LDAP ëª¨ë“ˆì´ ë¹„í™œì„±í™”ë˜ì–´ 있거나 설치ë˜ì–´ 있지 않습니다. 백엔드를 ì‚¬ìš©í• ìˆ˜ 없습니다. 시스템 관리ìžì—게 설치를 ìš”ì²í•˜ì‹ì‹œì˜¤.",
"Connection Settings" => "ì—°ê²° ì„¤ì •",
diff --git a/apps/user_ldap/l10n/ku_IQ.php b/apps/user_ldap/l10n/ku_IQ.php
index 7d3b22f849463430dd0ab890f6cab3f3de6a3727..15609ab3cd179b68f6259c924d188a7b59512c0e 100644
--- a/apps/user_ldap/l10n/ku_IQ.php
+++ b/apps/user_ldap/l10n/ku_IQ.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("",""),
"Save" => "پاشکه‌وتکردن",
"Help" => "یارمەتی",
-"Password" => "وشەی تێپەربو"
+"Password" => "وشەی تێپەربو",
+"Advanced" => "هه‌ڵبژاردنی پیشكه‌وتوو"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/lb.php b/apps/user_ldap/l10n/lb.php
index c6fdc0035482a168c79def74769a0d9386bb30fb..dabb78b6a874875bd44165e5d06d4deb0ab6e8dc 100644
--- a/apps/user_ldap/l10n/lb.php
+++ b/apps/user_ldap/l10n/lb.php
@@ -9,6 +9,7 @@ $TRANSLATIONS = array(
"Host" => "Host",
"Password" => "Passwuert",
"Back" => "Zeréck",
-"Continue" => "Weider"
+"Continue" => "Weider",
+"Advanced" => "Avancéiert"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php
index c20bf679d0ffc2772ef6e600b2e0eb7b79a4baba..ec83d9119ee0cdad3f456256c423ba1b4d140c7a 100644
--- a/apps/user_ldap/l10n/lt_LT.php
+++ b/apps/user_ldap/l10n/lt_LT.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
"Confirm Deletion" => "Patvirtinkite trynimÄ…",
"_%s group found_::_%s groups found_" => array("","",""),
"_%s user found_::_%s users found_" => array("","",""),
+"Group Filter" => "GrupÄ—s filtras",
"Save" => "IÅ¡saugoti",
"Test Configuration" => "Bandyti konfigūraciją",
"Help" => "Pagalba",
@@ -28,6 +29,7 @@ $TRANSLATIONS = array(
"One Base DN per line" => "Vienas bazinis DN eilutÄ—je",
"Back" => "Atgal",
"Continue" => "Tęsti",
+"Advanced" => "IÅ¡plÄ—stiniai",
"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.",
diff --git a/apps/user_ldap/l10n/lv.php b/apps/user_ldap/l10n/lv.php
index e3cb206e2d6db7b9b2830005135887e70fdf9051..d6df44812c17d0d17a9b50cf21ab6faab5c5e2d9 100644
--- a/apps/user_ldap/l10n/lv.php
+++ b/apps/user_ldap/l10n/lv.php
@@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Confirm Deletion" => "ApstiprinÄt dzÄ“Å¡anu",
"_%s group found_::_%s groups found_" => array("","",""),
"_%s user found_::_%s users found_" => array("","",""),
+"Group Filter" => "Grupu filtrs",
"Save" => "SaglabÄt",
"Test Configuration" => "Testa konfigurÄcija",
"Help" => "Palīdzība",
@@ -28,6 +29,7 @@ $TRANSLATIONS = array(
"For anonymous access, leave DN and Password empty." => "Lai piekļūtu anonÄ«mi, atstÄjiet DN un paroli tukÅ¡u.",
"One Base DN per line" => "Viena bÄzes DN rindÄ",
"You can specify Base DN for users and groups in the Advanced tab" => "LietotÄjiem un grupÄm bÄzes DN var norÄdÄ«t cilnÄ“ “PaplaÅ¡inÄtiâ€",
+"Advanced" => "PaplaÅ¡inÄti",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>BrÄ«dinÄjums:</b> PHP LDAP modulis nav uzinstalÄ“ts, aizmugure nedarbosies. LÅ«dzu, prasiet savam sistÄ“mas administratoram kÄdu no tÄm deaktivÄ“t.",
"Connection Settings" => "Savienojuma iestatījumi",
"Configuration Active" => "KonfigurÄcija ir aktÄ«va",
diff --git a/apps/user_ldap/l10n/mk.php b/apps/user_ldap/l10n/mk.php
index fcbc01f137b2586f459daeda2455900f3ce88195..4efb1986fb608d44e6a44278b80e31a747c0db6e 100644
--- a/apps/user_ldap/l10n/mk.php
+++ b/apps/user_ldap/l10n/mk.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
"Port" => "Порта",
"Password" => "Лозинка",
"Back" => "Ðазад",
-"Continue" => "Продолжи"
+"Continue" => "Продолжи",
+"Advanced" => "Ðапредно"
);
$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/user_ldap/l10n/ms_MY.php b/apps/user_ldap/l10n/ms_MY.php
index 7010e8a8f506eb55e77a431b4560f3e3ed077586..e90bf1b06b2762b3e32a8a5611dee18e5a3869a2 100644
--- a/apps/user_ldap/l10n/ms_MY.php
+++ b/apps/user_ldap/l10n/ms_MY.php
@@ -7,6 +7,7 @@ $TRANSLATIONS = array(
"Save" => "Simpan",
"Help" => "Bantuan",
"Password" => "Kata laluan",
-"Back" => "Kembali"
+"Back" => "Kembali",
+"Advanced" => "Maju"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/my_MM.php b/apps/user_ldap/l10n/my_MM.php
index ea1881f114f1ab672cbc464048c1d05c08b5a906..81f80f8d65198b59fa5e103e12d0910035557d0d 100644
--- a/apps/user_ldap/l10n/my_MM.php
+++ b/apps/user_ldap/l10n/my_MM.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
"_%s group found_::_%s groups found_" => array(""),
"_%s user found_::_%s users found_" => array(""),
"Help" => "အကူအညီ",
-"Password" => "စကားá€á€¾á€€á€º"
+"Password" => "စကားá€á€¾á€€á€º",
+"Advanced" => "အဆင့်မြင့်"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php
index dd4af3e759e93f24085b13f3760d7925636175cc..0cb94eb27fd65eab11378e8b2594ad22bd9105c4 100644
--- a/apps/user_ldap/l10n/nb_NO.php
+++ b/apps/user_ldap/l10n/nb_NO.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
"Deletion failed" => "Sletting mislyktes",
"Take over settings from recent server configuration?" => "Hent innstillinger fra tidligere tjener-konfigurasjon?",
"Keep settings?" => "Behold innstillinger?",
+"{nbServer}. Server" => "{nbServer}. Server",
"Cannot add server configuration" => "Kan ikke legge til tjener-konfigurasjon",
"mappings cleared" => "tilknytninger nullstilt",
"Success" => "Suksess",
"Error" => "Feil",
+"Please specify a Base DN" => "Vennligst spesifiser en hoved-DN",
+"Could not determine Base DN" => "Kunne ikke fastslå hoved-DN",
+"Please specify the port" => "Vennligst spesifiser port",
"Configuration OK" => "Konfigurasjon OK",
"Configuration incorrect" => "Konfigurasjon feil",
"Configuration incomplete" => "Konfigurasjon ufullstendig",
@@ -30,20 +34,29 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s bruker funnet","%s brukere funnet"),
"Invalid Host" => "Ugyldig tjener",
"Could not find the desired feature" => "Fant ikke den ønskede funksjonaliteten",
+"Server" => "Server",
+"User Filter" => "Brukerfilter",
+"Login Filter" => "Innloggingsfilter",
+"Group Filter" => "Gruppefilter",
"Save" => "Lagre",
"Test Configuration" => "Test konfigurasjonen",
"Help" => "Hjelp",
+"Groups meeting these criteria are available in %s:" => "Grupper som tilfredsstiller disse kriteriene er tilgjengelige i %s:",
"only those object classes:" => "kun de objektklassene:",
"only from those groups:" => "kun fra de gruppene:",
"Edit raw filter instead" => "Rediger ubearbeidet filter i stedet",
"Raw LDAP filter" => "Ubearbeidet LDAP-filter",
"The filter specifies which LDAP groups shall have access to the %s instance." => "Filteret spesifiserer hvilke LDAP-grupper som skal ha tilgang til %s-instansen.",
"groups found" => "grupper funnet",
+"Users login with this attribute:" => "Brukere logger inn med denne attributten:",
"LDAP Username:" => "LDAP-brukernavn:",
"LDAP Email Address:" => "LDAP-epostadresse:",
"Other Attributes:" => "Andre attributter:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Definerer filteret som skal brukes når innlogging forsøkes. %%uid erstatter brukernavnet i innloggingshandlingen. Eksempel: \"uid=%%uid\"",
+"1. Server" => "1. server",
+"%s. Server:" => "%s. server:",
"Add Server Configuration" => "Legg til tjener-konfigurasjon",
+"Delete Configuration" => "Slett konfigurasjon",
"Host" => "Tjener",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kan utelate protokollen, men du er påkrevd å bruke SSL. Deretter starte med ldaps://",
"Port" => "Port",
@@ -51,12 +64,15 @@ $TRANSLATIONS = array(
"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." => "DN nummeret til klienten som skal bindes til, f.eks. uid=agent,dc=example,dc=com. For anonym tilgang, la DN- og passord-feltet stå tomt.",
"Password" => "Passord",
"For anonymous access, leave DN and Password empty." => "For anonym tilgang, la DN- og passord-feltet stå tomt.",
-"One Base DN per line" => "En hoved DN pr. linje",
-"You can specify Base DN for users and groups in the Advanced tab" => "Du kan spesifisere Base DN for brukere og grupper under Avansert fanen",
+"One Base DN per line" => "En hoved-DN pr. linje",
+"You can specify Base DN for users and groups in the Advanced tab" => "Du kan spesifisere hoved-DN for brukere og grupper under Avansert fanen",
+"Limit %s access to users meeting these criteria:" => "Begrens %s-tilgang til brukere som tilfredsstiller disse kriteriene:",
"The filter specifies which LDAP users shall have access to the %s instance." => "Filteret spesifiserer hvilke LDAP-brukere som skal ha tilgang til %s-instansen.",
"users found" => "brukere funnet",
"Back" => "Tilbake",
"Continue" => "Fortsett",
+"Expert" => "Ekspert",
+"Advanced" => "Avansert",
"<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>Advarsel:</b> Appene user_ldap og user_webdavauth er ikke kompatible med hverandre. Uventet oppførsel kan forekomme. Be systemadministratoren om å deaktivere en av dem.",
"<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> PHP LDAP modulen er ikke installert, hjelperen vil ikke virke. Vennligst be din system-administrator om å installere den.",
"Connection Settings" => "Innstillinger for tilkobling",
@@ -67,6 +83,7 @@ $TRANSLATIONS = array(
"Backup (Replica) Port" => "Reserve (Replika) Port",
"Disable Main Server" => "Deaktiver hovedtjeneren",
"Only connect to the replica server." => "Koble til bare replika-tjeneren.",
+"Case insensitive LDAP server (Windows)" => "LDAP-server som ikke skiller mellom store og små bokstaver (Windows)",
"Turn off SSL certificate validation." => "Slå av SSL-sertifikat validering",
"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." => "Ikke anbefalt, bruk kun for testing! Hvis tilkobling bare virker med dette valget, importer LDAP-tjenerens SSL-sertifikat i %s-serveren din.",
"Cache Time-To-Live" => "Levetid i mellomlager",
@@ -75,7 +92,7 @@ $TRANSLATIONS = array(
"User Display Name Field" => "Vis brukerens navnfelt",
"The LDAP attribute to use to generate the user's display name." => "LDAP-attributten som skal brukes til å generere brukerens visningsnavn.",
"Base User Tree" => "Hovedbruker tre",
-"One User Base DN per line" => "En Bruker Base DN pr. linje",
+"One User Base DN per line" => "En Bruker hoved-DN pr. linje",
"User Search Attributes" => "Attributter for brukersøk",
"Optional; one attribute per line" => "Valgfritt, en attributt pr. linje",
"Group Display Name Field" => "Vis gruppens navnfelt",
@@ -84,6 +101,10 @@ $TRANSLATIONS = array(
"One Group Base DN per line" => "En gruppe hoved-DN pr. linje",
"Group Search Attributes" => "Attributter for gruppesøk",
"Group-Member association" => "gruppe-medlem assosiasjon",
+"Nested Groups" => "Nestede grupper",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Grupper som inneholder grupper er tillatt når denne er slått på. (Virker bare hvis gruppenes member-attributt inneholder DN-er.)",
+"Paging chunksize" => "Sidestørrelse",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Sidestørrelsen brukes for sidevise (paged) LDAP-søk som kan returnere store resultater, som f.eks. gjennomløping av brukere eller grupper. (Sett til 0 for å deaktivere sidevis LDAP-spørring i disse situasjonene.)",
"Special Attributes" => "Spesielle attributter",
"Quota Field" => "Felt med lagringskvote",
"Quota Default" => "Standard lagringskvote",
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index 196e5a52d120f480d26b8eb365373f0c50b77543..8b9c5bc672d0bec4d4e70e343696400f4e19e19c 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
"Deletion failed" => "Verwijderen mislukt",
"Take over settings from recent server configuration?" => "Overnemen instellingen van de recente serverconfiguratie?",
"Keep settings?" => "Instellingen bewaren?",
+"{nbServer}. Server" => "{nbServer}. Server",
"Cannot add server configuration" => "Kon de serverconfiguratie niet toevoegen",
"mappings cleared" => "vertaaltabel leeggemaakt",
"Success" => "Succes",
"Error" => "Fout",
+"Please specify a Base DN" => "Geef een Base DN op",
+"Could not determine Base DN" => "Kon de Base DN niet vaststellen",
+"Please specify the port" => "Geef de poort op",
"Configuration OK" => "Configuratie OK",
"Configuration incorrect" => "Configuratie onjuist",
"Configuration incomplete" => "Configuratie incompleet",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s gebruiker gevonden","%s gebruikers gevonden"),
"Invalid Host" => "Ongeldige server",
"Could not find the desired feature" => "Kon de gewenste functie niet vinden",
+"Server" => "Server",
+"User Filter" => "Gebruikersfilter",
+"Login Filter" => "Inlogfilter",
+"Group Filter" => "Groep Filter",
"Save" => "Bewaren",
"Test Configuration" => "Test configuratie",
"Help" => "Help",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
"LDAP Email Address:" => "LDAP e-mailadres:",
"Other Attributes:" => "Overige attributen:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Definiëert het toe te passen filter als er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam bij het inloggen. Bijvoorbeeld: \"uid=%%uid\"",
+"1. Server" => "1. Server",
+"%s. Server:" => "%s. Server:",
"Add Server Configuration" => "Toevoegen serverconfiguratie",
+"Delete Configuration" => "Verwijder configuratie",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://",
"Port" => "Poort",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
"users found" => "gebruikers gevonden",
"Back" => "Terug",
"Continue" => "Verder",
+"Expert" => "Expert",
+"Advanced" => "Geavanceerd",
"<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>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> De PHP LDAP module is niet geïnstalleerd, het backend zal niet werken. Vraag uw systeembeheerder om de module te installeren.",
"Connection Settings" => "Verbindingsinstellingen",
diff --git a/apps/user_ldap/l10n/nn_NO.php b/apps/user_ldap/l10n/nn_NO.php
index c8b7ec091b66ae3110be5022b4e68d0f4dfc5b59..f8152a4c9336b4814cb5669eb34de9250d5e864d 100644
--- a/apps/user_ldap/l10n/nn_NO.php
+++ b/apps/user_ldap/l10n/nn_NO.php
@@ -10,6 +10,7 @@ $TRANSLATIONS = array(
"Host" => "Tenar",
"Password" => "Passord",
"Back" => "Tilbake",
-"Continue" => "GÃ¥ vidare"
+"Continue" => "GÃ¥ vidare",
+"Advanced" => "Avansert"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/oc.php b/apps/user_ldap/l10n/oc.php
index 3b3e8365a657502c46b1f51d0caf2fc1ff2a295c..3d85c112afca8df51882429dc036b42cf47bd348 100644
--- a/apps/user_ldap/l10n/oc.php
+++ b/apps/user_ldap/l10n/oc.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("",""),
"Save" => "Enregistra",
"Help" => "Ajuda",
-"Password" => "Senhal"
+"Password" => "Senhal",
+"Advanced" => "Avançat"
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index 988e44dbe387fbd6b195e7d487d54226aa6b0971..4b23dc7a2382626da1f5299be22462e8cd8504c6 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"Deletion failed" => "Usunięcie nie powiodło się",
"Take over settings from recent server configuration?" => "Przejmij ustawienia z ostatnich konfiguracji serwera?",
"Keep settings?" => "Zachować ustawienia?",
+"{nbServer}. Server" => "{nbServer}. Serwer",
"Cannot add server configuration" => "Nie można dodać konfiguracji serwera",
"mappings cleared" => "Mapoanie wyczyszczone",
"Success" => "Sukces",
@@ -30,6 +31,10 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s znaleziony użytkownik","%s znalezionych użytkowników","%s znalezionych użytkowników"),
"Invalid Host" => "Niepoprawny Host",
"Could not find the desired feature" => "Nie można znaleźć żądanej funkcji",
+"Server" => "Serwer",
+"User Filter" => "Filtr użytkownika",
+"Login Filter" => "Filtr logowania",
+"Group Filter" => "Grupa filtrów",
"Save" => "Zapisz",
"Test Configuration" => "Konfiguracja testowa",
"Help" => "Pomoc",
@@ -45,7 +50,10 @@ $TRANSLATIONS = array(
"LDAP Email Address:" => "LDAP Adres Email:",
"Other Attributes:" => "Inne atrybuty:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Określa jakiego filtru użyć podczas próby zalogowania. %%uid zastępuje nazwę użytkownika w procesie logowania. Przykład: \"uid=%%uid\"",
+"1. Server" => "1. Serwer",
+"%s. Server:" => "%s. Serwer:",
"Add Server Configuration" => "Dodaj konfiguracjÄ™ servera",
+"Delete Configuration" => "Usuń konfigurację",
"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://",
"Port" => "Port",
@@ -60,6 +68,8 @@ $TRANSLATIONS = array(
"users found" => "użytkownicy znalezieni",
"Back" => "Wróć",
"Continue" => "Kontynuuj ",
+"Expert" => "Ekspert",
+"Advanced" => "Zaawansowane",
"<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>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b> Moduł PHP LDAP nie jest zainstalowany i nie będzie działał. Poproś administratora o włączenie go.",
"Connection Settings" => "Konfiguracja połączeń",
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index 0c15694e3ff502566afa662626b5fc8b514e2a00..f9916a2cefad870d80ade7a24187dbb5cc57bb11 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
"Deletion failed" => "Remoção falhou",
"Take over settings from recent server configuration?" => "Tomar parámetros de recente configuração de servidor?",
"Keep settings?" => "Manter ajustes?",
+"{nbServer}. Server" => "{nbServer}. Servidor",
"Cannot add server configuration" => "ImpossÃvel adicionar a configuração do servidor",
"mappings cleared" => "mapeamentos limpos",
"Success" => "Sucesso",
"Error" => "Erro",
+"Please specify a Base DN" => "Por favor, especifique a Base DN",
+"Could not determine Base DN" => "Não foi possÃvel determinar a Base DN",
+"Please specify the port" => "Por favor, especifique a porta",
"Configuration OK" => "Configuração OK",
"Configuration incorrect" => "Configuração incorreta",
"Configuration incomplete" => "Configuração incompleta",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("usuário %s encontrado","usuários %s encontrados"),
"Invalid Host" => "Host inválido",
"Could not find the desired feature" => "Não foi possÃvel encontrar a função desejada",
+"Server" => "Servidor",
+"User Filter" => "Filtro de Usuário",
+"Login Filter" => "Filtro de Login",
+"Group Filter" => "Filtro de Grupo",
"Save" => "Guardar",
"Test Configuration" => "Teste de Configuração",
"Help" => "Ajuda",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
"LDAP Email Address:" => "LDAP Endereço de E-mail:",
"Other Attributes:" => "Outros atributos:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define o filtro a ser aplicado, o login é feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\"",
+"1. Server" => "1. Servidor",
+"%s. Server:" => "%s. Servidor:",
"Add Server Configuration" => "Adicionar Configuração de Servidor",
+"Delete Configuration" => "Excluir Configuração",
"Host" => "Servidor",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://",
"Port" => "Porta",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
"users found" => "usuários encontrados",
"Back" => "Voltar",
"Continue" => "Continuar",
+"Expert" => "Especialista",
+"Advanced" => "Avançado",
"<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>Aviso:</b> Os aplicativos user_ldap e user_webdavauth são incompatÃveis. Você pode experimentar comportamento inesperado. Por favor, peça ao seu administrador do sistema para desabilitar um deles.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP não está instalado, o backend não funcionará. Por favor, peça ao seu administrador do sistema para instalá-lo.",
"Connection Settings" => "Configurações de Conexão",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index e2754785c650518c8ff240abedf77012e69e640e..09b1935c8c1aa5d81b77751a454574bdfec71005 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
"Failed to delete the server configuration" => "Erro ao eliminar a configuração do servidor",
"The configuration is valid and the connection could be established!" => "A configuração está correcta e foi possÃvel estabelecer a ligação!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuração está correcta, mas não foi possÃvel estabelecer o \"laço\", por favor, verifique as configurações do servidor e as credenciais.",
+"The configuration is invalid. Please have a look at the logs for further details." => "A configuração é inválida. Por favor, veja o log do ownCloud para mais detalhes.",
"No action specified" => "Nenhuma acção especificada",
"No configuration specified" => "Nenhuma configuração especificada",
"No data specified" => "Nenhuma data especificada",
@@ -29,6 +30,7 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s utilizador encontrado","%s utilizadores encontrados"),
"Invalid Host" => "Hospedeiro Inválido",
"Could not find the desired feature" => "Não se encontrou a função desejada",
+"Group Filter" => "Filtrar por grupo",
"Save" => "Guardar",
"Test Configuration" => "Testar a configuração",
"Help" => "Ajuda",
@@ -52,9 +54,11 @@ $TRANSLATIONS = array(
"For anonymous access, leave DN and Password empty." => "Para acesso anónimo, deixe DN e a Palavra-passe vazios.",
"One Base DN per line" => "Uma base DN por linho",
"You can specify Base DN for users and groups in the Advanced tab" => "Pode especificar o ND Base para utilizadores e grupos no separador Avançado",
+"Limit %s access to users meeting these criteria:" => "Limitar o acesso a %s de utilizadores com estes critérios:",
"users found" => "utilizadores encontrados",
"Back" => "Voltar",
"Continue" => "Continuar",
+"Advanced" => "Avançado",
"<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>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP não está instalado, logo não irá funcionar. Por favor peça ao administrador para o instalar.",
"Connection Settings" => "Definições de ligação",
@@ -92,9 +96,11 @@ $TRANSLATIONS = array(
"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 padrão o nome de utilizador interno vai ser criado através do atributo UUID. Desta forma é assegurado que o nome é único e os caracteres não necessitam de serem convertidos. O nome interno tem a restrição de que apenas estes caracteres são permitidos: [ a-zA-Z0-9_.@- ]. Outros caracteres são substituÃdos pela sua correspondência ASCII ou simplesmente omitidos. Mesmo assim, quando for detetado uma colisão irá ser acrescentado um número. O nome interno é usado para identificar o utilizador internamente. É também o nome utilizado para a pasta inicial no ownCloud. É também parte de URLs remotos, como por exemplo os serviços *DAV. Com esta definição, o comportamento padrão é pode ser sobreposto. Para obter o mesmo comportamento antes do ownCloud 5 introduza o atributo do nome no campo seguinte. Deixe vazio para obter o comportamento padrão. As alterações apenas serão feitas para utilizadores mapeados (adicionados) LDAP.",
"Internal Username Attribute:" => "Atributo do nome de utilizador interno",
"Override UUID detection" => "Passar a detecção do 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 defeito, o ownCloud detecta automaticamente o atributo UUID. Este atributo é usado para identificar inequivocamente grupos e utilizadores LDAP. Igualmente, o nome de utilizador interno é criado com base no UUID, se o contrário não for especificado. Pode sobrepor esta definição colocando um atributo à sua escolha. Tenha em atenção que esse atributo deve ser válido tanto para grupos como para utilizadores, e que é único. Deixe em branco para optar pelo comportamento por defeito. Estas alteração apenas terão efeito em novos utilizadores e grupos mapeados (adicionados).",
"UUID Attribute for Users:" => "Atributo UUID para utilizadores:",
"UUID Attribute for Groups:" => "Atributo UUID para grupos:",
"Username-LDAP User Mapping" => "Mapeamento do utilizador 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." => "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestÃgios em todo o lado. A limpeza dos mapeamentos não é sensÃvel à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa fase de testes ou experimental.",
"Clear Username-LDAP User Mapping" => "Limpar mapeamento do utilizador-LDAP",
"Clear Groupname-LDAP Group Mapping" => "Limpar o mapeamento do nome de grupo LDAP"
);
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
index 0a91abe29c614a29ee916574802ab8c3b2ba557d..357fc68633b61aa64c45de89a18b5e4f1771f202 100644
--- a/apps/user_ldap/l10n/ro.php
+++ b/apps/user_ldap/l10n/ro.php
@@ -19,6 +19,7 @@ $TRANSLATIONS = array(
"Confirm Deletion" => "Confirmaţi Ştergerea ",
"_%s group found_::_%s groups found_" => array("","",""),
"_%s user found_::_%s users found_" => array("","",""),
+"Group Filter" => "Fitrare Grup",
"Save" => "Salvează",
"Test Configuration" => "Configurare test",
"Help" => "Ajutor",
@@ -36,6 +37,7 @@ $TRANSLATIONS = array(
"users found" => "Utilizatori găsiţi ",
"Back" => "ÃŽnapoi",
"Continue" => "Continuă",
+"Advanced" => "Avansat",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Atenție</b> Modulul PHP LDAP nu este instalat, infrastructura nu va funcționa. Contactează administratorul sistemului pentru al instala.",
"Connection Settings" => "Setările de conexiune",
"Configuration Active" => "Configuraţie activa ",
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index e719f01c370789067d16e8bc09ec5c5c8df92d37..04b8a25945d2fa70640ab23a1f6e0b22708b3f8f 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
"Deletion failed" => "Удаление не удалоÑÑŒ",
"Take over settings from recent server configuration?" => "ПринÑÑ‚ÑŒ наÑтройки из поÑледней конфигурации Ñервера?",
"Keep settings?" => "Сохранить наÑтройки?",
+"{nbServer}. Server" => "{nbServer}. Сервер",
"Cannot add server configuration" => "Ðе получилоÑÑŒ добавить конфигурацию Ñервера",
"mappings cleared" => "СоответÑÑ‚Ð²Ð¸Ñ Ð¾Ñ‡Ð¸Ñ‰ÐµÐ½Ñ‹",
"Success" => "УÑпешно",
"Error" => "Ошибка",
+"Please specify a Base DN" => "Ðеобходимо указать Base DN",
+"Could not determine Base DN" => "Ðевозможно определить Base DN",
+"Please specify the port" => "Укажите порт",
"Configuration OK" => "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð² порÑдке",
"Configuration incorrect" => "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°",
"Configuration incomplete" => "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð½Ðµ завершена",
@@ -30,20 +34,29 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s пользователь найден","%s Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾","%s пользователей найдено"),
"Invalid Host" => "Ðеверный Ñервер",
"Could not find the desired feature" => "Ðе могу найти требуемой функциональноÑти",
+"Server" => "Сервер",
+"User Filter" => "Пользователи",
+"Login Filter" => "Логин",
+"Group Filter" => "Фильтр группы",
"Save" => "Сохранить",
"Test Configuration" => "Проверить конфигурацию",
"Help" => "Помощь",
+"Groups meeting these criteria are available in %s:" => "Группы, отвечающие Ñтим критериÑм доÑтупны в %s:",
"only those object classes:" => "только Ñти объектные клаÑÑÑ‹",
"only from those groups:" => "только из Ñтих групп",
"Edit raw filter instead" => "Редактировать иÑходный фильтр",
"Raw LDAP filter" => "ИÑходный LDAP фильтр",
"The filter specifies which LDAP groups shall have access to the %s instance." => "Ðтот фильтр определÑет, какие LDAP группы должны иметь доÑтуп к %s.",
"groups found" => "групп найдено",
+"Users login with this attribute:" => "Пользователи пользуютÑÑ Ñтим атрибутом Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð°:",
"LDAP Username:" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ LDAP",
"LDAP Email Address:" => "LDAP Ð°Ð´Ñ€ÐµÑ Ñлектронной почты:",
"Other Attributes:" => "Другие атрибуты:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "ОпределÑет фильтр Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ попытке входа. %%uid заменÑет Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ входе в ÑиÑтему. Ðапример: \"uid=%%uid\"",
+"1. Server" => "1. Сервер",
+"%s. Server:" => "%s. Сервер:",
"Add Server Configuration" => "Добавить конфигурацию Ñервера",
+"Delete Configuration" => "Удалить конфигурацию",
"Host" => "Сервер",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можно опуÑтить протокол, за иÑключением того, когда вам требуетÑÑ SSL. Тогда начните Ñ ldaps :/ /",
"Port" => "Порт",
@@ -58,6 +71,8 @@ $TRANSLATIONS = array(
"users found" => "пользователей найдено",
"Back" => "Ðазад",
"Continue" => "Продолжить",
+"Expert" => "ÐкÑперт",
+"Advanced" => "Дополнительно",
"<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>Предупреждение:</b> ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ user_ldap и user_webdavauth неÑовмеÑтимы. Ð’Ñ‹ можете наблюдать некорректное поведение. ПожалуйÑта, попроÑите вашего ÑиÑтемного админиÑтратора отключить одно из них.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Внимание:</b> Модуль LDAP Ð´Ð»Ñ PHP не уÑтановлен, бÑкенд не будет работать. ПожалуйÑта, попроÑите вашего ÑиÑтемного админиÑтратора его уÑтановить. ",
"Connection Settings" => "ÐаÑтройки подключениÑ",
@@ -86,6 +101,10 @@ $TRANSLATIONS = array(
"One Group Base DN per line" => "По одной базовому DN групп в Ñтроке.",
"Group Search Attributes" => "Ðтрибуты поиÑка Ð´Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹",
"Group-Member association" => "ÐÑÑÐ¾Ñ†Ð¸Ð°Ñ†Ð¸Ñ Ð“Ñ€ÑƒÐ¿Ð¿Ð°-УчаÑтник",
+"Nested Groups" => "Вложенные группы",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "При включении, активируетÑÑ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ° групп, Ñодержащих другие группы. (Работает только еÑли атрибут член группы Ñодержит DN.)",
+"Paging chunksize" => "ПоÑтраничный chunksize",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "ChunkSize иÑпользуетÑÑ Ð² Ñтраничных поиÑках LDAP которые могут возвращать громоздкие результаты, как например ÑпиÑки пользователей или групп. (ÐаÑтройка его в \"0\" отключает Ñтраничный поиÑк LDAP Ð´Ð»Ñ Ñ‚Ð°ÐºÐ¸Ñ… Ñитуаций.)",
"Special Attributes" => "Специальные атрибуты",
"Quota Field" => "Поле квоты",
"Quota Default" => "Квота по умолчанию",
diff --git a/apps/user_ldap/l10n/si_LK.php b/apps/user_ldap/l10n/si_LK.php
index 5c02f02865505d0d2fb8f2f756a4c874fb3f2f02..a3e8f466b7d3bb6a4ac8af8afa580cec249e3cce 100644
--- a/apps/user_ldap/l10n/si_LK.php
+++ b/apps/user_ldap/l10n/si_LK.php
@@ -5,11 +5,13 @@ $TRANSLATIONS = array(
"Error" => "දà·à·‚යක්",
"_%s group found_::_%s groups found_" => array("",""),
"_%s user found_::_%s users found_" => array("",""),
+"Group Filter" => "කණ්ඩà·à¶ºà¶¸à·Š පෙරහන",
"Save" => "සුරකින්න",
"Help" => "උදව්",
"Host" => "à·ƒà¶à·Šà¶šà·à¶»à¶šà¶º",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL අවà·à·Šâ€à¶ºà¶º වන විට පමණක් à·„à·à¶», අන් අවස්ථà·à·€à¶±à·Šà·„ිදී ප්â€à¶»à·œà¶§à·œà¶šà·à¶½à¶º අà¶à·Š à·„à·à¶»à·’ය à·„à·à¶š. භà·à·€à·’à¶à· කරන විට ldaps:// ලෙස ආරම්භ කරන්න",
"Port" => "à¶à·œà¶§",
-"Password" => "මුර පදය"
+"Password" => "මුර පදය",
+"Advanced" => "දියුණු/උසස්"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/sk.php b/apps/user_ldap/l10n/sk.php
index 2578bb55649ae6e3e9981a1cffe27cac810cc22b..e258ffac2237af7b0f798868f910f58fc48f06ca 100644
--- a/apps/user_ldap/l10n/sk.php
+++ b/apps/user_ldap/l10n/sk.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"_%s group found_::_%s groups found_" => array("","",""),
"_%s user found_::_%s users found_" => array("","",""),
-"Save" => "Uložiť"
+"Save" => "Uložiť",
+"Advanced" => "PokroÄilé"
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index fdcb4ea81b144f56ade71709efc0741c433ae4e3..9d6b39c14ee2787a25adda75af40197bb9f83d67 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s nájdený použÃvateľ","%s nájdenà použÃvatelia","%s nájdených použÃvateľov"),
"Invalid Host" => "Neplatný hostiteľ",
"Could not find the desired feature" => "Nemožno nájsť požadovanú funkciu",
+"Group Filter" => "Filter skupiny",
"Save" => "Uložiť",
"Test Configuration" => "Test nastavenia",
"Help" => "Pomoc",
@@ -60,6 +61,7 @@ $TRANSLATIONS = array(
"users found" => "nájdenà použÃvatelia",
"Back" => "Späť",
"Continue" => "PokraÄovaÅ¥",
+"Advanced" => "RozÅ¡Ãrené",
"<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>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth sú navzájom nekompatibilné. Môžete zaznamenaÅ¥ neoÄakávané správanie. Požiadajte prosÃm vášho systémového administrátora pre zakázanie jedného z nich.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Upozornenie:</b> nie je nainštalovaný LDAP modul pre PHP, backend vrstva nebude fungovať. Požiadajte administrátora systému, aby ho nainštaloval.",
"Connection Settings" => "Nastavenie pripojenia",
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 54c91103a3e368b1c982d1d5eb4725aebe85af60..d0b6ab8fb0d85291cb3eacc780e472ef2b9f2dc9 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"),
"Invalid Host" => "Neveljaven gostitelj",
"Could not find the desired feature" => "Želene zmožnosti ni mogoÄe najti",
+"Group Filter" => "Filter skupin",
"Save" => "Shrani",
"Test Configuration" => "Preizkusne nastavitve",
"Help" => "PomoÄ",
@@ -57,6 +58,7 @@ $TRANSLATIONS = array(
"users found" => "najdenih uporabnikov",
"Back" => "Nazaj",
"Continue" => "Nadaljuj",
+"Advanced" => "Napredne možnosti",
"<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>Opozorilo:</b> doloÄili user_ldap in user_webdavauth sta neskladni, kar lahko vpliva na delovanje sistema. O napaki poÅ¡ljite poroÄilo skrbniku sistema in opozorite, da je treba eno izmed možnosti onemogoÄiti.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Opozorilo:</b> modul PHP LDAP mora biti nameÅ¡Äen, sicer vmesnik ne bo deloval. Paket je treba namestiti.",
"Connection Settings" => "Nastavitve povezave",
diff --git a/apps/user_ldap/l10n/sq.php b/apps/user_ldap/l10n/sq.php
index 03ff204bbca74623fc36fac4b41a59b847738ccf..8d09cceb7c5a470a2543cd286ec48699f2f26881 100644
--- a/apps/user_ldap/l10n/sq.php
+++ b/apps/user_ldap/l10n/sq.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Confirm Deletion" => "Konfirmoni Fshirjen",
"_%s group found_::_%s groups found_" => array("",""),
"_%s user found_::_%s users found_" => array("",""),
+"Group Filter" => "Filtri i grupeve",
"Save" => "Ruaj",
"Test Configuration" => "Provoni konfigurimet",
"Help" => "Ndihmë",
@@ -30,6 +31,7 @@ $TRANSLATIONS = array(
"For anonymous access, leave DN and Password empty." => "Për tu lidhur në mënyre anonime, lini bosh hapsirat e DN dhe fjalëkalim",
"One Base DN per line" => "Një baze DN për rrjesht",
"You can specify Base DN for users and groups in the Advanced tab" => "Ju mund të specifikoni Bazen DN për përdorues dhe grupe në butonin 'Të Përparuara'",
+"Advanced" => "E përparuar",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Njoftim:</b> moduli PHP LDAP nuk është instaluar, motori nuk do të funksionojë.Kontaktoni me administratorin e sistemit.",
"Connection Settings" => "Të dhënat e lidhjes",
"Configuration Active" => "Konfigurimi Aktiv",
diff --git a/apps/user_ldap/l10n/sr.php b/apps/user_ldap/l10n/sr.php
index fb016fdd17e895e46f1bc7d295b2622d422aafb2..41b35d0abf867cdaf089083c904a0d7c8b1b0b48 100644
--- a/apps/user_ldap/l10n/sr.php
+++ b/apps/user_ldap/l10n/sr.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
"Error" => "Грешка",
"_%s group found_::_%s groups found_" => array("","",""),
"_%s user found_::_%s users found_" => array("","",""),
+"Group Filter" => "Филтер групе",
"Save" => "Сачувај",
"Help" => "Помоћ",
"Host" => "Домаћин",
@@ -14,6 +15,7 @@ $TRANSLATIONS = array(
"Password" => "Лозинка",
"For anonymous access, leave DN and Password empty." => "За анониман приÑтуп, оÑтавите поља DN и лозинка празним.",
"Back" => "Ðазад",
+"Advanced" => "Ðапредно",
"Turn off SSL certificate validation." => "ИÑкључите потврду SSL Ñертификата.",
"in seconds. A change empties the cache." => "у Ñекундама. Промена иÑпражњава кеш меморију.",
"User Display Name Field" => "Име приказа кориÑника",
diff --git a/apps/user_ldap/l10n/sr@latin.php b/apps/user_ldap/l10n/sr@latin.php
index e3023996ad325d3f505ff8135d1960b4a66f7c24..4d4d65b2ef465e1c295c960b657db150c5c2d97b 100644
--- a/apps/user_ldap/l10n/sr@latin.php
+++ b/apps/user_ldap/l10n/sr@latin.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("","",""),
"Save" => "Snimi",
"Help" => "Pomoć",
-"Password" => "Lozinka"
+"Password" => "Lozinka",
+"Advanced" => "Napredno"
);
$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_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index 2a4f8b19655ff98837a6f6025d5255b74278b4db..8204c604ad10ea3ec3ec76d72908fd2510757190 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
"Deletion failed" => "Raderingen misslyckades",
"Take over settings from recent server configuration?" => "Ta över inställningar från tidigare serverkonfiguration?",
"Keep settings?" => "Behåll inställningarna?",
+"{nbServer}. Server" => "{nbServer}. Server",
"Cannot add server configuration" => "Kunde inte lägga till serverinställning",
"mappings cleared" => "mappningar rensade",
"Success" => "Lyckat",
"Error" => "Fel",
+"Please specify a Base DN" => "Vänligen ange en Base DN",
+"Could not determine Base DN" => "Det gick inte att avgöra Base DN",
+"Please specify the port" => "Specificera en port",
"Configuration OK" => "Konfigurationen är OK",
"Configuration incorrect" => "Felaktig konfiguration",
"Configuration incomplete" => "Konfigurationen är ej komplett",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s användare hittad","%s användare hittade"),
"Invalid Host" => "Felaktig Host",
"Could not find the desired feature" => "Det gick inte hitta den önskade funktionen",
+"Server" => "Server",
+"User Filter" => "Användar filter",
+"Login Filter" => "Login Filtrer",
+"Group Filter" => "Gruppfilter",
"Save" => "Spara",
"Test Configuration" => "Testa konfigurationen",
"Help" => "Hjälp",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
"LDAP Email Address:" => "LDAP e-postadress:",
"Other Attributes:" => "Övriga attribut:",
"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\"",
+"1. Server" => "1.Server",
+"%s. Server:" => "%s. Server:",
"Add Server Configuration" => "Lägg till serverinställning",
+"Delete Configuration" => "Radera Konfiguration",
"Host" => "Server",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://",
"Port" => "Port",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
"users found" => "användare funna",
"Back" => "Tillbaka",
"Continue" => "Fortsätt",
+"Expert" => "Expert",
+"Advanced" => "Avancerad",
"<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>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varning:</b> PHP LDAP - modulen är inte installerad, serversidan kommer inte att fungera. Kontakta din systemadministratör för installation.",
"Connection Settings" => "Uppkopplingsinställningar",
diff --git a/apps/user_ldap/l10n/ta_LK.php b/apps/user_ldap/l10n/ta_LK.php
index 27a3068f963b7bdea64aec8b1f06026a522fd5a3..5849cfcadb63ce33282f72728b1ef2867e4dd3fd 100644
--- a/apps/user_ldap/l10n/ta_LK.php
+++ b/apps/user_ldap/l10n/ta_LK.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
"Password" => "கடவà¯à®šà¯à®šà¯Šà®²à¯",
"You can specify Base DN for users and groups in the Advanced tab" => "நீஙà¯à®•à®³à¯ பயனாளரà¯à®•à®³à¯à®•à¯à®•à¯à®®à¯ மேனà¯à®®à¯ˆ ததà¯à®¤à®²à®¿à®²à¯ உளà¯à®³ கà¯à®´à¯à®µà®¿à®±à¯à®•à¯à®®à¯ தள DN ஠கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®²à®¾à®®à¯ ",
"Back" => "பினà¯à®©à¯à®•à¯à®•à¯",
+"Advanced" => "உயரà¯à®¨à¯à®¤",
"Turn off SSL certificate validation." => "SSL சானà¯à®±à®¿à®¤à®´à®¿à®©à¯ செலà¯à®²à¯à®ªà®Ÿà®¿à®¯à¯ˆ நிறà¯à®¤à¯à®¤à®¿à®µà®¿à®Ÿà®µà¯à®®à¯",
"in seconds. A change empties the cache." => "செகà¯à®•à®©à¯à®•à®³à®¿à®²à¯. ஒர௠மாறà¯à®±à®®à¯ இடைமாறà¯à®±à¯à®¨à®¿à®©à¯ˆà®µà®•à®¤à¯à®¤à¯ˆ வெறà¯à®±à®¿à®Ÿà®®à®¾à®•à¯à®•à¯à®®à¯.",
"User Display Name Field" => "பயனாளர௠காடà¯à®šà®¿à®ªà¯à®ªà¯†à®¯à®°à¯ பà¯à®²à®®à¯",
diff --git a/apps/user_ldap/l10n/te.php b/apps/user_ldap/l10n/te.php
index e154c0687349188ddf049f725acbc91bffff42ef..4cfdbea4cccbddbd98781f7703d5f1070d0dc199 100644
--- a/apps/user_ldap/l10n/te.php
+++ b/apps/user_ldap/l10n/te.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
"Save" => "à°à°¦à±à°°à°ªà°°à°šà±",
"Help" => "సహాయం",
"Password" => "సంకేతపదం",
-"Continue" => "కొనసాగించà±"
+"Continue" => "కొనసాగించà±",
+"Advanced" => "ఉనà±à°¨à°¤à°‚"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index 1c6dbe0473f785ab6949794f728a05748e3b6552..74d9fbe315063f289ef6c53168c61067a986af48 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -15,6 +15,7 @@ $TRANSLATIONS = array(
"Confirm Deletion" => "ยืนยันà¸à¸²à¸£à¸¥à¸šà¸—ิ้ง",
"_%s group found_::_%s groups found_" => array(""),
"_%s user found_::_%s users found_" => array(""),
+"Group Filter" => "ตัวà¸à¸£à¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸à¸¥à¸¸à¹ˆà¸¡",
"Save" => "บันทึà¸",
"Help" => "ช่วยเหลืà¸",
"Add Server Configuration" => "เพิ่มà¸à¸²à¸£à¸à¸³à¸«à¸™à¸”ค่าเซิร์ฟเวà¸à¸£à¹Œ",
@@ -28,6 +29,7 @@ $TRANSLATIONS = array(
"One Base DN per line" => "หนึ่ง Base DN ต่à¸à¸šà¸£à¸£à¸—ัด",
"You can specify Base DN for users and groups in the Advanced tab" => "คุณสามารถระบุ DN หลัà¸à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸¥à¸°à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¹ˆà¸²à¸‡à¹†à¹ƒà¸™à¹à¸—็บขั้นสูงได้",
"Back" => "ย้à¸à¸™à¸à¸¥à¸±à¸š",
+"Advanced" => "ขั้นสูง",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>คำเตืà¸à¸™:</b> โมดูล PHP LDAP ยังไม่ได้ถูà¸à¸•à¸´à¸”ตั้ง, ระบบด้านหลังจะไม่สามารถทำงานได้ à¸à¸£à¸¸à¸“าติดต่à¸à¸œà¸¹à¹‰à¸”ูà¹à¸¥à¸£à¸°à¸šà¸šà¸‚à¸à¸‡à¸„ุณเพื่à¸à¸—ำà¸à¸²à¸£à¸•à¸´à¸”ตั้งโมดูลดังà¸à¸¥à¹ˆà¸²à¸§",
"Connection Settings" => "ตั้งค่าà¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸",
"Disable Main Server" => "ปิดใช้งานเซิร์ฟเวà¸à¸£à¹Œà¸«à¸¥à¸±à¸",
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index 48e39c8523cce56e9b0e6ab5bbf9f56940b7bfb5..5a575de98097471110b8484ceea834ab727861ad 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -3,19 +3,23 @@ $TRANSLATIONS = array(
"Failed to clear the mappings." => "EÅŸleÅŸtirmeler temizlenirken hata oluÅŸtu.",
"Failed to delete the server configuration" => "Sunucu yapılandırmasını silme başarısız oldu",
"The configuration is valid and the connection could be established!" => "Yapılandırma geçerli ve bağlantı kuruldu!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Yapılandırma geçerli fakat bağlama (bind) başarısız. Lütfen Sunucu ayarları ve kimlik bilgilerini kontrol edin.",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Yapılandırma geçerli fakat bağlama (bind) başarısız. Lütfen sunucu ayarları ve kimlik bilgilerini kontrol edin.",
"The configuration is invalid. Please have a look at the logs for further details." => "Yapılandırma geçersiz. Lütfen ayrıntılar için günlüklere bakın.",
"No action specified" => "Eylem belirtilmedi",
"No configuration specified" => "Yapılandırma belirtilmemiş",
"No data specified" => "Veri belirtilmemiÅŸ",
-" Could not set configuration %s" => "Yapılandırma %s olarak ayarlanamadı",
+" Could not set configuration %s" => "%s yapılandırması ayarlanamadı",
"Deletion failed" => "Silme başarısız oldu",
"Take over settings from recent server configuration?" => "Ayarlar son sunucu yapılandırmalarından devralınsın mı?",
-"Keep settings?" => "Ayarlar kalsın mı?",
+"Keep settings?" => "Ayarlar korunsun mu?",
+"{nbServer}. Server" => "{nbServer}. Sunucu",
"Cannot add server configuration" => "Sunucu yapılandırması eklenemedi",
"mappings cleared" => "eÅŸleÅŸtirmeler temizlendi",
"Success" => "Başarılı",
"Error" => "Hata",
+"Please specify a Base DN" => "Lütfen bir Base DN belirtin",
+"Could not determine Base DN" => "Base DN belirlenemedi",
+"Please specify the port" => "Lütfen bağlantı noktasını belirtin",
"Configuration OK" => "Yapılandırma tamam",
"Configuration incorrect" => "Yapılandırma geçersiz",
"Configuration incomplete" => "Yapılandırma tamamlanmamış",
@@ -30,46 +34,55 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("%s kullanıcı bulundu","%s kullanıcı bulundu"),
"Invalid Host" => "Geçersiz Makine",
"Could not find the desired feature" => "İstenen özellik bulunamadı",
+"Server" => "Sunucu",
+"User Filter" => "Kullanıcı Süzgeci",
+"Login Filter" => "Oturum Süzgeci",
+"Group Filter" => "Grup Süzgeci",
"Save" => "Kaydet",
-"Test Configuration" => "Test Yapılandırması",
+"Test Configuration" => "Yapılandırmayı Sına",
"Help" => "Yardım",
-"Groups meeting these criteria are available in %s:" => "Bu kriterle eşleşen gruplar %s içinde mevcut:",
+"Groups meeting these criteria are available in %s:" => "Bu kriterlerle eşleşen gruplar %s içinde mevcut:",
"only those object classes:" => "sadece bu nesne sınıflarına:",
"only from those groups:" => "sadece bu gruplardan:",
"Edit raw filter instead" => "Bunun yerine ham filtreyi düzenle",
"Raw LDAP filter" => "Ham LDAP filtresi",
"The filter specifies which LDAP groups shall have access to the %s instance." => "Filtre, %s örneğine erişmesi gereken LDAP gruplarını belirtir.",
"groups found" => "grup bulundu",
-"Users login with this attribute:" => "Bu nitelikle oturum açan kullanıcılar:",
+"Users login with this attribute:" => "Kullanıcılar şu öznitelikle oturum açarlar:",
"LDAP Username:" => "LDAP Kullanıcı Adı:",
"LDAP Email Address:" => "LDAP E-posta Adresi:",
-"Other Attributes:" => "DiÄŸer Nitelikler",
+"Other Attributes:" => "DiÄŸer Nitelikler:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Oturum açma girişimi olduğunda uygulanacak filtreyi tanımlar. %%uid, oturum işleminde kullanıcı adı ile değiştirilir. Örneğin: \"uid=%%uid\"",
+"1. Server" => "1. Sunucu",
+"%s. Server:" => "%s. Sunucu:",
"Add Server Configuration" => "Sunucu Yapılandırması Ekle",
+"Delete Configuration" => "Yapılandırmayı Sil",
"Host" => "Sunucu",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL gerektirmediğiniz takdirde protokol belirtmeyebilirsiniz. Ardından ldaps:// ile başlayın",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL gerekmediği takdirde protokol belirtmeyebilirsiniz. Gerekiyorsa ldaps:// ile başlayın",
"Port" => "Port",
"User DN" => "Kullanıcı 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." => "İstemci kullanıcısının yapılacağı atamanın DN'i örn. uid=agent,dc=örnek,dc=com. Anonim erişim için DN ve Parolayı boş bırakın.",
+"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." => "İstemci kullanıcısının yapılacağı atamanın DN'si. Örn. uid=agent,dc=örnek,dc=com. Anonim erişim için DN ve Parolayı boş bırakın.",
"Password" => "Parola",
"For anonymous access, leave DN and Password empty." => "Anonim erişim için DN ve Parola alanlarını boş bırakın.",
"One Base DN per line" => "Her satırda tek bir Base DN",
-"You can specify Base DN for users and groups in the Advanced tab" => "Gelişmiş sekmesinde kullanıcılar ve gruplar için Base DN belirtebilirsiniz.",
-"Limit %s access to users meeting these criteria:" => "%s erişimini, şu kriterle eşleşen kullanıcılara sınırla:",
+"You can specify Base DN for users and groups in the Advanced tab" => "Gelişmiş sekmesinde, kullanıcılar ve gruplar için Base DN belirtebilirsiniz",
+"Limit %s access to users meeting these criteria:" => "%s erişimini, şu kriterlerle eşleşen kullanıcılara sınırla:",
"The filter specifies which LDAP users shall have access to the %s instance." => "Filtre, %s örneğine erişmesi gereken LDAP kullanıcılarını belirtir.",
"users found" => "kullanıcı bulundu",
"Back" => "Geri",
"Continue" => "Devam et",
+"Expert" => "Uzman",
+"Advanced" => "GeliÅŸmiÅŸ",
"<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>Uyarı:</b> user_ldap ve user_webdavauth uygulamaları uyumlu değil. Beklenmedik bir davranışla karşılaşabilirsiniz. Lütfen ikisinden birini devre dışı bırakmak için sistem yöneticinizle iletişime geçin.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Uyarı:</b> PHP LDAP modülü kurulu değil, arka uç çalışmayacak. Lütfen kurulumu için sistem yöneticinizle iletişime geçin.",
-"Connection Settings" => "Bağlantı ayarları",
+"Connection Settings" => "Bağlantı Ayarları",
"Configuration Active" => "Yapılandırma Etkin",
"When unchecked, this configuration will be skipped." => "İşaretli değilse, bu yapılandırma atlanacaktır.",
"Backup (Replica) Host" => "Yedek (Replica) Sunucu",
"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "İsteğe bağlı bir yedek sunucusu belirtin. Ana LDAP/AD sunucusunun bir kopyası olmalıdır.",
"Backup (Replica) Port" => "Yedek (Replica) Bağlantı Noktası",
-"Disable Main Server" => "Ana sunucuyu devredışı birak",
-"Only connect to the replica server." => "Sadece kopya sunucuya baÄŸlan.",
+"Disable Main Server" => "Ana Sunucuyu Devre Dışı Bırak",
+"Only connect to the replica server." => "Sadece yedek sunucuya baÄŸlan.",
"Case insensitive LDAP server (Windows)" => "Büyük küçük harf duyarsız LDAP sunucusu (Windows)",
"Turn off SSL certificate validation." => "SSL sertifika doğrulamasını kapat.",
"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." => "Önerilmez, sadece test için kullanın! Eğer bağlantı sadece bu seçenekle çalışıyorsa %s sunucunuza LDAP sunucusunun SSL sertifikasını ekleyin.",
@@ -79,16 +92,16 @@ $TRANSLATIONS = array(
"User Display Name Field" => "Kullanıcı Görünen Ad Alanı",
"The LDAP attribute to use to generate the user's display name." => "Kullanıcının görünen adını oluşturmak için kullanılacak LDAP niteliği.",
"Base User Tree" => "Temel Kullanıcı Ağacı",
-"One User Base DN per line" => "Her satırda Tek Kullanıcı Base DN'i",
+"One User Base DN per line" => "Her satırda Tek Kullanıcı Base DN'si",
"User Search Attributes" => "Kullanıcı Arama Nitelikleri",
"Optional; one attribute per line" => "Tercihe bağlı; her bir satırda bir öznitelik",
"Group Display Name Field" => "Grup Görünen Ad Alanı",
"The LDAP attribute to use to generate the groups's display name." => "Grubun görünen adını oluşturmak için kullanılacak LDAP niteliği.",
"Base Group Tree" => "Temel Grup Ağacı",
-"One Group Base DN per line" => "Her satırda Tek Grup Base DN'i",
+"One Group Base DN per line" => "Her satırda Tek Grup Base DN'si",
"Group Search Attributes" => "Grup Arama Nitelikleri",
"Group-Member association" => "Grup-Ãœye iÅŸbirliÄŸi",
-"Nested Groups" => "İç içe Gruplar",
+"Nested Groups" => "İç İçe Gruplar",
"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Etkinleştirildiğinde, grup içeren gruplar desteklenir (Sadece grup üyesi DN niteliği içeriyorsa çalışır).",
"Paging chunksize" => "Sayfalama yığın boyutu",
"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Yığın boyutu, kullanıcı veya grup numaralandırması benzeri hantal sonuçlar döndürebilen sayfalandırılmış LDAP aramaları için kullanılır. (0 yapmak bu durumlarda sayfalandırılmış LDAP aramalarını devre dışı bırakır.)",
@@ -98,9 +111,9 @@ $TRANSLATIONS = array(
"in bytes" => "byte cinsinden",
"Email Field" => "E-posta Alanı",
"User Home Folder Naming Rule" => "Kullanıcı Ana Dizini İsimlendirme Kuralı",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kullanıcı adı bölümünü boş bırakın (varsayılan). ",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kullanıcı adı bölümünü boş bırakın (öntanımlı). Aksi halde bir LDAP/AD özniteliği belirtin.",
"Internal Username" => "Dahili Kullanıcı Adı",
-"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." => "Öntanımlı olarak UUID niteliğinden dahili bir kullanıcı adı oluşturulacak. Bu, kullanıcı adının benzersiz ve karakterlerinin dönüştürme gereksinimini ortadan kaldırır. Dahili kullanıcı adı, sadece bu karakterlerin izin verildiği kısıtlamaya sahip: [ a-zA-Z0-9_.@- ]. Diğer karakterler ise ASCII karşılıkları ile yer değiştirilir veya basitçe yoksayılır. Çakışmalar olduğunda ise bir numara eklenir veya arttırılır. Dahili kullanıcı adı, bir kullanıcıyı dahili olarak tanımlamak için kullanılır. Ayrıca kullanıcı ev klasörü için öntanımlı bir isimdir. Bu ayrıca uzak adreslerin (örneğin tüm *DAV hizmetleri) bir parçasıdır. Bu yar ise, öntanımlı davranışın üzerine yazılabilir. ownCloud 5'ten önce benzer davranışı yapabilmek için aşağıdaki alana bir kullanıcı görünen adı niteliği girin. Öntanımlı davranış için boş bırakın. Değişiklikler, sadece yeni eşleştirilen (eklenen) LDAP kullanıcılarında etkili olacaktır.",
+"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." => "Öntanımlı olarak UUID niteliğinden dahili bir kullanıcı adı oluşturulacak. Bu, kullanıcı adının benzersiz ve karakterlerinin dönüştürme gereksinimini ortadan kaldırır. Dahili kullanıcı adı, sadece bu karakterlerin izin verildiği kısıtlamaya sahip: [ a-zA-Z0-9_.@- ]. Diğer karakterler ise ASCII karşılıkları ile yer değiştirilir veya basitçe yoksayılır. Çakışmalar olduğunda ise bir numara eklenir veya arttırılır. Dahili kullanıcı adı, bir kullanıcıyı dahili olarak tanımlamak için kullanılır. Ayrıca kullanıcı ev klasörü için öntanımlı bir isimdir. Bu ayrıca uzak adreslerin (örneğin tüm *DAV hizmetleri) bir parçasıdır. Bu ayar ise, öntanımlı davranışın üzerine yazılabilir. ownCloud 5'ten önce benzer davranışı yapabilmek için aşağıdaki alana bir kullanıcı görünen adı niteliği girin. Öntanımlı davranış için boş bırakın. Değişiklikler, sadece yeni eşleştirilen (eklenen) LDAP kullanıcılarında etkili olacaktır.",
"Internal Username Attribute:" => "Dahili Kullanıcı Adı Özniteliği:",
"Override UUID detection" => "UUID tespitinin üzerine yaz",
"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." => "Öntanımlı olarak, UUID niteliği otomatik olarak tespit edilmez. UUID niteliği LDAP kullanıcılarını ve gruplarını şüphesiz biçimde tanımlamak için kullanılır. Ayrıca yukarıda belirtilmemişse, bu UUID'ye bağlı olarak dahili bir kullanıcı adı oluşturulacaktır. Bu ayarın üzerine yazabilir ve istediğiniz bir nitelik belirtebilirsiniz. Ancak istediğiniz niteliğin benzersiz olduğundan ve hem kullanıcı hem de gruplar tarafından getirilebileceğinden emin olmalısınız. Öntanımlı davranış için boş bırakın. Değişiklikler sadece yeni eşleştirilen (eklenen) LDAP kullanıcı ve gruplarında etkili olacaktır.",
@@ -109,6 +122,6 @@ $TRANSLATIONS = array(
"Username-LDAP User Mapping" => "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirme",
"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." => "Kullanıcı adları, (üst) veri depolaması ve ataması için kullanılır. Kullanıcıları kesin olarak tanımlamak ve algılamak için, her LDAP kullanıcısı bir dahili kullanıcı adına sahip olacak. Bu kullanıcı adı ile LDAP kullanıcısı arasında bir eşleşme gerektirir. Oluşturulan kullanıcı adı LDAP kullanıcısının UUID'si ile eşleştirilir. Ek olarak LDAP etkileşimini azaltmak için DN de önbelleğe alınır ancak bu kimlik tanıma için kullanılmaz. Eğer DN değişirse, değişiklikler tespit edilir. Dahili kullanıcı her yerde kullanılır. Eşleştirmeleri temizlemek, her yerde kalıntılar bırakacaktır. Eşleştirmeleri temizlemek yapılandırmaya hassas bir şekilde bağlı değildir, tüm LDAP yapılandırmalarını etkiler! Üretim ortamında eşleştirmeleri asla temizlemeyin, sadece sınama veya deneysel aşamada kullanın.",
"Clear Username-LDAP User Mapping" => "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirmesini Temizle",
-"Clear Groupname-LDAP Group Mapping" => "Grup Adı-LDAP Grubu Eşleştirme"
+"Clear Groupname-LDAP Group Mapping" => "Grup Adı-LDAP Grubu Eşleştirmesini Temizle"
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/ug.php b/apps/user_ldap/l10n/ug.php
index 7f751814396f9b442df60501a681c6846dd673a6..02adcc0c8a57060da8b4d165ab132e91fe7bbe1a 100644
--- a/apps/user_ldap/l10n/ug.php
+++ b/apps/user_ldap/l10n/ug.php
@@ -4,11 +4,13 @@ $TRANSLATIONS = array(
"Error" => "خاتالىق",
"_%s group found_::_%s groups found_" => array(""),
"_%s user found_::_%s users found_" => array(""),
+"Group Filter" => "گۇرۇپپا سۈزگۈچ",
"Save" => "ساقلا",
"Help" => "ياردەم",
"Host" => "باش ئاپپارات",
"Port" => "ئÛغىز",
"Password" => "ئىم",
+"Advanced" => "ئالىي",
"Connection Settings" => "باغلىنىش تەÚشىكى",
"Configuration Active" => "سەپلىمە ئاكتىپ"
);
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index 5f4db6d5a03b7b855547e4b92f306b8a8b4e8a38..19d37a282b74def6abc4244b704ba9aa4a2b4b59 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
"Confirm Deletion" => "Підтвердіть ВидаленнÑ",
"_%s group found_::_%s groups found_" => array("","",""),
"_%s user found_::_%s users found_" => array("","",""),
+"Group Filter" => "Фільтр Груп",
"Save" => "Зберегти",
"Test Configuration" => "ТеÑтове налаштуваннÑ",
"Help" => "Допомога",
@@ -31,6 +32,7 @@ $TRANSLATIONS = array(
"You can specify Base DN for users and groups in the Advanced tab" => "Ви можете задати Базовий DN Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸Ñтувачів Ñ– груп на вкладинці Додатково",
"Back" => "Ðазад",
"Continue" => "Продовжити",
+"Advanced" => "Додатково",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Увага:</ b> Потрібний модуль PHP LDAP не вÑтановлено, базова програма працювати не буде. Будь лаÑка, звернітьÑÑ Ð´Ð¾ ÑиÑтемного адмініÑтратора, щоб вÑтановити його.",
"Connection Settings" => "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð—'єднаннÑ",
"Configuration Active" => "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ðктивне",
diff --git a/apps/user_ldap/l10n/ur_PK.php b/apps/user_ldap/l10n/ur_PK.php
index 9fbd174bd1f7d2b540cc83dfe1c6a0ea8c77d7be..12ca746d7d4d5cc5bdef677e738afabe5f514421 100644
--- a/apps/user_ldap/l10n/ur_PK.php
+++ b/apps/user_ldap/l10n/ur_PK.php
@@ -3,7 +3,10 @@ $TRANSLATIONS = array(
"Error" => "ایرر",
"_%s group found_::_%s groups found_" => array("",""),
"_%s user found_::_%s users found_" => array("",""),
+"Save" => "ØÙظ",
"Help" => "مدد",
-"Password" => "پاسورڈ"
+"Password" => "پاسورڈ",
+"Continue" => "جاری",
+"Advanced" => "ایڈوانسڈ"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php
index 21b9783897ea66a044c7ca08f60e049fb05ab8b2..8c2fe2a0afc8594f8cc09ddfcb3716fb08787c93 100644
--- a/apps/user_ldap/l10n/vi.php
+++ b/apps/user_ldap/l10n/vi.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
"Select groups" => "Chá»n nhóm",
"_%s group found_::_%s groups found_" => array(""),
"_%s user found_::_%s users found_" => array(""),
+"Group Filter" => "Bá»™ lá»c nhóm",
"Save" => "LÆ°u",
"Help" => "Giúp đỡ",
"Host" => "Máy chủ",
@@ -18,6 +19,7 @@ $TRANSLATIONS = array(
"You can specify Base DN for users and groups in the Advanced tab" => "Bạn có thể chỉ định DN cÆ¡ bản cho ngÆ°á»i dùng và các nhóm trong tab Advanced",
"Back" => "Trở lại",
"Continue" => "Tiếp tục",
+"Advanced" => "Nâng cao",
"Connection Settings" => "Connection Settings",
"Backup (Replica) Port" => "Cổng sao lưu (Replica)",
"Disable Main Server" => "Tắt máy chủ chÃnh",
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index d56f394f644021f7a85f68f5f3e8806c822b66da..d730706cce12bd57d065cda25960189a45391365 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -18,6 +18,7 @@ $TRANSLATIONS = array(
"Confirm Deletion" => "ç¡®è®¤åˆ é™¤",
"_%s group found_::_%s groups found_" => array(""),
"_%s user found_::_%s users found_" => array(""),
+"Group Filter" => "组过滤",
"Save" => "ä¿å˜",
"Test Configuration" => "测试é…ç½®",
"Help" => "帮助",
@@ -33,6 +34,7 @@ $TRANSLATIONS = array(
"You can specify Base DN for users and groups in the Advanced tab" => "您å¯ä»¥åœ¨é«˜çº§é€‰é¡¹å¡é‡Œä¸ºç”¨æˆ·å’Œç»„指定Base DN",
"Back" => "返回",
"Continue" => "继ç»",
+"Advanced" => "高级",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>è¦å‘Šï¼š</b> PHP LDAP 模å—未安装，åŽç«¯å°†æ— 法工作。请请求您的系统管ç†å‘˜å®‰è£…该模å—。",
"Connection Settings" => "连接设置",
"Configuration Active" => "现行é…ç½®",
diff --git a/apps/user_ldap/l10n/zh_HK.php b/apps/user_ldap/l10n/zh_HK.php
index cb504b17463021dba33f76ee22d1e662ac52902c..95ee4c5c080b87dc53751450c6782465b7215908 100644
--- a/apps/user_ldap/l10n/zh_HK.php
+++ b/apps/user_ldap/l10n/zh_HK.php
@@ -7,6 +7,7 @@ $TRANSLATIONS = array(
"Save" => "儲å˜",
"Help" => "幫助",
"Port" => "é€£æŽ¥åŸ ",
-"Password" => "密碼"
+"Password" => "密碼",
+"Advanced" => "進階"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index a0975b92238d286b33a223e660e0797600280f57..345546da72d0bf7f9e8fc3660642defa8fdde2a1 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -18,6 +18,7 @@ $TRANSLATIONS = array(
"Confirm Deletion" => "確èªåˆªé™¤",
"_%s group found_::_%s groups found_" => array(""),
"_%s user found_::_%s users found_" => array(""),
+"Group Filter" => "Group Filter",
"Save" => "儲å˜",
"Test Configuration" => "測試æ¤è¨å®š",
"Help" => "說明",
@@ -33,6 +34,7 @@ $TRANSLATIONS = array(
"You can specify Base DN for users and groups in the Advanced tab" => "您å¯ä»¥åœ¨é€²éšŽæ¨™ç±¤é 裡é¢æŒ‡å®šä½¿ç”¨è€…åŠç¾¤çµ„çš„ Base DN",
"Back" => "返回",
"Continue" => "繼續",
+"Advanced" => "進階",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>è¦å‘Šï¼š</b>æ²’æœ‰å®‰è£ PHP LDAP 模組，後端系統將無法é‹ä½œï¼Œè«‹è¦æ±‚您的系統管ç†å“¡å®‰è£æ¨¡çµ„。",
"Connection Settings" => "連線è¨å®š",
"Configuration Active" => "è¨å®šä½¿ç”¨ä¸",
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 712407505fb9bcac85e102e118ca22493c484ff7..78de14f4ee9848c133d5ee610e5de2d6e444b70f 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -23,6 +23,10 @@
namespace OCA\user_ldap\lib;
+/**
+ * Class Access
+ * @package OCA\user_ldap\lib
+ */
class Access extends LDAPUtility {
public $connection;
//never ever check this var directly, always use getPagedSearchResultState
@@ -30,24 +34,30 @@ class Access extends LDAPUtility {
protected $cookies = array();
+ /**
+ * @param Connection $connection
+ * @param ILDAPWrapper $ldap
+ */
public function __construct(Connection $connection, ILDAPWrapper $ldap) {
parent::__construct($ldap);
$this->connection = $connection;
}
+ /**
+ * @return bool
+ */
private function checkConnection() {
return ($this->connection instanceof Connection);
}
/**
- * @brief reads a given attribute for an LDAP record identified by a DN
- * @param $dn the record in question
- * @param $attr the attribute that shall be retrieved
+ * reads a given attribute for an LDAP record identified by a DN
+ * @param string $dn the record in question
+ * @param string $attr the attribute that shall be retrieved
* if empty, just check the record's existence
- * @returns an array of values on success or an empty
+ * @param string $filter
+ * @return array|false an array of values on success or an empty
* array if $attr is empty, false otherwise
- *
- * Reads an attribute from an LDAP entry or check if entry exists
*/
public function readAttribute($dn, $attr, $filter = 'objectClass=*') {
if(!$this->checkConnection()) {
@@ -105,7 +115,7 @@ class Access extends LDAPUtility {
}
/**
- * @brief checks wether the given attribute`s valua is probably a DN
+ * checks whether the given attributes value is probably a DN
* @param string $attr the attribute in question
* @return boolean if so true, otherwise false
*/
@@ -119,16 +129,16 @@ class Access extends LDAPUtility {
}
/**
- * @brief sanitizes a DN received from the LDAP server
- * @param $dn the DN in question
- * @return the sanitized DN
+ * sanitizes a DN received from the LDAP server
+ * @param array $dn the DN in question
+ * @return array the sanitized DN
*/
private function sanitizeDN($dn) {
//treating multiple base DNs
if(is_array($dn)) {
$result = array();
foreach($dn as $singleDN) {
- $result[] = $this->sanitizeDN($singleDN);
+ $result[] = $this->sanitizeDN($singleDN);
}
return $result;
}
@@ -163,7 +173,8 @@ class Access extends LDAPUtility {
/**
* gives back the database table for the query
- * @param boolean $isUser
+ * @param bool $isUser
+ * @return string
*/
private function getMapTable($isUser) {
if($isUser) {
@@ -174,11 +185,9 @@ class Access extends LDAPUtility {
}
/**
- * @brief returns the LDAP DN for the given internal ownCloud name of the group
- * @param string $name the ownCloud name in question
- * @returns string with the LDAP DN on success, otherwise false
- *
* returns the LDAP DN for the given internal ownCloud name of the group
+ * @param string $name the ownCloud name in question
+ * @return string with the LDAP DN on success, otherwise false
*/
public function groupname2dn($name) {
$dn = $this->ocname2dn($name, false);
@@ -191,11 +200,9 @@ class Access extends LDAPUtility {
}
/**
- * @brief returns the LDAP DN for the given internal ownCloud name of the user
- * @param $name the ownCloud name in question
- * @returns string with the LDAP DN on success, otherwise false
- *
* returns the LDAP DN for the given internal ownCloud name of the user
+ * @param string $name the ownCloud name in question
+ * @return string with the LDAP DN on success, otherwise false
*/
public function username2dn($name) {
$dn = $this->ocname2dn($name, true);
@@ -209,12 +216,10 @@ class Access extends LDAPUtility {
}
/**
- * @brief returns the LDAP DN for the given internal ownCloud name
- * @param $name the ownCloud name in question
- * @param boolean $isUser is it a user? otherwise group
- * @returns string with the LDAP DN on success, otherwise false
- *
* returns the LDAP DN for the given internal ownCloud name
+ * @param string $name the ownCloud name in question
+ * @param boolean $isUser is it a user? otherwise group
+ * @return string with the LDAP DN on success, otherwise false
*/
private function ocname2dn($name, $isUser) {
$table = $this->getMapTable($isUser);
@@ -230,15 +235,12 @@ class Access extends LDAPUtility {
}
/**
- * @brief returns the internal ownCloud name for the given LDAP DN of the group
- * @param $dn the dn of the group object
- * @param $ldapname optional, the display name of the object
- * @returns string with with the name to use in ownCloud, false on DN outside of search DN
- *
- * returns the internal ownCloud name for the given LDAP DN of the
- * group, false on DN outside of search DN or failure
+ * returns the internal ownCloud name for the given LDAP DN of the group, false on DN outside of search DN or failure
+ * @param string $dn the dn of the group object
+ * @param string $ldapName optional, the display name of the object
+ * @return string with the name to use in ownCloud, false on DN outside of search DN
*/
- public function dn2groupname($dn, $ldapname = null) {
+ public function dn2groupname($dn, $ldapName = null) {
//To avoid bypassing the base DN settings under certain circumstances
//with the group support, check whether the provided DN matches one of
//the given Bases
@@ -246,18 +248,16 @@ class Access extends LDAPUtility {
return false;
}
- return $this->dn2ocname($dn, $ldapname, false);
+ return $this->dn2ocname($dn, $ldapName, false);
}
/**
- * @brief returns the internal ownCloud name for the given LDAP DN of the user
- * @param $dn the dn of the user object
- * @param $ldapname optional, the display name of the object
- * @returns string with with the name to use in ownCloud
- *
* returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure
+ * @param string $dn the dn of the user object
+ * @param string $ldapName optional, the display name of the object
+ * @return string with with the name to use in ownCloud
*/
- public function dn2username($dn, $ldapname = null) {
+ public function dn2username($dn, $ldapName = null) {
//To avoid bypassing the base DN settings under certain circumstances
//with the group support, check whether the provided DN matches one of
//the given Bases
@@ -265,19 +265,17 @@ class Access extends LDAPUtility {
return false;
}
- return $this->dn2ocname($dn, $ldapname, true);
+ return $this->dn2ocname($dn, $ldapName, true);
}
/**
- * @brief returns an internal ownCloud name for the given LDAP DN
- * @param $dn the dn of the user object
- * @param $ldapname optional, the display name of the object
- * @param $isUser optional, wether it is a user object (otherwise group assumed)
- * @returns string with with the name to use in ownCloud
- *
- * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN
+ * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN
+ * @param string $dn the dn of the user object
+ * @param string $ldapName optional, the display name of the object
+ * @param bool $isUser optional, whether it is a user object (otherwise group assumed)
+ * @return string with with the name to use in ownCloud
*/
- public function dn2ocname($dn, $ldapname = null, $isUser = true) {
+ public function dn2ocname($dn, $ldapName = null, $isUser = true) {
$table = $this->getMapTable($isUser);
if($isUser) {
$fncFindMappedName = 'findMappedUser';
@@ -288,9 +286,9 @@ class Access extends LDAPUtility {
}
//let's try to retrieve the ownCloud name from the mappings table
- $ocname = $this->$fncFindMappedName($dn);
- if($ocname) {
- return $ocname;
+ $ocName = $this->$fncFindMappedName($dn);
+ if($ocName) {
+ return $ocName;
}
//second try: get the UUID and check if it is known. Then, update the DN and return the name.
@@ -317,13 +315,13 @@ class Access extends LDAPUtility {
return false;
}
- if(is_null($ldapname)) {
- $ldapname = $this->readAttribute($dn, $nameAttribute);
- if(!isset($ldapname[0]) && empty($ldapname[0])) {
+ if(is_null($ldapName)) {
+ $ldapName = $this->readAttribute($dn, $nameAttribute);
+ if(!isset($ldapName[0]) && empty($ldapName[0])) {
\OCP\Util::writeLog('user_ldap', 'No or empty name for '.$dn.'.', \OCP\Util::INFO);
return false;
}
- $ldapname = $ldapname[0];
+ $ldapName = $ldapName[0];
}
if($isUser) {
@@ -334,27 +332,27 @@ class Access extends LDAPUtility {
} else {
$username = $uuid;
}
- $intname = $this->sanitizeUsername($username);
+ $intName = $this->sanitizeUsername($username);
} else {
- $intname = $ldapname;
+ $intName = $ldapName;
}
//a new user/group! Add it only if it doesn't conflict with other backend's users or existing groups
//disabling Cache is required to avoid that the new user is cached as not-existing in fooExists check
$originalTTL = $this->connection->ldapCacheTTL;
$this->connection->setConfiguration(array('ldapCacheTTL' => 0));
- if(($isUser && !\OCP\User::userExists($intname))
- || (!$isUser && !\OC_Group::groupExists($intname))) {
- if($this->mapComponent($dn, $intname, $isUser)) {
+ if(($isUser && !\OCP\User::userExists($intName))
+ || (!$isUser && !\OC_Group::groupExists($intName))) {
+ if($this->mapComponent($dn, $intName, $isUser)) {
$this->connection->setConfiguration(array('ldapCacheTTL' => $originalTTL));
- return $intname;
+ return $intName;
}
}
$this->connection->setConfiguration(array('ldapCacheTTL' => $originalTTL));
- $altname = $this->createAltInternalOwnCloudName($intname, $isUser);
- if($this->mapComponent($dn, $altname, $isUser)) {
- return $altname;
+ $altName = $this->createAltInternalOwnCloudName($intName, $isUser);
+ if($this->mapComponent($dn, $altName, $isUser)) {
+ return $altName;
}
//if everything else did not help..
@@ -363,9 +361,9 @@ class Access extends LDAPUtility {
}
/**
- * @brief gives back the user names as they are used ownClod internally
- * @param $ldapGroups an array with the ldap Users result in style of array ( array ('dn' => foo, 'uid' => bar), ... )
- * @returns an array with the user names to use in ownCloud
+ * gives back the user names as they are used ownClod internally
+ * @param array $ldapUsers an array with the ldap Users result in style of array ( array ('dn' => foo, 'uid' => bar), ... )
+ * @return array an array with the user names to use in ownCloud
*
* gives back the user names as they are used ownClod internally
*/
@@ -374,9 +372,9 @@ class Access extends LDAPUtility {
}
/**
- * @brief gives back the group names as they are used ownClod internally
- * @param $ldapGroups an array with the ldap Groups result in style of array ( array ('dn' => foo, 'cn' => bar), ... )
- * @returns an array with the group names to use in ownCloud
+ * gives back the group names as they are used ownClod internally
+ * @param array $ldapGroups an array with the ldap Groups result in style of array ( array ('dn' => foo, 'cn' => bar), ... )
+ * @return array an array with the group names to use in ownCloud
*
* gives back the group names as they are used ownClod internally
*/
@@ -384,6 +382,10 @@ class Access extends LDAPUtility {
return $this->ldap2ownCloudNames($ldapGroups, false);
}
+ /**
+ * @param string $dn
+ * @return bool|string
+ */
private function findMappedUser($dn) {
static $query = null;
if(is_null($query)) {
@@ -400,6 +402,10 @@ class Access extends LDAPUtility {
return false;
}
+ /**
+ * @param string $dn
+ * @return bool|string
+ */
private function findMappedGroup($dn) {
static $query = null;
if(is_null($query)) {
@@ -416,9 +422,10 @@ class Access extends LDAPUtility {
return false;
}
-
/**
- * @param boolean $isUsers
+ * @param array $ldapObjects
+ * @param bool $isUsers
+ * @return array
*/
private function ldap2ownCloudNames($ldapObjects, $isUsers) {
if($isUsers) {
@@ -430,13 +437,13 @@ class Access extends LDAPUtility {
foreach($ldapObjects as $ldapObject) {
$nameByLDAP = isset($ldapObject[$nameAttribute]) ? $ldapObject[$nameAttribute] : null;
- $ocname = $this->dn2ocname($ldapObject['dn'], $nameByLDAP, $isUsers);
- if($ocname) {
- $ownCloudNames[] = $ocname;
+ $ocName = $this->dn2ocname($ldapObject['dn'], $nameByLDAP, $isUsers);
+ if($ocName) {
+ $ownCloudNames[] = $ocName;
if($isUsers) {
//cache the user names so it does not need to be retrieved
//again later (e.g. sharing dialogue).
- $this->cacheUserDisplayName($ocname, $nameByLDAP);
+ $this->cacheUserDisplayName($ocName, $nameByLDAP);
}
}
continue;
@@ -445,19 +452,19 @@ class Access extends LDAPUtility {
}
/**
- * @brief caches the user display name
- * @param string the internal owncloud username
- * @param string the display name
+ * caches the user display name
+ * @param string $ocName the internal ownCloud username
+ * @param string $displayName the display name
*/
- public function cacheUserDisplayName($ocname, $displayName) {
+ public function cacheUserDisplayName($ocName, $displayName) {
$cacheKeyTrunk = 'getDisplayName';
- $this->connection->writeToCache($cacheKeyTrunk.$ocname, $displayName);
+ $this->connection->writeToCache($cacheKeyTrunk.$ocName, $displayName);
}
/**
- * @brief creates a unique name for internal ownCloud use for users. Don't call it directly.
- * @param $name the display name of the object
- * @returns string with with the name to use in ownCloud or false if unsuccessful
+ * creates a unique name for internal ownCloud use for users. Don't call it directly.
+ * @param string $name the display name of the object
+ * @return string with with the name to use in ownCloud or false if unsuccessful
*
* Instead of using this method directly, call
* createAltInternalOwnCloudName($name, true)
@@ -477,9 +484,9 @@ class Access extends LDAPUtility {
}
/**
- * @brief creates a unique name for internal ownCloud use for groups. Don't call it directly.
- * @param $name the display name of the object
- * @returns string with with the name to use in ownCloud or false if unsuccessful.
+ * creates a unique name for internal ownCloud use for groups. Don't call it directly.
+ * @param string $name the display name of the object
+ * @return string with with the name to use in ownCloud or false if unsuccessful.
*
* Instead of using this method directly, call
* createAltInternalOwnCloudName($name, false)
@@ -504,17 +511,17 @@ class Access extends LDAPUtility {
$lastNo = 1; //will become name_2
} else {
natsort($usedNames);
- $lastname = array_pop($usedNames);
- $lastNo = intval(substr($lastname, strrpos($lastname, '_') + 1));
+ $lastName = array_pop($usedNames);
+ $lastNo = intval(substr($lastName, strrpos($lastName, '_') + 1));
}
$altName = $name.'_'.strval($lastNo+1);
unset($usedNames);
$attempts = 1;
while($attempts < 21){
- //Pro forma check to be really sure it is unique
- //while loop is just a precaution. If a name is not generated within
- //20 attempts, something else is very wrong. Avoids infinite loop.
+ // Check to be really sure it is unique
+ // while loop is just a precaution. If a name is not generated within
+ // 20 attempts, something else is very wrong. Avoids infinite loop.
if(!\OC_Group::groupExists($altName)) {
return $altName;
}
@@ -525,10 +532,10 @@ class Access extends LDAPUtility {
}
/**
- * @brief creates a unique name for internal ownCloud use.
- * @param $name the display name of the object
+ * creates a unique name for internal ownCloud use.
+ * @param string $name the display name of the object
* @param boolean $isUser whether name should be created for a user (true) or a group (false)
- * @returns string with with the name to use in ownCloud or false if unsuccessful
+ * @return string with with the name to use in ownCloud or false if unsuccessful
*/
private function createAltInternalOwnCloudName($name, $isUser) {
$originalTTL = $this->connection->ldapCacheTTL;
@@ -544,8 +551,8 @@ class Access extends LDAPUtility {
}
/**
- * @brief retrieves all known groups from the mappings table
- * @returns array with the results
+ * retrieves all known groups from the mappings table
+ * @return array with the results
*
* retrieves all known groups from the mappings table
*/
@@ -554,8 +561,8 @@ class Access extends LDAPUtility {
}
/**
- * @brief retrieves all known users from the mappings table
- * @returns array with the results
+ * retrieves all known users from the mappings table
+ * @return array with the results
*
* retrieves all known users from the mappings table
*/
@@ -578,20 +585,20 @@ class Access extends LDAPUtility {
}
/**
- * @brief inserts a new user or group into the mappings table
- * @param $dn the record in question
- * @param $ocname the name to use in ownCloud
- * @param $isUser is it a user or a group?
- * @returns true on success, false otherwise
+ * inserts a new user or group into the mappings table
+ * @param string $dn the record in question
+ * @param string $ocName the name to use in ownCloud
+ * @param bool $isUser is it a user or a group?
+ * @return bool true on success, false otherwise
*
* inserts a new user or group into the mappings table
*/
- private function mapComponent($dn, $ocname, $isUser = true) {
+ private function mapComponent($dn, $ocName, $isUser = true) {
$table = $this->getMapTable($isUser);
$sqlAdjustment = '';
- $dbtype = \OCP\Config::getSystemValue('dbtype');
- if($dbtype === 'mysql') {
+ $dbType = \OCP\Config::getSystemValue('dbtype');
+ if($dbType === 'mysql') {
$sqlAdjustment = 'FROM DUAL';
}
@@ -607,9 +614,9 @@ class Access extends LDAPUtility {
');
//feed the DB
- $insRows = $insert->execute(array($dn, $ocname,
+ $insRows = $insert->execute(array($dn, $ocName,
$this->getUUID($dn, $isUser), $dn,
- $ocname));
+ $ocName));
if(\OCP\DB::isError($insRows)) {
return false;
@@ -623,8 +630,11 @@ class Access extends LDAPUtility {
}
/**
- * @param integer $limit
- * @param integer $offset
+ * @param string $filter
+ * @param string|string[] $attr
+ * @param int $limit
+ * @param int $offset
+ * @return array
*/
public function fetchListOfUsers($filter, $attr, $limit = null, $offset = null) {
return $this->fetchList($this->searchUsers($filter, $attr, $limit, $offset), (count($attr) > 1));
@@ -632,15 +642,19 @@ class Access extends LDAPUtility {
/**
* @param string $filter
- * @param integer $limit
- * @param integer $offset
+ * @param string|string[] $attr
+ * @param int $limit
+ * @param int $offset
+ * @return array
*/
public function fetchListOfGroups($filter, $attr, $limit = null, $offset = null) {
return $this->fetchList($this->searchGroups($filter, $attr, $limit, $offset), (count($attr) > 1));
}
/**
- * @param boolean $manyAttributes
+ * @param array $list
+ * @param bool $manyAttributes
+ * @return array
*/
private function fetchList($list, $manyAttributes) {
if(is_array($list)) {
@@ -656,12 +670,12 @@ class Access extends LDAPUtility {
}
/**
- * @brief executes an LDAP search, optimized for Users
- * @param $filter the LDAP filter for the search
- * @param $attr optional, when a certain attribute shall be filtered out
+ * executes an LDAP search, optimized for Users
+ * @param string $filter the LDAP filter for the search
+ * @param string|string[] $attr optional, when a certain attribute shall be filtered out
* @param integer $limit
* @param integer $offset
- * @returns array with the search result
+ * @return array with the search result
*
* Executes an LDAP search
*/
@@ -671,18 +685,22 @@ class Access extends LDAPUtility {
/**
* @param string $filter
+ * @param string|string[] $attr
+ * @param int $limit
+ * @param int $offset
+ * @return false|int
*/
public function countUsers($filter, $attr = array('dn'), $limit = null, $offset = null) {
return $this->count($filter, $this->connection->ldapBaseUsers, $attr, $limit, $offset);
}
/**
- * @brief executes an LDAP search, optimized for Groups
+ * executes an LDAP search, optimized for Groups
* @param string $filter the LDAP filter for the search
- * @param $attr optional, when a certain attribute shall be filtered out
+ * @param string|string[] $attr optional, when a certain attribute shall be filtered out
* @param integer $limit
* @param integer $offset
- * @returns array with the search result
+ * @return array with the search result
*
* Executes an LDAP search
*/
@@ -691,14 +709,14 @@ class Access extends LDAPUtility {
}
/**
- * @brief prepares and executes an LDAP search operation
- * @param $filter the LDAP filter for the search
- * @param $base an array containing the LDAP subtree(s) that shall be searched
- * @param $attr optional, array, one or more attributes that shall be
+ * prepares and executes an LDAP search operation
+ * @param string $filter the LDAP filter for the search
+ * @param array $base an array containing the LDAP subtree(s) that shall be searched
+ * @param string|string[] $attr optional, array, one or more attributes that shall be
* retrieved. Results will according to the order in the array.
- * @param $limit optional, maximum results to be counted
- * @param $offset optional, a starting point
- * @returns array with the search result as first value and pagedSearchOK as
+ * @param int $limit optional, maximum results to be counted
+ * @param int $offset optional, a starting point
+ * @return array|false array with the search result as first value and pagedSearchOK as
* second | false if not successful
*/
private function executeSearch($filter, $base, &$attr = null, $limit = null, $offset = null) {
@@ -715,7 +733,7 @@ class Access extends LDAPUtility {
return false;
}
- //check wether paged search should be attempted
+ //check whether paged search should be attempted
$pagedSearchOK = $this->initPagedSearch($filter, $base, $attr, $limit, $offset);
$linkResources = array_pad(array(), count($base), $cr);
@@ -737,17 +755,17 @@ class Access extends LDAPUtility {
}
/**
- * @brief processes an LDAP paged search operation
- * @param $sr the array containing the LDAP search resources
- * @param $filter the LDAP filter for the search
- * @param $base an array containing the LDAP subtree(s) that shall be searched
- * @param $iFoundItems number of results in the search operation
- * @param $limit maximum results to be counted
- * @param $offset a starting point
- * @param $pagedSearchOK whether a paged search has been executed
- * @param boolean $skipHandling required for paged search when cookies to
+ * processes an LDAP paged search operation
+ * @param array $sr the array containing the LDAP search resources
+ * @param string $filter the LDAP filter for the search
+ * @param array $base an array containing the LDAP subtree(s) that shall be searched
+ * @param int $iFoundItems number of results in the search operation
+ * @param int $limit maximum results to be counted
+ * @param int $offset a starting point
+ * @param bool $pagedSearchOK whether a paged search has been executed
+ * @param bool $skipHandling required for paged search when cookies to
* prior results need to be gained
- * @returns array with the search result as first value and pagedSearchOK as
+ * @return array|false array with the search result as first value and pagedSearchOK as
* second | false if not successful
*/
private function processPagedSearchStatus($sr, $filter, $base, $iFoundItems, $limit, $offset, $pagedSearchOK, $skipHandling) {
@@ -778,16 +796,16 @@ class Access extends LDAPUtility {
}
/**
- * @brief executes an LDAP search, but counts the results only
+ * executes an LDAP search, but counts the results only
* @param string $filter the LDAP filter for the search
- * @param $base an array containing the LDAP subtree(s) that shall be searched
- * @param $attr optional, array, one or more attributes that shall be
+ * @param array $base an array containing the LDAP subtree(s) that shall be searched
+ * @param string|string[] $attr optional, array, one or more attributes that shall be
* retrieved. Results will according to the order in the array.
- * @param $limit optional, maximum results to be counted
- * @param $offset optional, a starting point
- * @param $skipHandling indicates whether the pages search operation is
+ * @param int $limit optional, maximum results to be counted
+ * @param int $offset optional, a starting point
+ * @param bool $skipHandling indicates whether the pages search operation is
* completed
- * @returns int | false if the search could not be initialized
+ * @return int|false Integer or false if the search could not be initialized
*
*/
private function count($filter, $base, $attr = null, $limit = null, $offset = null, $skipHandling = false) {
@@ -799,7 +817,7 @@ class Access extends LDAPUtility {
$counter = 0;
$count = null;
- $cr = $this->connection->getConnectionResource();
+ $this->connection->getConnectionResource();
do {
$continue = false;
@@ -821,10 +839,15 @@ class Access extends LDAPUtility {
return $counter;
}
- private function countEntriesInSearchResults($searchResults, $limit,
- &$hasHitLimit) {
+ /**
+ * @param array $searchResults
+ * @param int $limit
+ * @param bool $hasHitLimit
+ * @return int
+ */
+ private function countEntriesInSearchResults($searchResults, $limit, &$hasHitLimit) {
$cr = $this->connection->getConnectionResource();
- $count = 0;
+ $counter = 0;
foreach($searchResults as $res) {
$count = intval($this->ldap->countEntries($cr, $res));
@@ -838,14 +861,14 @@ class Access extends LDAPUtility {
}
/**
- * @brief executes an LDAP search
- * @param $filter the LDAP filter for the search
- * @param $base an array containing the LDAP subtree(s) that shall be searched
- * @param $attr optional, array, one or more attributes that shall be
- * retrieved. Results will according to the order in the array.
- * @returns array with the search result
- *
* Executes an LDAP search
+ * @param string $filter the LDAP filter for the search
+ * @param array $base an array containing the LDAP subtree(s) that shall be searched
+ * @param string|string[] $attr optional, array, one or more attributes that shall be
+ * @param int $limit
+ * @param int $offset
+ * @param bool $skipHandling
+ * @return array with the search result
*/
private function search($filter, $base, $attr = null, $limit = null, $offset = null, $skipHandling = false) {
$search = $this->executeSearch($filter, $base, $attr, $limit, $offset);
@@ -873,8 +896,8 @@ class Access extends LDAPUtility {
}
$findings = array();
- foreach($sr as $key => $res) {
- $findings = array_merge($findings, $this->ldap->getEntries($cr , $res ));
+ foreach($sr as $res) {
+ $findings = array_merge($findings, $this->ldap->getEntries($cr , $res ));
}
$this->processPagedSearchStatus($sr, $filter, $base, $findings['count'],
@@ -889,9 +912,9 @@ class Access extends LDAPUtility {
if(!is_null($attr)) {
$selection = array();
- $multiarray = false;
+ $multiArray = false;
if(count($attr) > 1) {
- $multiarray = true;
+ $multiArray = true;
$i = 0;
}
foreach($findings as $item) {
@@ -900,7 +923,7 @@ class Access extends LDAPUtility {
}
$item = \OCP\Util::mb_array_change_key_case($item, MB_CASE_LOWER, 'UTF-8');
- if($multiarray) {
+ if($multiArray) {
foreach($attr as $key) {
$key = mb_strtolower($key, 'UTF-8');
if(isset($item[$key])) {
@@ -931,7 +954,7 @@ class Access extends LDAPUtility {
$findings = $selection;
}
//we slice the findings, when
- //a) paged search insuccessful, though attempted
+ //a) paged search unsuccessful, though attempted
//b) no paged search, but limit set
if((!$this->getPagedSearchResultState()
&& $pagedSearchOK)
@@ -945,28 +968,32 @@ class Access extends LDAPUtility {
return $findings;
}
+ /**
+ * @param string $name
+ * @return bool|mixed|string
+ */
public function sanitizeUsername($name) {
if($this->connection->ldapIgnoreNamingRules) {
return $name;
}
- // Translitaration
- //latin characters to ASCII
+ // Transliteration
+ // latin characters to ASCII
$name = iconv('UTF-8', 'ASCII//TRANSLIT', $name);
- //REPLACEMENTS
+ // Replacements
$name = \OCP\Util::mb_str_replace(' ', '_', $name, 'UTF-8');
- //every remaining unallowed characters will be removed
+ // Every remaining disallowed characters will be removed
$name = preg_replace('/[^a-zA-Z0-9_.@-]/u', '', $name);
return $name;
}
/**
- * @brief escapes (user provided) parts for LDAP filter
+ * escapes (user provided) parts for LDAP filter
* @param string $input, the provided value
- * @return the escaped string
+ * @return string the escaped string
*/
public function escapeFilterPart($input) {
$search = array('*', '\\', '(', ')');
@@ -975,49 +1002,43 @@ class Access extends LDAPUtility {
}
/**
- * @brief combines the input filters with AND
- * @param $filters array, the filters to connect
- * @returns the combined filter
- *
- * Combines Filter arguments with AND
+ * combines the input filters with AND
+ * @param string[] $filters the filters to connect
+ * @return string the combined filter
*/
public function combineFilterWithAnd($filters) {
return $this->combineFilter($filters, '&');
}
/**
- * @brief combines the input filters with AND
- * @param $filters array, the filters to connect
- * @returns the combined filter
- *
- * Combines Filter arguments with AND
+ * combines the input filters with AND
+ * @param string[] $filters the filters to connect
+ * @return string the combined filter
*/
public function combineFilterWithOr($filters) {
return $this->combineFilter($filters, '|');
}
/**
- * @brief combines the input filters with given operator
- * @param $filters array, the filters to connect
+ * combines the input filters with given operator
+ * @param string[] $filters the filters to connect
* @param string $operator either & or |
- * @returns the combined filter
- *
- * Combines Filter arguments with AND
+ * @return string the combined filter
*/
private function combineFilter($filters, $operator) {
$combinedFilter = '('.$operator;
foreach($filters as $filter) {
- if(!empty($filter) && $filter[0] !== '(') {
+ if(!empty($filter) && $filter[0] !== '(') {
$filter = '('.$filter.')';
- }
- $combinedFilter.=$filter;
+ }
+ $combinedFilter.=$filter;
}
$combinedFilter.=')';
return $combinedFilter;
}
/**
- * @brief creates a filter part for to perfrom search for users
+ * creates a filter part for to perform search for users
* @param string $search the search term
* @return string the final filter part to use in LDAP searches
*/
@@ -1028,7 +1049,7 @@ class Access extends LDAPUtility {
}
/**
- * @brief creates a filter part for to perfrom search for groups
+ * creates a filter part for to perform search for groups
* @param string $search the search term
* @return string the final filter part to use in LDAP searches
*/
@@ -1039,11 +1060,12 @@ class Access extends LDAPUtility {
}
/**
- * @brief creates a filter part for searches
+ * creates a filter part for searches
* @param string $search the search term
+ * @param string[]|null $searchAttributes
* @param string $fallbackAttribute a fallback attribute in case the user
* did not define search attributes. Typically the display name attribute.
- * @returns string the final filter part to use in LDAP searches
+ * @return string the final filter part to use in LDAP searches
*/
private function getFilterPartForSearch($search, $searchAttributes, $fallbackAttribute) {
$filter = array();
@@ -1065,7 +1087,9 @@ class Access extends LDAPUtility {
}
/**
+ * @param string $name
* @param string $password
+ * @return bool
*/
public function areCredentialsValid($name, $password) {
$name = $this->DNasBaseParameter($name);
@@ -1083,10 +1107,11 @@ class Access extends LDAPUtility {
}
/**
- * @brief auto-detects the directory's UUID attribute
- * @param $dn a known DN used to check against
- * @param $force the detection should be run, even if it is not set to auto
- * @returns true on success, false otherwise
+ * auto-detects the directory's UUID attribute
+ * @param string $dn a known DN used to check against
+ * @param bool $isUser
+ * @param bool $force the detection should be run, even if it is not set to auto
+ * @return bool true on success, false otherwise
*/
private function detectUuidAttribute($dn, $isUser = true, $force = false) {
if($isUser) {
@@ -1106,7 +1131,7 @@ class Access extends LDAPUtility {
return true;
}
- //for now, supported attributes are entryUUID, nsuniqueid, objectGUID, ipaUniqueID
+ // for now, supported attributes are entryUUID, nsuniqueid, objectGUID, ipaUniqueID
$testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid', 'guid', 'ipauniqueid');
foreach($testAttributes as $attribute) {
@@ -1126,6 +1151,11 @@ class Access extends LDAPUtility {
return false;
}
+ /**
+ * @param string $dn
+ * @param bool $isUser
+ * @return array|bool|false
+ */
public function getUUID($dn, $isUser = true) {
if($isUser) {
$uuidAttr = 'ldapUuidUserAttribute';
@@ -1153,12 +1183,10 @@ class Access extends LDAPUtility {
}
/**
- * @brief converts a binary ObjectGUID into a string representation
- * @param $oguid the ObjectGUID in it's binary form as retrieved from AD
- * @returns String
- *
* converts a binary ObjectGUID into a string representation
- * http://www.php.net/manual/en/function.ldap-get-values-len.php#73198
+ * @param string $oguid the ObjectGUID in it's binary form as retrieved from AD
+ * @return string
+ * @link http://www.php.net/manual/en/function.ldap-get-values-len.php#73198
*/
private function convertObjectGUID2Str($oguid) {
$hex_guid = bin2hex($oguid);
@@ -1181,25 +1209,24 @@ class Access extends LDAPUtility {
}
/**
- * @brief converts a stored DN so it can be used as base parameter for LDAP queries
- * @param $dn the DN
- * @returns String
- *
- * converts a stored DN so it can be used as base parameter for LDAP queries
- * internally we store them for usage in LDAP filters
+ * converts a stored DN so it can be used as base parameter for LDAP queries, internally we store them for usage in LDAP filters
+ * @param string $dn the DN
+ * @return string
*/
private function DNasBaseParameter($dn) {
return str_ireplace('\\5c', '\\', $dn);
}
/**
- * @brief checks if the given DN is part of the given base DN(s)
- * @param $dn the DN
- * @param $bases array containing the allowed base DN or DNs
- * @returns Boolean
+ * checks if the given DN is part of the given base DN(s)
+ * @param string $dn the DN
+ * @param string[] $bases array containing the allowed base DN or DNs
+ * @return bool
*/
private function isDNPartOfBase($dn, $bases) {
+ $belongsToBase = false;
$bases = $this->sanitizeDN($bases);
+
foreach($bases as $base) {
$belongsToBase = true;
if(mb_strripos($dn, $base, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($base, 'UTF-8'))) {
@@ -1213,12 +1240,12 @@ class Access extends LDAPUtility {
}
/**
- * @brief get a cookie for the next LDAP paged search
- * @param $base a string with the base DN for the search
- * @param $filter the search filter to identify the correct search
- * @param $limit the limit (or 'pageSize'), to identify the correct search well
- * @param $offset the offset for the new search to identify the correct search really good
- * @returns string containing the key or empty if none is cached
+ * get a cookie for the next LDAP paged search
+ * @param string $base a string with the base DN for the search
+ * @param string $filter the search filter to identify the correct search
+ * @param int $limit the limit (or 'pageSize'), to identify the correct search well
+ * @param int $offset the offset for the new search to identify the correct search really good
+ * @return string containing the key or empty if none is cached
*/
private function getPagedResultCookie($base, $filter, $limit, $offset) {
if($offset === 0) {
@@ -1226,10 +1253,10 @@ class Access extends LDAPUtility {
}
$offset -= $limit;
//we work with cache here
- $cachekey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' . intval($limit) . '-' . intval($offset);
+ $cacheKey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' . intval($limit) . '-' . intval($offset);
$cookie = '';
- if(isset($this->cookies[$cachekey])) {
- $cookie = $this->cookies[$cachekey];
+ if(isset($this->cookies[$cacheKey])) {
+ $cookie = $this->cookies[$cacheKey];
if(is_null($cookie)) {
$cookie = '';
}
@@ -1238,23 +1265,23 @@ class Access extends LDAPUtility {
}
/**
- * @brief set a cookie for LDAP paged search run
- * @param $base a string with the base DN for the search
- * @param $filter the search filter to identify the correct search
- * @param $limit the limit (or 'pageSize'), to identify the correct search well
- * @param $offset the offset for the run search to identify the correct search really good
- * @param $cookie string containing the cookie returned by ldap_control_paged_result_response
+ * set a cookie for LDAP paged search run
+ * @param string $base a string with the base DN for the search
+ * @param string $filter the search filter to identify the correct search
+ * @param int $limit the limit (or 'pageSize'), to identify the correct search well
+ * @param int $offset the offset for the run search to identify the correct search really good
+ * @param string $cookie string containing the cookie returned by ldap_control_paged_result_response
* @return void
*/
private function setPagedResultCookie($base, $filter, $limit, $offset, $cookie) {
if(!empty($cookie)) {
- $cachekey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' .intval($limit) . '-' . intval($offset);
- $this->cookies[$cachekey] = $cookie;
+ $cacheKey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' .intval($limit) . '-' . intval($offset);
+ $this->cookies[$cacheKey] = $cookie;
}
}
/**
- * @brief check wether the most recent paged search was successful. It flushed the state var. Use it always after a possible paged search.
+ * Check whether the most recent paged search was successful. It flushed the state var. Use it always after a possible paged search.
* @return boolean|null true on success, null or false otherwise
*/
public function getPagedSearchResultState() {
@@ -1263,15 +1290,14 @@ class Access extends LDAPUtility {
return $result;
}
-
/**
- * @brief prepares a paged search, if possible
- * @param $filter the LDAP filter for the search
- * @param $bases an array containing the LDAP subtree(s) that shall be searched
- * @param $attr optional, when a certain attribute shall be filtered outside
- * @param $limit
- * @param $offset
- *
+ * Prepares a paged search, if possible
+ * @param string $filter the LDAP filter for the search
+ * @param string[] $bases an array containing the LDAP subtree(s) that shall be searched
+ * @param string[] $attr optional, when a certain attribute shall be filtered outside
+ * @param int $limit
+ * @param int $offset
+ * @return bool|true
*/
private function initPagedSearch($filter, $bases, $attr, $limit, $offset) {
$pagedSearchOK = false;
@@ -1287,8 +1313,9 @@ class Access extends LDAPUtility {
$cookie = $this->getPagedResultCookie($base, $filter, $limit, $offset);
if(empty($cookie) && ($offset > 0)) {
// no cookie known, although the offset is not 0. Maybe cache run out. We need
- // to start all over *sigh* (btw, Dear Reader, did you need LDAP paged
+ // to start all over *sigh* (btw, Dear Reader, did you know LDAP paged
// searching was designed by MSFT?)
+ // Lukas: No, but thanks to reading that source I finally know!
$reOffset = ($offset - $limit) < 0 ? 0 : $offset - $limit;
//a bit recursive, $offset of 0 is the exit
\OCP\Util::writeLog('user_ldap', 'Looking for cookie L/O '.$limit.'/'.$reOffset, \OCP\Util::INFO);
diff --git a/apps/user_ldap/lib/backendutility.php b/apps/user_ldap/lib/backendutility.php
index 815757a1a11682bb360bbb923348fe7331662d45..c94366ce0192431f6c50eedce6c7c175417b6a63 100644
--- a/apps/user_ldap/lib/backendutility.php
+++ b/apps/user_ldap/lib/backendutility.php
@@ -29,8 +29,8 @@ abstract class BackendUtility {
protected $access;
/**
- * @brief constructor, make sure the subclasses call this one!
- * @param $access an instance of Access for LDAP interaction
+ * constructor, make sure the subclasses call this one!
+ * @param Access $access an instance of Access for LDAP interaction
*/
public function __construct(Access $access) {
$this->access = $access;
diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php
index c9ed1e648a230c07429737da0e9260167c50c3a8..9c455929b4a1784b88f895e5f14ee25672a3e082 100644
--- a/apps/user_ldap/lib/configuration.php
+++ b/apps/user_ldap/lib/configuration.php
@@ -82,35 +82,47 @@ class Configuration {
/**
* @param string $configPrefix
+ * @param bool $autoRead
*/
- public function __construct($configPrefix, $autoread = true) {
+ public function __construct($configPrefix, $autoRead = true) {
$this->configPrefix = $configPrefix;
- if($autoread) {
+ if($autoRead) {
$this->readConfiguration();
}
}
+ /**
+ * @param string $name
+ * @return mixed|void
+ */
public function __get($name) {
if(isset($this->config[$name])) {
return $this->config[$name];
}
}
+ /**
+ * @param string $name
+ * @param mixed $value
+ */
public function __set($name, $value) {
$this->setConfiguration(array($name => $value));
}
+ /**
+ * @return array
+ */
public function getConfiguration() {
return $this->config;
}
/**
- * @brief set LDAP configuration with values delivered by an array, not read
+ * set LDAP configuration with values delivered by an array, not read
* from configuration. It does not save the configuration! To do so, you
* must call saveConfiguration afterwards.
- * @param $config array that holds the config parameters in an associated
+ * @param array $config array that holds the config parameters in an associated
* array
- * @param &$applied optional; array where the set fields will be given to
+ * @param array &$applied optional; array where the set fields will be given to
* @return false|null
*/
public function setConfiguration($config, &$applied = null) {
@@ -119,11 +131,11 @@ class Configuration {
}
$cta = $this->getConfigTranslationArray();
- foreach($config as $inputkey => $val) {
- if(strpos($inputkey, '_') !== false && array_key_exists($inputkey, $cta)) {
- $key = $cta[$inputkey];
- } elseif(array_key_exists($inputkey, $this->config)) {
- $key = $inputkey;
+ foreach($config as $inputKey => $val) {
+ if(strpos($inputKey, '_') !== false && array_key_exists($inputKey, $cta)) {
+ $key = $cta[$inputKey];
+ } elseif(array_key_exists($inputKey, $this->config)) {
+ $key = $inputKey;
} else {
continue;
}
@@ -150,7 +162,7 @@ class Configuration {
}
$this->$setMethod($key, $val);
if(is_array($applied)) {
- $applied[] = $inputkey;
+ $applied[] = $inputKey;
}
}
@@ -164,7 +176,7 @@ class Configuration {
//some are determined
continue;
}
- $dbkey = $cta[$key];
+ $dbKey = $cta[$key];
switch($key) {
case 'ldapBase':
case 'ldapBaseUsers':
@@ -180,7 +192,7 @@ class Configuration {
break;
case 'ldapIgnoreNamingRules':
$readMethod = 'getSystemValue';
- $dbkey = $key;
+ $dbKey = $key;
break;
case 'ldapAgentPassword':
$readMethod = 'getPwd';
@@ -193,14 +205,14 @@ class Configuration {
$readMethod = 'getValue';
break;
}
- $this->config[$key] = $this->$readMethod($dbkey);
+ $this->config[$key] = $this->$readMethod($dbKey);
}
$this->configRead = true;
}
}
/**
- * @brief saves the current Configuration in the database
+ * saves the current Configuration in the database
*/
public function saveConfiguration() {
$cta = array_flip($this->getConfigTranslationArray());
@@ -237,8 +249,12 @@ class Configuration {
}
}
- protected function getMultiLine($varname) {
- $value = $this->getValue($varname);
+ /**
+ * @param string $varName
+ * @return array|string
+ */
+ protected function getMultiLine($varName) {
+ $value = $this->getValue($varName);
if(empty($value)) {
$value = '';
} else {
@@ -248,7 +264,11 @@ class Configuration {
return $value;
}
- protected function setMultiLine($varname, $value) {
+ /**
+ * @param string $varName
+ * @param array|string $value
+ */
+ protected function setMultiLine($varName, $value) {
if(empty($value)) {
$value = '';
} else if (!is_array($value)) {
@@ -258,44 +278,69 @@ class Configuration {
}
}
- $this->setValue($varname, $value);
+ $this->setValue($varName, $value);
}
- protected function getPwd($varname) {
- return base64_decode($this->getValue($varname));
+ /**
+ * @param string $varName
+ * @return string
+ */
+ protected function getPwd($varName) {
+ return base64_decode($this->getValue($varName));
}
- protected function getLcValue($varname) {
- return mb_strtolower($this->getValue($varname), 'UTF-8');
+ /**
+ * @param string $varName
+ * @return string
+ */
+ protected function getLcValue($varName) {
+ return mb_strtolower($this->getValue($varName), 'UTF-8');
}
- protected function getSystemValue($varname) {
+ /**
+ * @param string $varName
+ * @return string
+ */
+ protected function getSystemValue($varName) {
//FIXME: if another system value is added, softcode the default value
- return \OCP\Config::getSystemValue($varname, false);
+ return \OCP\Config::getSystemValue($varName, false);
}
- protected function getValue($varname) {
+ /**
+ * @param string $varName
+ * @return string
+ */
+ protected function getValue($varName) {
static $defaults;
if(is_null($defaults)) {
$defaults = $this->getDefaults();
}
return \OCP\Config::getAppValue('user_ldap',
- $this->configPrefix.$varname,
- $defaults[$varname]);
+ $this->configPrefix.$varName,
+ $defaults[$varName]);
}
- protected function setValue($varname, $value) {
- $this->config[$varname] = $value;
+ /**
+ * @param string $varName
+ * @param mixed $value
+ */
+ protected function setValue($varName, $value) {
+ $this->config[$varName] = $value;
}
- protected function saveValue($varname, $value) {
+ /**
+ * @param string $varName
+ * @param string $value
+ * @return bool
+ */
+ protected function saveValue($varName, $value) {
return \OCP\Config::setAppValue('user_ldap',
- $this->configPrefix.$varname,
+ $this->configPrefix.$varName,
$value);
}
/**
- * @returns an associative array with the default values. Keys are correspond
+ * @return array an associative array with the default values. Keys are correspond
* to config-value entries in the database table
*/
public function getDefaults() {
@@ -350,7 +395,7 @@ class Configuration {
}
/**
- * @return returns an array that maps internal variable names to database fields
+ * @return array that maps internal variable names to database fields
*/
public function getConfigTranslationArray() {
//TODO: merge them into one representation
@@ -403,4 +448,4 @@ class Configuration {
return $array;
}
-}
\ No newline at end of file
+}
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 173c4ebcc2347008227b8a3ae6835da060304425..52f6c5ceb10387de497bd4fcdcb4326153169655 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -42,9 +42,10 @@ class Connection extends LDAPUtility {
protected $doNotValidate = false;
/**
- * @brief Constructor
- * @param $configPrefix a string with the prefix for the configkey column (appconfig table)
- * @param $configID a string with the value for the appid column (appconfig table) or null for on-the-fly connections
+ * Constructor
+ * @param ILDAPWrapper $ldap
+ * @param string $configPrefix a string with the prefix for the configkey column (appconfig table)
+ * @param string $configID a string with the value for the appid column (appconfig table) or null for on-the-fly connections
*/
public function __construct(ILDAPWrapper $ldap, $configPrefix = '', $configID = 'user_ldap') {
parent::__construct($ldap);
@@ -56,7 +57,7 @@ class Connection extends LDAPUtility {
if($memcache->isAvailable()) {
$this->cache = $memcache->create();
} else {
- $this->cache = \OC_Cache::getGlobalCache();
+ $this->cache = \OC\Cache::getGlobalCache();
}
$this->hasPagedResultSupport =
$this->ldap->hasPagedResultSupport();
@@ -72,7 +73,7 @@ class Connection extends LDAPUtility {
}
/**
- * @brief defines behaviour when the instance is cloned
+ * defines behaviour when the instance is cloned
*/
public function __clone() {
//a cloned instance inherits the connection resource. It may use it,
@@ -82,6 +83,10 @@ class Connection extends LDAPUtility {
!is_null($this->configID));
}
+ /**
+ * @param string $name
+ * @return bool|mixed|void
+ */
public function __get($name) {
if(!$this->configured) {
$this->readConfiguration();
@@ -94,6 +99,10 @@ class Connection extends LDAPUtility {
return $this->configuration->$name;
}
+ /**
+ * @param string $name
+ * @param mixed $value
+ */
public function __set($name, $value) {
$this->doNotValidate = false;
$before = $this->configuration->$name;
@@ -108,10 +117,8 @@ class Connection extends LDAPUtility {
}
/**
- * @brief initializes the LDAP backend
- * @param $force read the config settings no matter what
- *
* initializes the LDAP backend
+ * @param bool $force read the config settings no matter what
*/
public function init($force = false) {
$this->readConfiguration($force);
@@ -136,6 +143,7 @@ class Connection extends LDAPUtility {
/**
* @param string|null $key
+ * @return string
*/
private function getCacheKey($key) {
$prefix = 'LDAP-'.$this->configID.'-'.$this->configPrefix.'-';
@@ -147,6 +155,7 @@ class Connection extends LDAPUtility {
/**
* @param string $key
+ * @return mixed|null
*/
public function getFromCache($key) {
if(!$this->configured) {
@@ -166,6 +175,7 @@ class Connection extends LDAPUtility {
/**
* @param string $key
+ * @return bool
*/
public function isCached($key) {
if(!$this->configured) {
@@ -180,6 +190,7 @@ class Connection extends LDAPUtility {
/**
* @param string $key
+ * @param mixed $value
*/
public function writeToCache($key, $value) {
if(!$this->configured) {
@@ -199,8 +210,8 @@ class Connection extends LDAPUtility {
}
/**
- * @brief Caches the general LDAP configuration.
- * @param $force optional. true, if the re-read should be forced. defaults
+ * Caches the general LDAP configuration.
+ * @param bool $force optional. true, if the re-read should be forced. defaults
* to false.
* @return null
*/
@@ -212,9 +223,9 @@ class Connection extends LDAPUtility {
}
/**
- * @brief set LDAP configuration with values delivered by an array, not read from configuration
- * @param $config array that holds the config parameters in an associated array
- * @param &$setParameters optional; array where the set fields will be given to
+ * set LDAP configuration with values delivered by an array, not read from configuration
+ * @param array $config array that holds the config parameters in an associated array
+ * @param array &$setParameters optional; array where the set fields will be given to
* @return boolean true if config validates, false otherwise. Check with $setParameters for detailed success on single parameters
*/
public function setConfiguration($config, &$setParameters = null) {
@@ -232,7 +243,7 @@ class Connection extends LDAPUtility {
}
/**
- * @brief saves the current Configuration in the database and empties the
+ * saves the current Configuration in the database and empties the
* cache
* @return null
*/
@@ -242,7 +253,7 @@ class Connection extends LDAPUtility {
}
/**
- * @brief get the current LDAP configuration
+ * get the current LDAP configuration
* @return array
*/
public function getConfiguration() {
@@ -278,7 +289,7 @@ class Connection extends LDAPUtility {
private function doSoftValidation() {
//if User or Group Base are not set, take over Base DN setting
foreach(array('ldapBaseUsers', 'ldapBaseGroups') as $keyBase) {
- $val = $this->configuration->$keyBase;
+ $val = $this->configuration->$keyBase;
if(empty($val)) {
$obj = strpos('Users', $keyBase) !== false ? 'Users' : 'Groups';
\OCP\Util::writeLog('user_ldap',
@@ -326,9 +337,9 @@ class Connection extends LDAPUtility {
}
//make sure empty search attributes are saved as simple, empty array
- $sakeys = array('ldapAttributesForUserSearch',
+ $saKeys = array('ldapAttributesForUserSearch',
'ldapAttributesForGroupSearch');
- foreach($sakeys as $key) {
+ foreach($saKeys as $key) {
$val = $this->configuration->$key;
if(is_array($val) && count($val) === 1 && empty($val[0])) {
$this->configuration->$key = array();
@@ -345,6 +356,9 @@ class Connection extends LDAPUtility {
}
}
+ /**
+ * @return bool
+ */
private function doCriticalValidation() {
$configurationOK = true;
$errorStr = 'Configuration Error (prefix '.
@@ -419,8 +433,8 @@ class Connection extends LDAPUtility {
}
/**
- * @brief Validates the user specified configuration
- * @returns true if configuration seems OK, false otherwise
+ * Validates the user specified configuration
+ * @return bool true if configuration seems OK, false otherwise
*/
private function validateConfiguration() {
@@ -435,8 +449,8 @@ class Connection extends LDAPUtility {
// necessary, but advisable. If left empty, give an info message
$this->doSoftValidation();
- //second step: critical checks. If left empty or filled wrong, set as
- //unconfigured and give a warning.
+ //second step: critical checks. If left empty or filled wrong, mark as
+ //not configured and give a warning.
return $this->doCriticalValidation();
}
@@ -508,12 +522,17 @@ class Connection extends LDAPUtility {
}
}
+ /**
+ * @param string $host
+ * @param string $port
+ * @return false|void
+ */
private function doConnect($host, $port) {
if(empty($host)) {
return false;
}
if(strpos($host, '://') !== false) {
- //ldap_connect ignores port paramater when URLs are passed
+ //ldap_connect ignores port parameter when URLs are passed
$host .= ':' . $port;
}
$this->ldapConnectionRes = $this->ldap->connect($host, $port);
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index b5955cb2abba15e4cfcfbb6e47e16e2f28df40f4..37caedc6251f089b3498bb5b33fde582c86ab432 100644
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -26,8 +26,8 @@ namespace OCA\user_ldap\lib;
class Helper {
/**
- * @brief returns prefixes for each saved LDAP/AD server configuration.
- * @param bool optional, whether only active configuration shall be
+ * returns prefixes for each saved LDAP/AD server configuration.
+ * @param bool $activeConfigurations optional, whether only active configuration shall be
* retrieved, defaults to false
* @return array with a list of the available prefixes
*
@@ -79,8 +79,8 @@ class Helper {
/**
*
- * @brief determines the host for every configured connection
- * @return an array with configprefix as keys
+ * determines the host for every configured connection
+ * @return array an array with configprefix as keys
*
*/
static public function getServerConfigurationHosts() {
@@ -106,8 +106,8 @@ class Helper {
}
/**
- * @brief deletes a given saved LDAP/AD server configuration.
- * @param string the configuration prefix of the config to delete
+ * deletes a given saved LDAP/AD server configuration.
+ * @param string $prefix the configuration prefix of the config to delete
* @return bool true on success, false otherwise
*/
static public function deleteServerConfiguration($prefix) {
@@ -148,7 +148,7 @@ class Helper {
* Truncate's the given mapping table
*
* @param string $mapping either 'user' or 'group'
- * @return boolean true on success, false otherwise
+ * @return bool true on success, false otherwise
*/
static public function clearMapping($mapping) {
if($mapping === 'user') {
@@ -176,9 +176,9 @@ class Helper {
}
/**
- * @brief extractsthe domain from a given URL
- * @param $url the URL
- * @return mixed, domain as string on success, false otherwise
+ * extractsthe domain from a given URL
+ * @param string $url the URL
+ * @return string|false domain as string on success, false otherwise
*/
static public function getDomainFromURL($url) {
$uinfo = parse_url($url);
diff --git a/apps/user_ldap/lib/ildapwrapper.php b/apps/user_ldap/lib/ildapwrapper.php
index 017d5549690c7c2db5aae998b14f8a859f7e9b39..97ae08101163d8ffb1b64424d487b8c99d6f8083 100644
--- a/apps/user_ldap/lib/ildapwrapper.php
+++ b/apps/user_ldap/lib/ildapwrapper.php
@@ -28,178 +28,178 @@ interface ILDAPWrapper {
//LDAP functions in use
/**
- * @brief Bind to LDAP directory
+ * Bind to LDAP directory
* @param resource $link LDAP link resource
- * @param $dn an RDN to log in with
- * @param $password the password
- * @return true on success, false otherwise
+ * @param string $dn an RDN to log in with
+ * @param string $password the password
+ * @return bool true on success, false otherwise
*
* with $dn and $password as null a anonymous bind is attempted.
*/
public function bind($link, $dn, $password);
/**
- * @brief connect to an LDAP server
- * @param $host The host to connect to
- * @param $port The port to connect to
- * @return a link resource on success, otherwise false
+ * connect to an LDAP server
+ * @param string $host The host to connect to
+ * @param string $port The port to connect to
+ * @return mixed a link resource on success, otherwise false
*/
public function connect($host, $port);
/**
- * @brief Send LDAP pagination control
- * @param $link LDAP link resource
- * @param $pagesize number of results per page
- * @param boolean $isCritical Indicates whether the pagination is critical of not.
- * @param $cookie structure sent by LDAP server
- * @return true on success, false otherwise
+ * Send LDAP pagination control
+ * @param resource $link LDAP link resource
+ * @param int $pageSize number of results per page
+ * @param bool $isCritical Indicates whether the pagination is critical of not.
+ * @param array $cookie structure sent by LDAP server
+ * @return bool true on success, false otherwise
*/
- public function controlPagedResult($link, $pagesize, $isCritical, $cookie);
+ public function controlPagedResult($link, $pageSize, $isCritical, $cookie);
/**
- * @brief Retrieve the LDAP pagination cookie
- * @param $link LDAP link resource
- * @param $result LDAP result resource
- * @param $cookie structure sent by LDAP server
- * @return boolean on success, false otherwise
+ * Retrieve the LDAP pagination cookie
+ * @param resource $link LDAP link resource
+ * @param resource $result LDAP result resource
+ * @param string $cookie structure sent by LDAP server
+ * @return bool true on success, false otherwise
*
* Corresponds to ldap_control_paged_result_response
*/
public function controlPagedResultResponse($link, $result, &$cookie);
/**
- * @brief Count the number of entries in a search
- * @param $link LDAP link resource
- * @param $result LDAP result resource
- * @return mixed, number of results on success, false otherwise
+ * Count the number of entries in a search
+ * @param resource $link LDAP link resource
+ * @param resource $result LDAP result resource
+ * @return int|false number of results on success, false otherwise
*/
public function countEntries($link, $result);
/**
- * @brief Return the LDAP error number of the last LDAP command
- * @param $link LDAP link resource
- * @return error message as string
+ * Return the LDAP error number of the last LDAP command
+ * @param resource $link LDAP link resource
+ * @return string error message as string
*/
public function errno($link);
/**
- * @brief Return the LDAP error message of the last LDAP command
- * @param $link LDAP link resource
- * @return error code as integer
+ * Return the LDAP error message of the last LDAP command
+ * @param resource $link LDAP link resource
+ * @return int error code as integer
*/
public function error($link);
/**
- * @brief Return first result id
- * @param $link LDAP link resource
- * @param $result LDAP result resource
- * @return an LDAP search result resource
+ * Return first result id
+ * @param resource $link LDAP link resource
+ * @param resource $result LDAP result resource
+ * @return Resource an LDAP search result resource
* */
public function firstEntry($link, $result);
/**
- * @brief Get attributes from a search result entry
- * @param $link LDAP link resource
- * @param $result LDAP result resource
+ * Get attributes from a search result entry
+ * @param resource $link LDAP link resource
+ * @param resource $result LDAP result resource
* @return array containing the results, false on error
* */
public function getAttributes($link, $result);
/**
- * @brief Get the DN of a result entry
- * @param $link LDAP link resource
- * @param $result LDAP result resource
+ * Get the DN of a result entry
+ * @param resource $link LDAP link resource
+ * @param resource $result LDAP result resource
* @return string containing the DN, false on error
*/
public function getDN($link, $result);
/**
- * @brief Get all result entries
- * @param $link LDAP link resource
- * @param $result LDAP result resource
+ * Get all result entries
+ * @param resource $link LDAP link resource
+ * @param resource $result LDAP result resource
* @return array containing the results, false on error
*/
public function getEntries($link, $result);
/**
- * @brief Return next result id
- * @param $link LDAP link resource
+ * Return next result id
+ * @param resource $link LDAP link resource
* @param resource $result LDAP entry result resource
- * @return an LDAP search result resource
+ * @return resource an LDAP search result resource
* */
public function nextEntry($link, $result);
/**
- * @brief Read an entry
- * @param $link LDAP link resource
- * @param $baseDN The DN of the entry to read from
- * @param $filter An LDAP filter
- * @param $attr array of the attributes to read
- * @return an LDAP search result resource
+ * Read an entry
+ * @param resource $link LDAP link resource
+ * @param array $baseDN The DN of the entry to read from
+ * @param string $filter An LDAP filter
+ * @param array $attr array of the attributes to read
+ * @return resource an LDAP search result resource
*/
public function read($link, $baseDN, $filter, $attr);
/**
- * @brief Search LDAP tree
- * @param $link LDAP link resource
- * @param $baseDN The DN of the entry to read from
- * @param $filter An LDAP filter
- * @param $attr array of the attributes to read
- * @param $attrsonly optional, 1 if only attribute types shall be returned
- * @param $limit optional, limits the result entries
- * @return an LDAP search result resource, false on error
+ * Search LDAP tree
+ * @param resource $link LDAP link resource
+ * @param string $baseDN The DN of the entry to read from
+ * @param string $filter An LDAP filter
+ * @param array $attr array of the attributes to read
+ * @param int $attrsOnly optional, 1 if only attribute types shall be returned
+ * @param int $limit optional, limits the result entries
+ * @return resource|false an LDAP search result resource, false on error
*/
- public function search($link, $baseDN, $filter, $attr, $attrsonly = 0, $limit = 0);
+ public function search($link, $baseDN, $filter, $attr, $attrsOnly = 0, $limit = 0);
/**
- * @brief Sets the value of the specified option to be $value
- * @param $link LDAP link resource
- * @param $option a defined LDAP Server option
- * @param integer $value the new value for the option
- * @return true on success, false otherwise
+ * Sets the value of the specified option to be $value
+ * @param resource $link LDAP link resource
+ * @param string $option a defined LDAP Server option
+ * @param int $value the new value for the option
+ * @return bool true on success, false otherwise
*/
public function setOption($link, $option, $value);
/**
- * @brief establish Start TLS
- * @param $link LDAP link resource
- * @return true on success, false otherwise
+ * establish Start TLS
+ * @param resource $link LDAP link resource
+ * @return bool true on success, false otherwise
*/
public function startTls($link);
/**
- * @brief Sort the result of a LDAP search
- * @param $link LDAP link resource
- * @param $result LDAP result resource
- * @param $sortfilter attribute to use a key in sort
+ * Sort the result of a LDAP search
+ * @param resource $link LDAP link resource
+ * @param resource $result LDAP result resource
+ * @param string $sortFilter attribute to use a key in sort
*/
- public function sort($link, $result, $sortfilter);
+ public function sort($link, $result, $sortFilter);
/**
- * @brief Unbind from LDAP directory
+ * Unbind from LDAP directory
* @param resource $link LDAP link resource
- * @return true on success, false otherwise
+ * @return bool true on success, false otherwise
*/
public function unbind($link);
- //additional required methods in owncloud
+ //additional required methods in ownCloud
/**
- * @brief Checks whether the server supports LDAP
- * @return boolean if it the case, false otherwise
+ * Checks whether the server supports LDAP
+ * @return bool true if it the case, false otherwise
* */
public function areLDAPFunctionsAvailable();
/**
- * @brief Checks whether PHP supports LDAP Paged Results
- * @return boolean if it the case, false otherwise
+ * Checks whether PHP supports LDAP Paged Results
+ * @return bool true if it the case, false otherwise
* */
public function hasPagedResultSupport();
/**
- * @brief Checks whether the submitted parameter is a resource
- * @param $resource the resource variable to check
- * @return boolean if it is a resource, false otherwise
+ * Checks whether the submitted parameter is a resource
+ * @param resource $resource the resource variable to check
+ * @return bool true if it is a resource, false otherwise
*/
public function isResource($resource);
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index 9b108da63310e3167a2db642fa295f6b3730ed18..19c041e4db40d1affe4de037cf471d7f8bf8af6d 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -33,6 +33,9 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
$this->interval = self::getRefreshInterval();
}
+ /**
+ * @param mixed $argument
+ */
public function run($argument){
Jobs::updateGroups();
}
@@ -57,11 +60,17 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Finished.', \OCP\Util::DEBUG);
}
+ /**
+ * @return int
+ */
static private function getRefreshInterval() {
//defaults to every hour
return \OCP\Config::getAppValue('user_ldap', 'bgjRefreshInterval', 3600);
}
+ /**
+ * @param string[] $groups
+ */
static private function handleKnownGroups($groups) {
\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Dealing with known Groups.', \OCP\Util::DEBUG);
$query = \OCP\DB::prepare('
@@ -71,32 +80,35 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
');
foreach($groups as $group) {
//we assume, that self::$groupsFromDB has been retrieved already
- $knownUsers = unserialize(self::$groupsFromDB[$group]['owncloudusers']);
- $actualUsers = self::getGroupBE()->usersInGroup($group);
- $hasChanged = false;
- foreach(array_diff($knownUsers, $actualUsers) as $removedUser) {
- \OCP\Util::emitHook('OC_User', 'post_removeFromGroup', array('uid' => $removedUser, 'gid' => $group));
- \OCP\Util::writeLog('user_ldap',
+ $knownUsers = unserialize(self::$groupsFromDB[$group]['owncloudusers']);
+ $actualUsers = self::getGroupBE()->usersInGroup($group);
+ $hasChanged = false;
+ foreach(array_diff($knownUsers, $actualUsers) as $removedUser) {
+ \OCP\Util::emitHook('OC_User', 'post_removeFromGroup', array('uid' => $removedUser, 'gid' => $group));
+ \OCP\Util::writeLog('user_ldap',
'bgJ "updateGroups" – "'.$removedUser.'" removed from "'.$group.'".',
\OCP\Util::INFO);
- $hasChanged = true;
- }
- foreach(array_diff($actualUsers, $knownUsers) as $addedUser) {
- \OCP\Util::emitHook('OC_User', 'post_addToGroup', array('uid' => $addedUser, 'gid' => $group));
- \OCP\Util::writeLog('user_ldap',
+ $hasChanged = true;
+ }
+ foreach(array_diff($actualUsers, $knownUsers) as $addedUser) {
+ \OCP\Util::emitHook('OC_User', 'post_addToGroup', array('uid' => $addedUser, 'gid' => $group));
+ \OCP\Util::writeLog('user_ldap',
'bgJ "updateGroups" – "'.$addedUser.'" added to "'.$group.'".',
\OCP\Util::INFO);
- $hasChanged = true;
- }
- if($hasChanged) {
+ $hasChanged = true;
+ }
+ if($hasChanged) {
$query->execute(array(serialize($actualUsers), $group));
- }
+ }
}
\OCP\Util::writeLog('user_ldap',
'bgJ "updateGroups" – FINISHED dealing with known Groups.',
\OCP\Util::DEBUG);
}
+ /**
+ * @param string[] $createdGroups
+ */
static private function handleCreatedGroups($createdGroups) {
\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with created Groups.', \OCP\Util::DEBUG);
$query = \OCP\DB::prepare('
@@ -109,13 +121,16 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
'bgJ "updateGroups" – new group "'.$createdGroup.'" found.',
\OCP\Util::INFO);
$users = serialize(self::getGroupBE()->usersInGroup($createdGroup));
- $query->execute(array($createdGroup, $users));
+ $query->execute(array($createdGroup, $users));
}
\OCP\Util::writeLog('user_ldap',
'bgJ "updateGroups" – FINISHED dealing with created Groups.',
\OCP\Util::DEBUG);
}
+ /**
+ * @param string[] $removedGroups
+ */
static private function handleRemovedGroups($removedGroups) {
\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with removed groups.', \OCP\Util::DEBUG);
$query = \OCP\DB::prepare('
@@ -127,13 +142,16 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
\OCP\Util::writeLog('user_ldap',
'bgJ "updateGroups" – group "'.$removedGroup.'" was removed.',
\OCP\Util::INFO);
- $query->execute(array($removedGroup));
+ $query->execute(array($removedGroup));
}
\OCP\Util::writeLog('user_ldap',
'bgJ "updateGroups" – FINISHED dealing with removed groups.',
\OCP\Util::DEBUG);
}
+ /**
+ * @return \OCA\user_ldap\GROUP_LDAP|\OCA\user_ldap\Group_Proxy
+ */
static private function getGroupBE() {
if(!is_null(self::$groupBE)) {
return self::$groupBE;
@@ -152,6 +170,9 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
return self::$groupBE;
}
+ /**
+ * @return array
+ */
static private function getKnownGroups() {
if(is_array(self::$groupsFromDB)) {
return self::$groupsFromDB;
@@ -163,7 +184,7 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
$result = $query->execute()->fetchAll();
self::$groupsFromDB = array();
foreach($result as $dataset) {
- self::$groupsFromDB[$dataset['owncloudname']] = $dataset;
+ self::$groupsFromDB[$dataset['owncloudname']] = $dataset;
}
return self::$groupsFromDB;
diff --git a/apps/user_ldap/lib/ldap.php b/apps/user_ldap/lib/ldap.php
index d1ca91045b2de06a7185d2b2296203f3d7f8ebf5..2b20b2ab7386c2bda3e6904f17cdd6689f8f1bb7 100644
--- a/apps/user_ldap/lib/ldap.php
+++ b/apps/user_ldap/lib/ldap.php
@@ -27,14 +27,31 @@ class LDAP implements ILDAPWrapper {
protected $curFunc = '';
protected $curArgs = array();
+ /**
+ * @param resource $link
+ * @param string $dn
+ * @param string $password
+ * @return bool|mixed
+ */
public function bind($link, $dn, $password) {
return $this->invokeLDAPMethod('bind', $link, $dn, $password);
}
+ /**
+ * @param string $host
+ * @param string $port
+ * @return mixed
+ */
public function connect($host, $port) {
return $this->invokeLDAPMethod('connect', $host, $port);
}
+ /**
+ * @param LDAP $link
+ * @param LDAP $result
+ * @param string $cookie
+ * @return bool|LDAP
+ */
public function controlPagedResultResponse($link, $result, &$cookie) {
$this->preFunctionCall('ldap_control_paged_result_response',
array($link, $result, $cookie));
@@ -44,70 +61,150 @@ class LDAP implements ILDAPWrapper {
return $result;
}
- public function controlPagedResult($link, $pagesize, $isCritical, $cookie) {
- return $this->invokeLDAPMethod('control_paged_result', $link, $pagesize,
+ /**
+ * @param LDAP $link
+ * @param int $pageSize
+ * @param bool $isCritical
+ * @param string $cookie
+ * @return mixed|true
+ */
+ public function controlPagedResult($link, $pageSize, $isCritical, $cookie) {
+ return $this->invokeLDAPMethod('control_paged_result', $link, $pageSize,
$isCritical, $cookie);
}
+ /**
+ * @param LDAP $link
+ * @param LDAP $result
+ * @return mixed
+ */
public function countEntries($link, $result) {
return $this->invokeLDAPMethod('count_entries', $link, $result);
}
+ /**
+ * @param LDAP $link
+ * @return mixed|string
+ */
public function errno($link) {
return $this->invokeLDAPMethod('errno', $link);
}
+ /**
+ * @param LDAP $link
+ * @return int|mixed
+ */
public function error($link) {
return $this->invokeLDAPMethod('error', $link);
}
+ /**
+ * @param LDAP $link
+ * @param LDAP $result
+ * @return mixed
+ */
public function firstEntry($link, $result) {
return $this->invokeLDAPMethod('first_entry', $link, $result);
}
+ /**
+ * @param LDAP $link
+ * @param LDAP $result
+ * @return array|mixed
+ */
public function getAttributes($link, $result) {
return $this->invokeLDAPMethod('get_attributes', $link, $result);
}
+ /**
+ * @param LDAP $link
+ * @param LDAP $result
+ * @return mixed|string
+ */
public function getDN($link, $result) {
return $this->invokeLDAPMethod('get_dn', $link, $result);
}
+ /**
+ * @param LDAP $link
+ * @param LDAP $result
+ * @return array|mixed
+ */
public function getEntries($link, $result) {
return $this->invokeLDAPMethod('get_entries', $link, $result);
}
+ /**
+ * @param LDAP $link
+ * @param resource $result
+ * @return mixed|an
+ */
public function nextEntry($link, $result) {
return $this->invokeLDAPMethod('next_entry', $link, $result);
}
+ /**
+ * @param LDAP $link
+ * @param string $baseDN
+ * @param string $filter
+ * @param array $attr
+ * @return mixed
+ */
public function read($link, $baseDN, $filter, $attr) {
return $this->invokeLDAPMethod('read', $link, $baseDN, $filter, $attr);
}
- public function search($link, $baseDN, $filter, $attr, $attrsonly = 0, $limit = 0) {
- return $this->invokeLDAPMethod('search', $link, $baseDN, $filter,
- $attr, $attrsonly, $limit);
+ /**
+ * @param LDAP $link
+ * @param string $baseDN
+ * @param string $filter
+ * @param array $attr
+ * @param int $attrsOnly
+ * @param int $limit
+ * @return mixed
+ */
+ public function search($link, $baseDN, $filter, $attr, $attrsOnly = 0, $limit = 0) {
+ return $this->invokeLDAPMethod('search', $link, $baseDN, $filter, $attr, $attrsOnly, $limit);
}
+ /**
+ * @param LDAP $link
+ * @param string $option
+ * @param int $value
+ * @return bool|mixed
+ */
public function setOption($link, $option, $value) {
return $this->invokeLDAPMethod('set_option', $link, $option, $value);
}
- public function sort($link, $result, $sortfilter) {
- return $this->invokeLDAPMethod('sort', $link, $result, $sortfilter);
+ /**
+ * @param LDAP $link
+ * @param LDAP $result
+ * @param string $sortFilter
+ * @return mixed
+ */
+ public function sort($link, $result, $sortFilter) {
+ return $this->invokeLDAPMethod('sort', $link, $result, $sortFilter);
}
+ /**
+ * @param LDAP $link
+ * @return mixed|true
+ */
public function startTls($link) {
return $this->invokeLDAPMethod('start_tls', $link);
}
+ /**
+ * @param resource $link
+ * @return bool|mixed
+ */
public function unbind($link) {
return $this->invokeLDAPMethod('unbind', $link);
}
/**
- * @brief Checks whether the server supports LDAP
+ * Checks whether the server supports LDAP
* @return boolean if it the case, false otherwise
* */
public function areLDAPFunctionsAvailable() {
@@ -115,7 +212,7 @@ class LDAP implements ILDAPWrapper {
}
/**
- * @brief Checks whether PHP supports LDAP Paged Results
+ * Checks whether PHP supports LDAP Paged Results
* @return boolean if it the case, false otherwise
* */
public function hasPagedResultSupport() {
@@ -125,14 +222,17 @@ class LDAP implements ILDAPWrapper {
}
/**
- * @brief Checks whether the submitted parameter is a resource
- * @param $resource the resource variable to check
- * @return boolean if it is a resource, false otherwise
+ * Checks whether the submitted parameter is a resource
+ * @param Resource $resource the resource variable to check
+ * @return bool true if it is a resource, false otherwise
*/
public function isResource($resource) {
return is_resource($resource);
}
+ /**
+ * @return mixed
+ */
private function invokeLDAPMethod() {
$arguments = func_get_args();
$func = 'ldap_' . array_shift($arguments);
@@ -148,6 +248,7 @@ class LDAP implements ILDAPWrapper {
/**
* @param string $functionName
+ * @param array $args
*/
private function preFunctionCall($functionName, $args) {
$this->curFunc = $functionName;
@@ -181,4 +282,4 @@ class LDAP implements ILDAPWrapper {
$this->curFunc = '';
$this->curArgs = array();
}
-}
\ No newline at end of file
+}
diff --git a/apps/user_ldap/lib/ldaputility.php b/apps/user_ldap/lib/ldaputility.php
index 7fffd9c88d18c1efe5cdd97624738594b830bceb..aa1e75e928b2c192c4cd9d633e8d080e23c09024 100644
--- a/apps/user_ldap/lib/ldaputility.php
+++ b/apps/user_ldap/lib/ldaputility.php
@@ -27,8 +27,8 @@ abstract class LDAPUtility {
protected $ldap;
/**
- * @brief constructor, make sure the subclasses call this one!
- * @param $ldapWrapper an instance of an ILDAPWrapper
+ * constructor, make sure the subclasses call this one!
+ * @param ILDAPWrapper $ldapWrapper an instance of an ILDAPWrapper
*/
public function __construct(ILDAPWrapper $ldapWrapper) {
$this->ldap = $ldapWrapper;
diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php
index 0eb294eb7a0d36350c8956490d4b16712d276638..d15d1ae861630197424d2bc47e42805093e80b99 100644
--- a/apps/user_ldap/lib/proxy.php
+++ b/apps/user_ldap/lib/proxy.php
@@ -29,16 +29,26 @@ abstract class Proxy {
static private $accesses = array();
private $ldap = null;
+ /**
+ * @param ILDAPWrapper $ldap
+ */
public function __construct(ILDAPWrapper $ldap) {
$this->ldap = $ldap;
- $this->cache = \OC_Cache::getGlobalCache();
+ $this->cache = \OC\Cache::getGlobalCache();
}
+ /**
+ * @param string $configPrefix
+ */
private function addAccess($configPrefix) {
$connector = new Connection($this->ldap, $configPrefix);
self::$accesses[$configPrefix] = new Access($connector, $this->ldap);
}
+ /**
+ * @param string $configPrefix
+ * @return mixed
+ */
protected function getAccess($configPrefix) {
if(!isset(self::$accesses[$configPrefix])) {
$this->addAccess($configPrefix);
@@ -46,30 +56,45 @@ abstract class Proxy {
return self::$accesses[$configPrefix];
}
+ /**
+ * @param string $uid
+ * @return string
+ */
protected function getUserCacheKey($uid) {
return 'user-'.$uid.'-lastSeenOn';
}
+ /**
+ * @param string $gid
+ * @return string
+ */
protected function getGroupCacheKey($gid) {
return 'group-'.$gid.'-lastSeenOn';
}
/**
- * @param boolean $passOnWhen
+ * @param string $id
* @param string $method
+ * @param array $parameters
+ * @param bool $passOnWhen
+ * @return mixed
*/
abstract protected function callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
/**
+ * @param string $id
* @param string $method
+ * @param array $parameters
+ * @return mixed
*/
abstract protected function walkBackends($id, $method, $parameters);
/**
- * @brief Takes care of the request to the User backend
- * @param $uid string, the uid connected to the request
+ * Takes care of the request to the User backend
+ * @param string $id
* @param string $method string, the method of the user backend that shall be called
- * @param $parameters an array of parameters to be passed
+ * @param array $parameters an array of parameters to be passed
+ * @param bool $passOnWhen
* @return mixed, the result of the specified method
*/
protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
@@ -82,6 +107,7 @@ abstract class Proxy {
/**
* @param string|null $key
+ * @return string
*/
private function getCacheKey($key) {
$prefix = 'LDAP-Proxy-';
@@ -93,6 +119,7 @@ abstract class Proxy {
/**
* @param string $key
+ * @return mixed|null
*/
public function getFromCache($key) {
if(!$this->isCached($key)) {
@@ -105,6 +132,7 @@ abstract class Proxy {
/**
* @param string $key
+ * @return bool
*/
public function isCached($key) {
$key = $this->getCacheKey($key);
@@ -113,6 +141,7 @@ abstract class Proxy {
/**
* @param string $key
+ * @param mixed $value
*/
public function writeToCache($key, $value) {
$key = $this->getCacheKey($key);
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index 8406b2d42a594e72e8e4bf6e43f496491c585e27..b8a0e5ad799f2307c9c8a3c03272dece6e183990 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -44,9 +44,9 @@ class Wizard extends LDAPUtility {
const LDAP_NW_TIMEOUT = 4;
/**
- * @brief Constructor
- * @param $configuration an instance of Configuration
- * @param $ldap an instance of ILDAPWrapper
+ * Constructor
+ * @param Configuration $configuration an instance of Configuration
+ * @param ILDAPWrapper $ldap an instance of ILDAPWrapper
*/
public function __construct(Configuration $configuration, ILDAPWrapper $ldap) {
parent::__construct($ldap);
@@ -63,6 +63,10 @@ class Wizard extends LDAPUtility {
}
}
+ /**
+ * @return WizardResult
+ * @throws \Exception
+ */
public function countGroups() {
if(!$this->checkRequirements(array('ldapHost',
'ldapPort',
@@ -96,6 +100,10 @@ class Wizard extends LDAPUtility {
return $this->result;
}
+ /**
+ * @return WizardResult
+ * @throws \Exception
+ */
public function countUsers() {
if(!$this->checkRequirements(array('ldapHost',
'ldapPort',
@@ -125,7 +133,10 @@ class Wizard extends LDAPUtility {
return $this->result;
}
-
+ /**
+ * @return WizardResult
+ * @throws \Exception
+ */
public function determineAttributes() {
if(!$this->checkRequirements(array('ldapHost',
'ldapPort',
@@ -151,7 +162,8 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief return the state of the Group Filter Mode
+ * return the state of the Group Filter Mode
+ * @return WizardResult
*/
public function getGroupFilterMode() {
$this->getFilterMode('ldapGroupFilterMode');
@@ -159,7 +171,8 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief return the state of the Login Filter Mode
+ * return the state of the Login Filter Mode
+ * @return WizardResult
*/
public function getLoginFilterMode() {
$this->getFilterMode('ldapLoginFilterMode');
@@ -167,7 +180,8 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief return the state of the User Filter Mode
+ * return the state of the User Filter Mode
+ * @return WizardResult
*/
public function getUserFilterMode() {
$this->getFilterMode('ldapUserFilterMode');
@@ -175,20 +189,21 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief return the state of the mode of the specified filter
- * @param string $confkey string, contains the access key of the Configuration
+ * return the state of the mode of the specified filter
+ * @param string $confKey contains the access key of the Configuration
*/
- private function getFilterMode($confkey) {
- $mode = $this->configuration->$confkey;
+ private function getFilterMode($confKey) {
+ $mode = $this->configuration->$confKey;
if(is_null($mode)) {
$mode = $this->LFILTER_MODE_ASSISTED;
}
- $this->result->addChange($confkey, $mode);
+ $this->result->addChange($confKey, $mode);
}
/**
- * @brief detects the available LDAP attributes
- * @returns the instance's WizardResult instance
+ * detects the available LDAP attributes
+ * @return array The instance's WizardResult instance
+ * @throws \Exception
*/
private function getUserAttributes() {
if(!$this->checkRequirements(array('ldapHost',
@@ -220,8 +235,8 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief detects the available LDAP groups
- * @returns the instance's WizardResult instance
+ * detects the available LDAP groups
+ * @return WizardResult the instance's WizardResult instance
*/
public function determineGroupsForGroups() {
return $this->determineGroups('ldap_groupfilter_groups',
@@ -230,8 +245,8 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief detects the available LDAP groups
- * @returns the instance's WizardResult instance
+ * detects the available LDAP groups
+ * @return WizardResult the instance's WizardResult instance
*/
public function determineGroupsForUsers() {
return $this->determineGroups('ldap_userfilter_groups',
@@ -239,12 +254,14 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief detects the available LDAP groups
- * @param string $dbkey
- * @param string $confkey
- * @returns the instance's WizardResult instance
+ * detects the available LDAP groups
+ * @param string $dbKey
+ * @param string $confKey
+ * @param bool $testMemberOf
+ * @return WizardResult the instance's WizardResult instance
+ * @throws \Exception
*/
- private function determineGroups($dbkey, $confkey, $testMemberOf = true) {
+ private function determineGroups($dbKey, $confKey, $testMemberOf = true) {
if(!$this->checkRequirements(array('ldapHost',
'ldapPort',
'ldapBase',
@@ -256,8 +273,8 @@ class Wizard extends LDAPUtility {
throw new \Exception('Could not connect to LDAP');
}
- $obclasses = array('posixGroup', 'group', 'zimbraDistributionList', '*');
- $this->determineFeature($obclasses, 'cn', $dbkey, $confkey);
+ $obClasses = array('posixGroup', 'group', 'zimbraDistributionList', '*');
+ $this->determineFeature($obClasses, 'cn', $dbKey, $confKey);
if($testMemberOf) {
$this->configuration->hasMemberOfFilterSupport = $this->testMemberOf();
@@ -270,6 +287,10 @@ class Wizard extends LDAPUtility {
return $this->result;
}
+ /**
+ * @return bool|WizardResult
+ * @throws \Exception
+ */
public function determineGroupMemberAssoc() {
if(!$this->checkRequirements(array('ldapHost',
'ldapPort',
@@ -289,8 +310,9 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief detects the available object classes
- * @returns the instance's WizardResult instance
+ * Detects the available object classes
+ * @return WizardResult the instance's WizardResult instance
+ * @throws \Exception
*/
public function determineGroupObjectClasses() {
if(!$this->checkRequirements(array('ldapHost',
@@ -315,8 +337,9 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief detects the available object classes
- * @returns the instance's WizardResult instance
+ * detects the available object classes
+ * @return WizardResult
+ * @throws \Exception
*/
public function determineUserObjectClasses() {
if(!$this->checkRequirements(array('ldapHost',
@@ -344,6 +367,10 @@ class Wizard extends LDAPUtility {
return $this->result;
}
+ /**
+ * @return WizardResult
+ * @throws \Exception
+ */
public function getGroupFilter() {
if(!$this->checkRequirements(array('ldapHost',
'ldapPort',
@@ -364,6 +391,10 @@ class Wizard extends LDAPUtility {
return $this->result;
}
+ /**
+ * @return WizardResult
+ * @throws \Exception
+ */
public function getUserListFilter() {
if(!$this->checkRequirements(array('ldapHost',
'ldapPort',
@@ -386,6 +417,10 @@ class Wizard extends LDAPUtility {
return $this->result;
}
+ /**
+ * @return bool|WizardResult
+ * @throws \Exception
+ */
public function getUserLoginFilter() {
if(!$this->checkRequirements(array('ldapHost',
'ldapPort',
@@ -406,7 +441,8 @@ class Wizard extends LDAPUtility {
/**
* Tries to determine the port, requires given Host, User DN and Password
- * @returns mixed WizardResult on success, false otherwise
+ * @return WizardResult|false WizardResult on success, false otherwise
+ * @throws \Exception
*/
public function guessPortAndTLS() {
if(!$this->checkRequirements(array('ldapHost',
@@ -443,8 +479,8 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief tries to determine a base dn from User DN or LDAP Host
- * @returns mixed WizardResult on success, false otherwise
+ * tries to determine a base dn from User DN or LDAP Host
+ * @return WizardResult|false WizardResult on success, false otherwise
*/
public function guessBaseDN() {
if(!$this->checkRequirements(array('ldapHost',
@@ -483,11 +519,10 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief sets the found value for the configuration key in the WizardResult
+ * sets the found value for the configuration key in the WizardResult
* as well as in the Configuration instance
* @param string $key the configuration key
- * @param $value the (detected) value
- * @return null
+ * @param string $value the (detected) value
*
*/
private function applyFind($key, $value) {
@@ -496,7 +531,7 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief Checks, whether a port was entered in the Host configuration
+ * Checks, whether a port was entered in the Host configuration
* field. In this case the port will be stripped off, but also stored as
* setting.
*/
@@ -514,9 +549,10 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief tries to detect the group member association attribute which is
+ * tries to detect the group member association attribute which is
* one of 'uniqueMember', 'memberUid', 'member'
- * @return mixed, string with the attribute name, false on error
+ * @return string|false, string with the attribute name, false on error
+ * @throws \Exception
*/
private function detectGroupMemberAssoc() {
$possibleAttrs = array('uniqueMember', 'memberUid', 'member', 'unfugasdfasdfdfa');
@@ -535,7 +571,7 @@ class Wizard extends LDAPUtility {
}
$er = $this->ldap->firstEntry($cr, $rr);
while(is_resource($er)) {
- $dn = $this->ldap->getDN($cr, $er);
+ $this->ldap->getDN($cr, $er);
$attrs = $this->ldap->getAttributes($cr, $er);
$result = array();
for($i = 0; $i < count($possibleAttrs); $i++) {
@@ -555,9 +591,10 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief Checks whether for a given BaseDN results will be returned
+ * Checks whether for a given BaseDN results will be returned
* @param string $base the BaseDN to test
* @return bool true on success, false otherwise
+ * @throws \Exception
*/
private function testBaseDN($base) {
$cr = $this->getConnection();
@@ -580,10 +617,11 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief Checks whether the server supports memberOf in LDAP Filter.
+ * Checks whether the server supports memberOf in LDAP Filter.
* Requires that groups are determined, thus internally called from within
* determineGroups()
- * @return bool, true if it does, false otherwise
+ * @return bool true if it does, false otherwise
+ * @throws \Exception
*/
private function testMemberOf() {
$cr = $this->getConnection();
@@ -603,7 +641,7 @@ class Wizard extends LDAPUtility {
//assuming only groups have their cn cached :)
continue;
}
- $filter = strtolower($filterPrefix . $dn . $filterSuffix);
+ $filter = strtolower($filterPrefix . $dn . $filterSuffix);
$rr = $this->ldap->search($cr, $base, $filter, array('dn'));
if(!$this->ldap->isResource($rr)) {
continue;
@@ -620,11 +658,12 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief creates an LDAP Filter from given configuration
+ * creates an LDAP Filter from given configuration
* @param integer $filterType int, for which use case the filter shall be created
* can be any of self::LFILTER_USER_LIST, self::LFILTER_LOGIN or
* self::LFILTER_GROUP_LIST
- * @return mixed, string with the filter on success, false otherwise
+ * @return string|false string with the filter on success, false otherwise
+ * @throws \Exception
*/
private function composeLdapFilter($filterType) {
$filter = '';
@@ -737,7 +776,7 @@ class Wizard extends LDAPUtility {
if(is_array($attrsToFilter) && count($attrsToFilter) > 0) {
$filterAttributes = '(|';
foreach($attrsToFilter as $attribute) {
- $filterAttributes .= '(' . $attribute . $loginpart . ')';
+ $filterAttributes .= '(' . $attribute . $loginpart . ')';
}
$filterAttributes .= ')';
$parts++;
@@ -765,9 +804,11 @@ class Wizard extends LDAPUtility {
/**
* Connects and Binds to an LDAP Server
- * @param $port the port to connect with
- * @param $tls whether startTLS is to be used
- * @return
+ * @param int $port the port to connect with
+ * @param bool $tls whether startTLS is to be used
+ * @param bool $ncc
+ * @return bool
+ * @throws \Exception
*/
private function connectAndBind($port = 389, $tls = false, $ncc = false) {
if($ncc) {
@@ -819,27 +860,26 @@ class Wizard extends LDAPUtility {
if($ncc) {
throw new \Exception('Certificate cannot be validated.');
}
- \OCP\Util::writeLog('user_ldap', 'Wiz: Bind successfull to Port '. $port . ' TLS ' . intval($tls), \OCP\Util::DEBUG);
+ \OCP\Util::writeLog('user_ldap', 'Wiz: Bind successful to Port '. $port . ' TLS ' . intval($tls), \OCP\Util::DEBUG);
return true;
}
- $errno = $this->ldap->errno($cr);
+ $errNo = $this->ldap->errno($cr);
$error = ldap_error($cr);
$this->ldap->unbind($cr);
- if($errno === -1 || ($errno === 2 && $ncc)) {
+ if($errNo === -1 || ($errNo === 2 && $ncc)) {
//host, port or TLS wrong
return false;
- } else if ($errno === 2) {
+ } else if ($errNo === 2) {
return $this->connectAndBind($port, $tls, true);
}
throw new \Exception($error);
}
/**
- * @brief checks whether a valid combination of agent and password has been
+ * checks whether a valid combination of agent and password has been
* provided (either two values or nothing for anonymous connect)
- * @return boolean, true if everything is fine, false otherwise
- *
+ * @return bool, true if everything is fine, false otherwise
*/
private function checkAgentRequirements() {
$agent = $this->configuration->ldapAgentName;
@@ -850,7 +890,8 @@ class Wizard extends LDAPUtility {
}
/**
- * @param string[] $reqs
+ * @param array $reqs
+ * @return bool
*/
private function checkRequirements($reqs) {
$this->checkAgentRequirements();
@@ -864,18 +905,17 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief does a cumulativeSearch on LDAP to get different values of a
+ * does a cumulativeSearch on LDAP to get different values of a
* specified attribute
* @param string[] $filters array, the filters that shall be used in the search
* @param string $attr the attribute of which a list of values shall be returned
- * @param $lfw bool, whether the last filter is a wildcard which shall not
+ * @param bool $lfw whether the last filter is a wildcard which shall not
* be processed if there were already findings, defaults to true
* @param int $dnReadLimit the amount of how many DNs should be analyzed.
* The lower, the faster
* @param string $maxF string. if not null, this variable will have the filter that
* yields most result entries
- * @return mixed, an array with the values on success, false otherwise
- *
+ * @return array|false an array with the values on success, false otherwise
*/
public function cumulativeSearchOnAttribute($filters, $attr, $lfw = true, $dnReadLimit = 3, &$maxF = null) {
$dnRead = array();
@@ -941,15 +981,16 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief determines if and which $attr are available on the LDAP server
+ * determines if and which $attr are available on the LDAP server
* @param string[] $objectclasses the objectclasses to use as search filter
* @param string $attr the attribute to look for
* @param string $dbkey the dbkey of the setting the feature is connected to
* @param string $confkey the confkey counterpart for the $dbkey as used in the
* Configuration class
- * @param $po boolean, whether the objectClass with most result entries
+ * @param bool $po whether the objectClass with most result entries
* shall be pre-selected via the result
- * @returns array, list of found items.
+ * @return array, list of found items.
+ * @throws \Exception
*/
private function determineFeature($objectclasses, $attr, $dbkey, $confkey, $po = false) {
$cr = $this->getConnection();
@@ -999,10 +1040,10 @@ class Wizard extends LDAPUtility {
}
/**
- * @brief appends a list of values fr
- * @param $result resource, the return value from ldap_get_attributes
+ * appends a list of values fr
+ * @param resource $result the return value from ldap_get_attributes
* @param string $attribute the attribute values to look for
- * @param &$known array, new values will be appended here
+ * @param array &$known new values will be appended here
* @return int, state on of the class constants LRESULT_PROCESSED_OK,
* LRESULT_PROCESSED_INVALID or LRESULT_PROCESSED_SKIP
*/
@@ -1013,7 +1054,7 @@ class Wizard extends LDAPUtility {
return self::LRESULT_PROCESSED_INVALID;
}
- //strtolower on all keys for proper comparison
+ // strtolower on all keys for proper comparison
$result = \OCP\Util::mb_array_change_key_case($result);
$attribute = strtolower($attribute);
if(isset($result[$attribute])) {
@@ -1031,6 +1072,9 @@ class Wizard extends LDAPUtility {
}
}
+ /**
+ * @return bool|mixed
+ */
private function getConnection() {
if(!is_null($this->cr)) {
return $this->cr;
@@ -1057,6 +1101,9 @@ class Wizard extends LDAPUtility {
return false;
}
+ /**
+ * @return array
+ */
private function getDefaultLdapPortSettings() {
static $settings = array(
array('port' => 7636, 'tls' => false),
@@ -1069,6 +1116,9 @@ class Wizard extends LDAPUtility {
return $settings;
}
+ /**
+ * @return array
+ */
private function getPortSettingsToTry() {
//389 ↠LDAP / Unencrypted or StartTLS
//636 ↠LDAPS / SSL
@@ -1096,4 +1146,4 @@ class Wizard extends LDAPUtility {
}
-}
\ No newline at end of file
+}
diff --git a/apps/user_ldap/lib/wizardresult.php b/apps/user_ldap/lib/wizardresult.php
index 9e0936faa69d182e2d88d99119084c5b6ac88af7..42b0bc046549a7dfb7380af8decd5003632c291e 100644
--- a/apps/user_ldap/lib/wizardresult.php
+++ b/apps/user_ldap/lib/wizardresult.php
@@ -28,10 +28,17 @@ class WizardResult {
protected $options = array();
protected $markedChange = false;
+ /**
+ * @param string $key
+ * @param mixed $value
+ */
public function addChange($key, $value) {
$this->changes[$key] = $value;
}
+ /**
+ *
+ */
public function markChange() {
$this->markedChange = true;
}
@@ -47,10 +54,16 @@ class WizardResult {
$this->options[$key] = $values;
}
+ /**
+ * @return bool
+ */
public function hasChanges() {
return (count($this->changes) > 0 || $this->markedChange);
}
+ /**
+ * @return array
+ */
public function getResultArray() {
$result = array();
$result['changes'] = $this->changes;
@@ -59,4 +72,4 @@ class WizardResult {
}
return $result;
}
-}
\ No newline at end of file
+}
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 6b7d8e6f53e5e4409225a8c155849980011a054f..fcde5df37168a299d66329dde289f428fabeb251 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -46,11 +46,13 @@ $wControls = $wControls->fetchPage();
$sControls = new OCP\Template('user_ldap', 'part.settingcontrols');
$sControls = $sControls->fetchPage();
+$l = \OC_L10N::get('user_ldap');
+
$wizTabs = array();
-$wizTabs[] = array('tpl' => 'part.wizard-server', 'cap' => 'Server');
-$wizTabs[] = array('tpl' => 'part.wizard-userfilter', 'cap' => 'User Filter');
-$wizTabs[] = array('tpl' => 'part.wizard-loginfilter', 'cap' => 'Login Filter');
-$wizTabs[] = array('tpl' => 'part.wizard-groupfilter', 'cap' => 'Group Filter');
+$wizTabs[] = array('tpl' => 'part.wizard-server', 'cap' => $l->t('Server'));
+$wizTabs[] = array('tpl' => 'part.wizard-userfilter', 'cap' => $l->t('User Filter'));
+$wizTabs[] = array('tpl' => 'part.wizard-loginfilter', 'cap' => $l->t('Login Filter'));
+$wizTabs[] = array('tpl' => 'part.wizard-groupfilter', 'cap' => $l->t('Group Filter'));
for($i = 0; $i < count($wizTabs); $i++) {
$tab = new OCP\Template('user_ldap', $wizTabs[$i]['tpl']);
@@ -71,7 +73,7 @@ $tmpl->assign('settingControls', $sControls);
$config = new \OCA\user_ldap\lib\Configuration('', false);
$defaults = $config->getDefaults();
foreach($defaults as $key => $default) {
- $tmpl->assign($key.'_default', $default);
+ $tmpl->assign($key.'_default', $default);
}
return $tmpl->fetchPage();
diff --git a/apps/user_ldap/templates/part.settingcontrols.php b/apps/user_ldap/templates/part.settingcontrols.php
index 0cdb8ccf16f8ad43de1e40bfb821a1b1decb75b4..dfc495490322d91297a509f59f9fcba53f1c85ed 100644
--- a/apps/user_ldap/templates/part.settingcontrols.php
+++ b/apps/user_ldap/templates/part.settingcontrols.php
@@ -3,10 +3,10 @@
<button class="ldap_action_test_connection" name="ldap_action_test_connection">
<?php p($l->t('Test Configuration'));?>
</button>
- <a href="<?php p($theme->getDocBaseUrl()); ?>/server/5.0/admin_manual/auth_ldap.html"
+ <a href="<?php p($theme->getDocBaseUrl()); ?>/server/7.0/admin_manual/configuration/auth_ldap.html"
target="_blank">
<img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>"
style="height:1.75ex" />
<?php p($l->t('Help'));?>
</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/apps/user_ldap/templates/part.wizard-server.php b/apps/user_ldap/templates/part.wizard-server.php
index 0312c17ab7b4e3d2e3b7680cb1c9ee87600d9ece..3d4b0feead964fd05a31945eb514064ed281d2e1 100644
--- a/apps/user_ldap/templates/part.wizard-server.php
+++ b/apps/user_ldap/templates/part.wizard-server.php
@@ -3,14 +3,14 @@
<select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser">
<?php if(count($_['serverConfigurationPrefixes']) === 0 ) {
?>
- <option value="" selected>1. Server</option>');
+ <option value="" selected><?php p($l->t('1. Server'));?></option>');
<?php
} else {
$i = 1;
$sel = ' selected';
foreach($_['serverConfigurationPrefixes'] as $prefix) {
?>
- <option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($i++); ?>. Server: <?php p($_['serverConfigurationHosts'][$prefix]); ?></option>
+ <option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($l->t('%s. Server:', array($i++)));?> <?php p(' '.$_['serverConfigurationHosts'][$prefix]); ?></option>
<?php
}
}
@@ -18,7 +18,7 @@
<option value="NEW"><?php p($l->t('Add Server Configuration'));?></option>
</select>
<button id="ldap_action_delete_configuration"
- name="ldap_action_delete_configuration">Delete Configuration</button>
+ name="ldap_action_delete_configuration"><?php p($l->t('Delete Configuration'));?></button>
</p>
<div class="hostPortCombinator">
@@ -68,4 +68,4 @@
</div>
</div>
<?php print_unescaped($_['wizardControls']); ?>
- </fieldset>
\ No newline at end of file
+ </fieldset>
diff --git a/apps/user_ldap/templates/part.wizardcontrols.php b/apps/user_ldap/templates/part.wizardcontrols.php
index f17b362c737336ca2d34d3fdd437eee0dd3c6e5e..862e10bdd128a88edd74986611dd355b4b0f5183 100644
--- a/apps/user_ldap/templates/part.wizardcontrols.php
+++ b/apps/user_ldap/templates/part.wizardcontrols.php
@@ -7,10 +7,10 @@
<button class="ldap_action_continue" name="ldap_action_continue" type="button">
<?php p($l->t('Continue'));?>
</button>
- <a href="<?php p($theme->getDocBaseUrl()); ?>/server/5.0/admin_manual/auth_ldap.html"
+ <a href="<?php p($theme->getDocBaseUrl()); ?>/server/7.0/admin_manual/configuration/auth_ldap.html"
target="_blank">
<img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>"
style="height:1.75ex" />
<span class="ldap_grey"><?php p($l->t('Help'));?></span>
</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 03f2b8db090ae98d7e6d81a72c74b03be98b44ff..38043fb34a801ae869f93843fcf3f69ef9b05102 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -4,8 +4,8 @@
<?php foreach($_['toc'] as $id => $title) { ?>
<li id="<?php p($id); ?>"><a href="<?php p($id); ?>"><?php p($title); ?></a></li>
<?php } ?>
- <li class="ldapSettingsTabs"><a href="#ldapSettings-2">Expert</a></li>
- <li class="ldapSettingsTabs"><a href="#ldapSettings-1">Advanced</a></li>
+ <li class="ldapSettingsTabs"><a href="#ldapSettings-2"><?php p($l->t('Expert'));?></a></li>
+ <li class="ldapSettingsTabs"><a href="#ldapSettings-1"><?php p($l->t('Advanced'));?></a></li>
</ul>
<?php if(OCP\App::isEnabled('user_webdavauth')) {
print_unescaped('<p class="ldapwarning">'.$l->t('<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.').'</p>');
diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php
index 8c8d85b3c334fc156e31873f15d0dd88eb0e6a33..2535c34bcf5fa2604ae555daf78ee61da5dbeefa 100644
--- a/apps/user_ldap/tests/user_ldap.php
+++ b/apps/user_ldap/tests/user_ldap.php
@@ -71,15 +71,15 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase {
case 'ladyofshadows':
return 'dnOfLadyOfShadows';
break;
- defautl:
+ default:
return false;
}
}));
}
/**
- * @brief Prepares the Access mock for checkPassword tests
- * @param $access mock of \OCA\user_ldap\lib\Access
+ * Prepares the Access mock for checkPassword tests
+ * @param \OCA\user_ldap\lib\Access $access mock
* @return void
*/
private function prepareAccessForCheckPassword(&$access) {
@@ -186,8 +186,8 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase {
}
/**
- * @brief Prepares the Access mock for getUsers tests
- * @param $access mock of \OCA\user_ldap\lib\Access
+ * Prepares the Access mock for getUsers tests
+ * @param \OCA\user_ldap\lib\Access $access mock
* @return void
*/
private function prepareAccessForGetUsers(&$access) {
@@ -557,4 +557,4 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase {
$result = $backend->countUsers();
$this->assertFalse($result);
}
-}
\ No newline at end of file
+}
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 757de6b60f4cedbd57162294f6ace9961c4b8d8c..aece2ee9aa2bfca9c33f9213a925f4f7a440a53c 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -69,9 +69,9 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
}
/**
- * @brief reads jpegPhoto and set is as avatar if available
- * @param $uid string ownCloud user name
- * @param $dn string the user's LDAP DN
+ * reads jpegPhoto and set is as avatar if available
+ * @param string $uid ownCloud user name
+ * @param string $dn the user's LDAP DN
* @return void
*/
private function updateAvatar($uid, $dn) {
@@ -117,8 +117,8 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
}
/**
- * @brief checks whether the user is allowed to change his avatar in ownCloud
- * @param $uid string the ownCloud user name
+ * checks whether the user is allowed to change his avatar in ownCloud
+ * @param string $uid the ownCloud user name
* @return boolean either the user can or cannot
*/
public function canChangeAvatar($uid) {
@@ -135,9 +135,9 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
}
/**
- * @brief reads the image from LDAP that shall be used as Avatar
- * @param $uid string, the ownCloud user name
- * @param $dn string, the user DN
+ * reads the image from LDAP that shall be used as Avatar
+ * @param string $uid the ownCloud user name
+ * @param string $dn the user DN
* @return string data (provided by LDAP) | false
*/
private function getAvatarImage($uid, $dn) {
@@ -155,7 +155,7 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
}
/**
- * @brief Check if the password is correct
+ * Check if the password is correct
* @param string $uid The username
* @param string $password The password
* @return boolean
@@ -199,8 +199,8 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
}
/**
- * @brief Get a list of all users
- * @returns array with all uids
+ * Get a list of all users
+ * @return string[] with all uids
*
* Get a list of all users.
*/
@@ -240,7 +240,7 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
}
/**
- * @brief check if a user exists
+ * check if a user exists
* @param string $uid the username
* @return boolean
*/
@@ -271,9 +271,9 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
}
/**
- * @brief delete a user
- * @param $uid The username of the user to delete
- * @returns true/false
+ * delete a user
+ * @param string $uid The username of the user to delete
+ * @return bool
*
* Deletes a user
*/
@@ -282,7 +282,7 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
}
/**
- * @brief get the user's home directory
+ * get the user's home directory
* @param string $uid the username
* @return boolean
*/
@@ -325,9 +325,9 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
}
/**
- * @brief get display name of the user
- * @param $uid user ID of the user
- * @return display name
+ * get display name of the user
+ * @param string $uid user ID of the user
+ * @return string display name
*/
public function getDisplayName($uid) {
if(!$this->userExists($uid)) {
@@ -352,8 +352,8 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
}
/**
- * @brief Get a list of all display names
- * @returns array with all displayNames (value) and the correspondig uids (key)
+ * Get a list of all display names
+ * @return array with all displayNames (value) and the correspondig uids (key)
*
* Get a list of all display names and user ids.
*/
@@ -372,10 +372,10 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
return $displayNames;
}
- /**
- * @brief Check if backend implements actions
- * @param $actions bitwise-or'ed actions
- * @returns boolean
+ /**
+ * Check if backend implements actions
+ * @param int $actions bitwise-or'ed actions
+ * @return boolean
*
* Returns the supported actions as int to be
* compared with OC_USER_BACKEND_CREATE_USER etc.
@@ -399,7 +399,7 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
/**
* counts the users in LDAP
*
- * @return int | bool
+ * @return int|bool
*/
public function countUsers() {
$filter = \OCP\Util::mb_str_replace(
diff --git a/apps/user_ldap/user_proxy.php b/apps/user_ldap/user_proxy.php
index 2cb3dfb2c60f60b5154406adb02f593cca32d1d1..fa4d69393038da73be5eb7ffb08b5059f5191947 100644
--- a/apps/user_ldap/user_proxy.php
+++ b/apps/user_ldap/user_proxy.php
@@ -30,13 +30,13 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
private $refBackend = null;
/**
- * @brief Constructor
- * @param $serverConfigPrefixes array containing the config Prefixes
+ * Constructor
+ * @param array $serverConfigPrefixes array containing the config Prefixes
*/
public function __construct($serverConfigPrefixes, ILDAPWrapper $ldap) {
parent::__construct($ldap);
foreach($serverConfigPrefixes as $configPrefix) {
- $this->backends[$configPrefix] =
+ $this->backends[$configPrefix] =
new \OCA\user_ldap\USER_LDAP($this->getAccess($configPrefix));
if(is_null($this->refBackend)) {
$this->refBackend = &$this->backends[$configPrefix];
@@ -45,13 +45,13 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
}
/**
- * @brief Tries the backends one after the other until a positive result is returned from the specified method
- * @param $uid string, the uid connected to the request
- * @param $method string, the method of the user backend that shall be called
- * @param $parameters an array of parameters to be passed
- * @return mixed, the result of the method or false
+ * Tries the backends one after the other until a positive result is returned from the specified method
+ * @param string $uid the uid connected to the request
+ * @param string $method the method of the user backend that shall be called
+ * @param array $parameters an array of parameters to be passed
+ * @return mixed the result of the method or false
*/
- protected function walkBackends($uid, $method, $parameters) {
+ protected function walkBackends($uid, $method, $parameters) {
$cacheKey = $this->getUserCacheKey($uid);
foreach($this->backends as $configPrefix => $backend) {
$instance = $backend;
@@ -68,14 +68,14 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
}
/**
- * @brief Asks the backend connected to the server that supposely takes care of the uid from the request.
- * @param $uid string, the uid connected to the request
- * @param $method string, the method of the user backend that shall be called
- * @param $parameters an array of parameters to be passed
- * @param $passOnWhen the result matches this variable
- * @return mixed, the result of the method or false
+ * Asks the backend connected to the server that supposely takes care of the uid from the request.
+ * @param string $uid the uid connected to the request
+ * @param string $method the method of the user backend that shall be called
+ * @param array $parameters an array of parameters to be passed
+ * @param mixed $passOnWhen the result matches this variable
+ * @return mixed the result of the method or false
*/
- protected function callOnLastSeenOn($uid, $method, $parameters, $passOnWhen) {
+ protected function callOnLastSeenOn($uid, $method, $parameters, $passOnWhen) {
$cacheKey = $this->getUserCacheKey($uid);
$prefix = $this->getFromCache($cacheKey);
//in case the uid has been found in the past, try this stored connection first
@@ -105,9 +105,9 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
}
/**
- * @brief Check if backend implements actions
- * @param $actions bitwise-or'ed actions
- * @returns boolean
+ * Check if backend implements actions
+ * @param int $actions bitwise-or'ed actions
+ * @return boolean
*
* Returns the supported actions as int to be
* compared with OC_USER_BACKEND_CREATE_USER etc.
@@ -118,8 +118,8 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
}
/**
- * @brief Get a list of all users
- * @returns array with all uids
+ * Get a list of all users
+ * @return string[] with all uids
*
* Get a list of all users.
*/
@@ -136,7 +136,7 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
}
/**
- * @brief check if a user exists
+ * check if a user exists
* @param string $uid the username
* @return boolean
*/
@@ -145,10 +145,10 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
}
/**
- * @brief Check if the password is correct
- * @param $uid The username
- * @param $password The password
- * @returns true/false
+ * Check if the password is correct
+ * @param string $uid The username
+ * @param string $password The password
+ * @return bool
*
* Check if the password is correct without logging in the user
*/
@@ -157,7 +157,7 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
}
/**
- * @brief get the user's home directory
+ * get the user's home directory
* @param string $uid the username
* @return boolean
*/
@@ -166,17 +166,17 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
}
/**
- * @brief get display name of the user
- * @param $uid user ID of the user
- * @return display name
+ * get display name of the user
+ * @param string $uid user ID of the user
+ * @return string display name
*/
public function getDisplayName($uid) {
return $this->handleRequest($uid, 'getDisplayName', array($uid));
}
/**
- * @brief checks whether the user is allowed to change his avatar in ownCloud
- * @param $uid string the ownCloud user name
+ * checks whether the user is allowed to change his avatar in ownCloud
+ * @param string $uid the ownCloud user name
* @return boolean either the user can or cannot
*/
public function canChangeAvatar($uid) {
@@ -184,8 +184,8 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
}
/**
- * @brief Get a list of all display names
- * @returns array with all displayNames (value) and the corresponding uids (key)
+ * Get a list of all display names
+ * @return array with all displayNames (value) and the corresponding uids (key)
*
* Get a list of all display names and user ids.
*/
@@ -202,9 +202,9 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
}
/**
- * @brief delete a user
- * @param $uid The username of the user to delete
- * @returns true/false
+ * delete a user
+ * @param string $uid The username of the user to delete
+ * @return bool
*
* Deletes a user
*/
@@ -220,8 +220,8 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
}
/**
- * @brief Count the number of users
- * @returns int | bool
+ * Count the number of users
+ * @return int|bool
*/
public function countUsers() {
$users = false;
diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml
index 20c5909cc12ed3937cf5db1980e67cd8bd07aa6f..16e6942505bd19a359d99dbe0ff92847d35a8cd8 100755
--- a/apps/user_webdavauth/appinfo/info.xml
+++ b/apps/user_webdavauth/appinfo/info.xml
@@ -7,7 +7,7 @@
This app is not compatible with the LDAP user and group backend.</description>
<licence>AGPL</licence>
<author>Frank Karlitschek</author>
- <require>4.93</require>
+ <requiremin>4.93</requiremin>
<shipped>true</shipped>
<types>
<authentication/>
diff --git a/apps/user_webdavauth/l10n/tr.php b/apps/user_webdavauth/l10n/tr.php
index 0ca8b0ad55fdb02a943e7e90312513728696a1e0..6c6b0c5c9d43f8932a7eea9a3988ce37f0c933aa 100644
--- a/apps/user_webdavauth/l10n/tr.php
+++ b/apps/user_webdavauth/l10n/tr.php
@@ -1,7 +1,7 @@
<?php
$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV Kimlik doğrulaması",
-"Address: " => "Adres:",
+"WebDAV Authentication" => "WebDAV Kimlik Doğrulaması",
+"Address: " => "WebDAV Kimlik Doğrulaması",
"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." => "Kullanıcı kimlik bilgileri bu adrese gönderilecek. Bu eklenti yanıtı kontrol edecek ve 401 ile 403 HTTP durum kodlarını geçersiz kimlik bilgileri olarak, diğer yanıtları ise doğru kimlik bilgileri olarak algılayacaktır."
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/build/build.xml b/build/build.xml
index 0f9d3605da1fff084a3da8b87de2331c9b58a73d..265beb4bccfbac929e1ff778a32bd4aa3c18a1fd 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -40,6 +40,26 @@
</fileset>
</apply>
+
+ <!-- this looks for @brief and @returns annotation in PHP files and fails if it found some -->
+ <apply executable="egrep" failonerror="false" resultproperty="grepReturnCode">
+ <arg value="-rsHn" />
+ <arg value="@brief|@returns" />
+
+ <fileset dir="${basedir}/build">
+ <include name="**/*.php" />
+ <exclude name="**/3rdparty/**" />
+ <exclude name="**/l10n/**" />
+ </fileset>
+ </apply>
+
+ <!-- fail if grep has found something -->
+ <fail message="Please remove @returns and @brief annotations for PHPDoc (listed above)">
+ <condition>
+ <equals arg1="0" arg2="${grepReturnCode}"/>
+ </condition>
+ </fail>
+
</target>
<!-- javascript lint -->
diff --git a/config/config.sample.php b/config/config.sample.php
index 708e8367023011dfef041e976424e5822bfdf58a..0a81543589bdc216b88d76c4f5cf856b726d7ff5 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -1,5 +1,11 @@
<?php
+/**
+ * This configuration file is only provided to document the different configuration options and their usage.
+ * DO NOT COMPLETELY BASE YOUR CONFIGURATION FILE ON THIS SAMPLE. THIS MAY BREAK YOUR INSTANCE.
+ * Instead, manually copy configurations' switches that you consider important for your instance to your configuration.
+ */
+
/* Only enable this for local development and not in productive environments */
/* This will disable the minifier and outputs some additional debug informations */
define("DEBUG", true);
@@ -283,5 +289,17 @@ $CONFIG = array(
* cache directory and "$user" is the user.
*
*/
-'cache_path' => ''
+'cache_path' => '',
+
+/*
+ * specifies how often the filesystem is checked for changes made outside owncloud
+ * 0 -> never check the filesystem for outside changes, provides a performance increase when it's certain that no changes are made directly to the filesystem
+ * 1 -> check each file or folder at most once per request, recomended for general use if outside changes might happen
+ * 2 -> check every time the filesystem is used, causes a performance hit when using external storages, not recomended for regular use
+ */
+'filesystem_check_changes' => 1,
+
+/* If true, prevent owncloud from changing the cache due to changes in the filesystem for all storage */
+'filesystem_cache_readonly' => false,
+
);
diff --git a/console.php b/console.php
index dd2c1026e477ef1d345062517204db0d712961db..55bae7a6b38b5679f8936ae83a2f0579b7f7fc96 100644
--- a/console.php
+++ b/console.php
@@ -8,29 +8,34 @@
use Symfony\Component\Console\Application;
-require_once 'lib/base.php';
+try {
+ require_once 'lib/base.php';
-// Don't do anything if ownCloud has not been installed yet
-if (!OC_Config::getValue('installed', false)) {
- echo "Console can only be used once ownCloud has been installed" . PHP_EOL;
- exit(0);
-}
+ // Don't do anything if ownCloud has not been installed yet
+ if (!\OC::$server->getConfig()->getSystemValue('installed', false)) {
+ echo "Console can only be used once ownCloud has been installed" . PHP_EOL;
+ exit(0);
+ }
-if (!OC::$CLI) {
- echo "This script can be run from the command line only" . PHP_EOL;
- exit(0);
-}
+ if (!OC::$CLI) {
+ echo "This script can be run from the command line only" . PHP_EOL;
+ exit(0);
+ }
-// load all apps to get all api routes properly setup
-OC_App::loadApps();
+ // load all apps to get all api routes properly setup
+ OC_App::loadApps();
-$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;
+ $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();
+} catch (Exception $ex) {
+ echo "An unhandled exception has been thrown:" . PHP_EOL;
+ echo $ex;
}
-$application->run();
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 2b41bd8a5da17fb8693f50c658d3e6dd77db546b..75b749a5b0718bac6218ba53dd56eafa22e90e30 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -41,7 +41,8 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
$shareType,
$shareWith,
$_POST['permissions'],
- $_POST['itemSourceName']
+ $_POST['itemSourceName'],
+ (!empty($_POST['expirationDate']) ? new \DateTime($_POST['expirationDate']) : null)
);
if (is_string($token)) {
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 55e8ab15ec22800be2aee0787a990577b21e2269..84d7a21209e4be4225776ab2e53d8e3fddcf90db 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -15,6 +15,14 @@ if (OC::checkUpgrade(false)) {
$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) {
$eventSource->send('success', (string)$l->t('Updated database'));
});
+ $updater->listen('\OC\Updater', 'disabledApps', function ($appList) use ($eventSource, $l) {
+ $list = array();
+ foreach ($appList as $appId) {
+ $info = OC_App::getAppInfo($appId);
+ $list[] = $info['name'] . ' (' . $info['id'] . ')';
+ }
+ $eventSource->send('success', (string)$l->t('Disabled incompatible apps: %s', implode(', ', $list)));
+ });
$updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource) {
$eventSource->send('failure', $message);
$eventSource->close();
diff --git a/core/avatar/controller.php b/core/avatar/controller.php
index 22693824461d70fe87d8c1c0ee13db9bbce0621e..06efbec3f3ca2e658cf287d7a44fcd98a63e5aa1 100644
--- a/core/avatar/controller.php
+++ b/core/avatar/controller.php
@@ -71,7 +71,7 @@ class Controller {
$image = new \OC_Image($newAvatar);
if ($image->valid()) {
- \OC_Cache::set('tmpavatar', $image->data(), 7200);
+ \OC\Cache::set('tmpavatar', $image->data(), 7200);
\OC_JSON::error(array("data" => "notsquare"));
} else {
$l = new \OC_L10n('core');
@@ -109,7 +109,7 @@ class Controller {
\OC_JSON::checkLoggedIn();
\OC_JSON::callCheck();
- $tmpavatar = \OC_Cache::get('tmpavatar');
+ $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")) ));
@@ -136,7 +136,7 @@ class Controller {
return;
}
- $tmpavatar = \OC_Cache::get('tmpavatar');
+ $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")) ));
@@ -149,7 +149,7 @@ class Controller {
$avatar = new \OC_Avatar($user);
$avatar->set($image->data());
// Clean up
- \OC_Cache::remove('tmpavatar');
+ \OC\Cache::remove('tmpavatar');
\OC_JSON::success();
} catch (\Exception $e) {
\OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php
new file mode 100644
index 0000000000000000000000000000000000000000..39e87853d607dc37a5e4eb3b754f85bdeb995fb6
--- /dev/null
+++ b/core/command/db/converttype.php
@@ -0,0 +1,295 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * Copyright (c) 2014 Andreas Fischer <bantu@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ *
+ */
+
+namespace OC\Core\Command\Db;
+
+use OC\Config;
+use OC\DB\Connection;
+use OC\DB\ConnectionFactory;
+
+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 ConvertType extends Command {
+ /**
+ * @var \OC\Config
+ */
+ protected $config;
+
+ /**
+ * @var \OC\DB\ConnectionFactory
+ */
+ protected $connectionFactory;
+
+ /**
+ * @param \OC\Config $config
+ * @param \OC\DB\ConnectionFactory $connectionFactory
+ */
+ public function __construct(Config $config, ConnectionFactory $connectionFactory) {
+ $this->config = $config;
+ $this->connectionFactory = $connectionFactory;
+ parent::__construct();
+ }
+
+ protected function configure() {
+ $this
+ ->setName('db:convert-type')
+ ->setDescription('Convert the ownCloud database to the newly configured one')
+ ->addArgument(
+ 'type',
+ InputArgument::REQUIRED,
+ 'the type of the database to convert to'
+ )
+ ->addArgument(
+ 'username',
+ InputArgument::REQUIRED,
+ 'the username of the database to convert to'
+ )
+ ->addArgument(
+ 'hostname',
+ InputArgument::REQUIRED,
+ 'the hostname of the database to convert to'
+ )
+ ->addArgument(
+ 'database',
+ InputArgument::REQUIRED,
+ 'the name of the database to convert to'
+ )
+ ->addOption(
+ 'port',
+ null,
+ InputOption::VALUE_REQUIRED,
+ 'the port of the database to convert to'
+ )
+ ->addOption(
+ 'password',
+ null,
+ InputOption::VALUE_REQUIRED,
+ 'the password of the database to convert to. Will be asked when not specified. Can also be passed via stdin.'
+ )
+ ->addOption(
+ 'clear-schema',
+ null,
+ InputOption::VALUE_NONE,
+ 'remove all tables from the destination database'
+ )
+ ->addOption(
+ 'all-apps',
+ null,
+ InputOption::VALUE_NONE,
+ 'whether to create schema for all apps instead of only installed apps'
+ )
+ ;
+ }
+
+ protected function validateInput(InputInterface $input, OutputInterface $output) {
+ $type = $this->connectionFactory->normalizeType($input->getArgument('type'));
+ if ($type === 'sqlite3') {
+ throw new \InvalidArgumentException(
+ 'Converting to SQLite (sqlite3) is currently not supported.'
+ );
+ }
+ if ($type === 'mssql') {
+ throw new \InvalidArgumentException(
+ 'Converting to Microsoft SQL Server (mssql) is currently not supported.'
+ );
+ }
+ if ($type === $this->config->getValue('dbtype', '')) {
+ throw new \InvalidArgumentException(sprintf(
+ 'Can not convert from %1$s to %1$s.',
+ $type
+ ));
+ }
+ if ($type === 'oci' && $input->getOption('clear-schema')) {
+ // Doctrine unconditionally tries (at least in version 2.3)
+ // to drop sequence triggers when dropping a table, even though
+ // such triggers may not exist. This results in errors like
+ // "ORA-04080: trigger 'OC_STORAGES_AI_PK' does not exist".
+ throw new \InvalidArgumentException(
+ 'The --clear-schema option is not supported when converting to Oracle (oci).'
+ );
+ }
+ }
+
+ protected function readPassword(InputInterface $input, OutputInterface $output) {
+ // Explicitly specified password
+ if ($input->getOption('password')) {
+ return;
+ }
+
+ // Read from stdin. stream_set_blocking is used to prevent blocking
+ // when nothing is passed via stdin.
+ stream_set_blocking(STDIN, 0);
+ $password = file_get_contents('php://stdin');
+ stream_set_blocking(STDIN, 1);
+ if (trim($password) !== '') {
+ $input->setOption('password', $password);
+ return;
+ }
+
+ // Read password by interacting
+ if ($input->isInteractive()) {
+ /** @var $dialog \Symfony\Component\Console\Helper\DialogHelper */
+ $dialog = $this->getHelperSet()->get('dialog');
+ $password = $dialog->askHiddenResponse(
+ $output,
+ '<question>What is the database password?</question>',
+ false
+ );
+ $input->setOption('password', $password);
+ return;
+ }
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output) {
+ $this->validateInput($input, $output);
+ $this->readPassword($input, $output);
+
+ $fromDB = \OC_DB::getConnection();
+ $toDB = $this->getToDBConnection($input, $output);
+
+ if ($input->getOption('clear-schema')) {
+ $this->clearSchema($toDB, $input, $output);
+ }
+
+ $this->createSchema($toDB, $input, $output);
+
+ $toTables = $this->getTables($toDB);
+ $fromTables = $this->getTables($fromDB);
+
+ // warn/fail if there are more tables in 'from' database
+ $extraFromTables = array_diff($fromTables, $toTables);
+ if (!empty($extraFromTables)) {
+ $output->writeln('<comment>The following tables will not be converted:</comment>');
+ $output->writeln($extraFromTables);
+ if (!$input->getOption('all-apps')) {
+ $output->writeln('<comment>Please note that tables belonging to available but currently not installed apps</comment>');
+ $output->writeln('<comment>can be included by specifying the --all-apps option.</comment>');
+ }
+ /** @var $dialog \Symfony\Component\Console\Helper\DialogHelper */
+ $dialog = $this->getHelperSet()->get('dialog');
+ if (!$dialog->askConfirmation(
+ $output,
+ '<question>Continue with the conversion?</question>',
+ false
+ )) {
+ return;
+ }
+ }
+ $intersectingTables = array_intersect($toTables, $fromTables);
+ $this->convertDB($fromDB, $toDB, $intersectingTables, $input, $output);
+ }
+
+ protected function createSchema(Connection $toDB, InputInterface $input, OutputInterface $output) {
+ $output->writeln('<info>Creating schema in new database</info>');
+ $schemaManager = new \OC\DB\MDB2SchemaManager($toDB);
+ $schemaManager->createDbFromStructure(\OC::$SERVERROOT.'/db_structure.xml');
+ $apps = $input->getOption('all-apps') ? \OC_App::getAllApps() : \OC_App::getEnabledApps();
+ foreach($apps as $app) {
+ if (file_exists(\OC_App::getAppPath($app).'/appinfo/database.xml')) {
+ $schemaManager->createDbFromStructure(\OC_App::getAppPath($app).'/appinfo/database.xml');
+ }
+ }
+ }
+
+ protected function getToDBConnection(InputInterface $input, OutputInterface $output) {
+ $type = $input->getArgument('type');
+ $connectionParams = array(
+ 'host' => $input->getArgument('hostname'),
+ 'user' => $input->getArgument('username'),
+ 'password' => $input->getOption('password'),
+ 'dbname' => $input->getArgument('database'),
+ 'tablePrefix' => $this->config->getValue('dbtableprefix', 'oc_'),
+ );
+ if ($input->getOption('port')) {
+ $connectionParams['port'] = $input->getOption('port');
+ }
+ return $this->connectionFactory->getConnection($type, $connectionParams);
+ }
+
+ protected function clearSchema(Connection $db, InputInterface $input, OutputInterface $output) {
+ $toTables = $this->getTables($db);
+ if (!empty($toTables)) {
+ $output->writeln('<info>Clearing schema in new database</info>');
+ }
+ foreach($toTables as $table) {
+ $db->getSchemaManager()->dropTable($table);
+ }
+ }
+
+ protected function getTables(Connection $db) {
+ return $db->getSchemaManager()->listTableNames();
+ }
+
+ protected function copyTable(Connection $fromDB, Connection $toDB, $table, InputInterface $input, OutputInterface $output) {
+ /** @var $progress \Symfony\Component\Console\Helper\ProgressHelper */
+ $progress = $this->getHelperSet()->get('progress');
+ $query = 'SELECT COUNT(*) FROM '.$table;
+ $count = $fromDB->fetchColumn($query);
+ $query = 'SELECT * FROM '.$table;
+ $statement = $fromDB->executeQuery($query);
+ $progress->start($output, $count);
+ $progress->setRedrawFrequency($count > 100 ? 5 : 1);
+ while($row = $statement->fetch()) {
+ $progress->advance();
+ if ($input->getArgument('type') === 'oci') {
+ $data = $row;
+ } else {
+ $data = array();
+ foreach ($row as $columnName => $value) {
+ $data[$toDB->quoteIdentifier($columnName)] = $value;
+ }
+ }
+ $toDB->insert($table, $data);
+ }
+ $progress->finish();
+ }
+
+ protected function convertDB(Connection $fromDB, Connection $toDB, array $tables, InputInterface $input, OutputInterface $output) {
+ $this->config->setValue('maintenance', true);
+ try {
+ // copy table rows
+ foreach($tables as $table) {
+ $output->writeln($table);
+ $this->copyTable($fromDB, $toDB, $table, $input, $output);
+ }
+ if ($input->getArgument('type') === 'pgsql') {
+ $tools = new \OC\DB\PgSqlTools;
+ $tools->resynchronizeDatabaseSequences($toDB);
+ }
+ // save new database config
+ $this->saveDBInfo($input);
+ } catch(\Exception $e) {
+ $this->config->setValue('maintenance', false);
+ throw $e;
+ }
+ $this->config->setValue('maintenance', false);
+ }
+
+ protected function saveDBInfo(InputInterface $input) {
+ $type = $input->getArgument('type');
+ $username = $input->getArgument('username');
+ $dbhost = $input->getArgument('hostname');
+ $dbname = $input->getArgument('database');
+ $password = $input->getOption('password');
+ if ($input->getOption('port')) {
+ $dbhost .= ':'.$input->getOption('port');
+ }
+
+ $this->config->setValue('dbtype', $type);
+ $this->config->setValue('dbname', $dbname);
+ $this->config->setValue('dbhost', $dbhost);
+ $this->config->setValue('dbuser', $username);
+ $this->config->setValue('dbpassword', $password);
+ }
+}
diff --git a/core/command/maintenance/mode.php b/core/command/maintenance/mode.php
new file mode 100644
index 0000000000000000000000000000000000000000..f26a11384a88a2c39c893ffc188118cb28f24add
--- /dev/null
+++ b/core/command/maintenance/mode.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> and
+ * Copyright (c) 2014 Stephen Colebrook <scolebrook@mac.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Core\Command\Maintenance;
+
+use OC\Config;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Mode extends Command {
+
+ protected $config;
+
+ public function __construct(Config $config) {
+ $this->config = $config;
+ parent::__construct();
+ }
+
+ protected function configure() {
+ $this
+ ->setName('maintenance:mode')
+ ->setDescription('set maintenance mode')
+ ->addOption(
+ 'on',
+ null,
+ InputOption::VALUE_NONE,
+ 'enable maintenance mode'
+ )
+ ->addOption(
+ 'off',
+ null,
+ InputOption::VALUE_NONE,
+ 'disable maintenance mode'
+ );
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output) {
+ if ($input->getOption('on')) {
+ $this->config->setValue('maintenance', true);
+ $output->writeln('Maintenance mode enabled');
+ } elseif ($input->getOption('off')) {
+ $this->config->setValue('maintenance', false);
+ $output->writeln('Maintenance mode disabled');
+ } else {
+ if ($this->config->getValue('maintenance', false)) {
+ $output->writeln('Maintenance mode is currently enabled');
+ } else {
+ $output->writeln('Maintenance mode is currently disabled');
+ }
+ }
+ }
+}
diff --git a/core/command/maintenance/repair.php b/core/command/maintenance/repair.php
index c5ef0c55cc04b71337c4421e940d797526f88d98..310c01fbe2a36da13dcfbe075bfd2c87e02219a7 100644
--- a/core/command/maintenance/repair.php
+++ b/core/command/maintenance/repair.php
@@ -29,7 +29,7 @@ class Repair extends Command {
protected function configure() {
$this
->setName('maintenance:repair')
- ->setDescription('set single user mode');
+ ->setDescription('repair this installation');
}
protected function execute(InputInterface $input, OutputInterface $output) {
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index ed72d136e24b3c461dd4bcbafe029d80171b0065..8ce8ef9b6e5e4b9753bba37d6d2c1bb0c3f8e489 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -56,6 +56,9 @@ class Upgrade extends Command {
$updater->listen('\OC\Updater', 'dbUpgrade', function () use($output) {
$output->writeln('<info>Updated database</info>');
});
+ $updater->listen('\OC\Updater', 'disabledApps', function ($appList) use($output) {
+ $output->writeln('<info>Disabled incompatible apps: ' . implode(', ', $appList) . '</info>');
+ });
$updater->listen('\OC\Updater', 'failure', function ($message) use($output) {
$output->writeln($message);
diff --git a/core/command/user/lastseen.php b/core/command/user/lastseen.php
new file mode 100644
index 0000000000000000000000000000000000000000..7a8db013e3ac363d78b9754df3da333178e77e29
--- /dev/null
+++ b/core/command/user/lastseen.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright (c) 2014 Arthur Schiwon <blizzz@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Core\Command\User;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+
+class LastSeen extends Command {
+ protected function configure() {
+ $this
+ ->setName('user:lastseen')
+ ->setDescription('shows when the user was logged it last time')
+ ->addArgument(
+ 'uid',
+ InputArgument::REQUIRED,
+ 'the username'
+ );
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output) {
+ $userManager = \OC::$server->getUserManager();
+ $user = $userManager->get($input->getArgument('uid'));
+ if(is_null($user)) {
+ $output->writeln('User does not exist');
+ return;
+ }
+
+ $lastLogin = $user->getLastLogin();
+ if($lastLogin === 0) {
+ $output->writeln('User ' . $user->getUID() .
+ ' has never logged in, yet.');
+ } else {
+ $date = new \DateTime();
+ $date->setTimestamp($lastLogin);
+ $output->writeln($user->getUID() .
+ '`s last login: ' . $date->format('d.m.Y H:i'));
+ }
+ }
+}
diff --git a/core/command/user/resetpassword.php b/core/command/user/resetpassword.php
new file mode 100644
index 0000000000000000000000000000000000000000..d7893c291e4a1ddb2003beb3e6bfef875fe09a2b
--- /dev/null
+++ b/core/command/user/resetpassword.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright (c) 2014 Christopher Schäpers <christopher@schaepers.it>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Core\Command\User;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ResetPassword extends Command {
+
+ /** @var \OC\User\Manager */
+ protected $userManager;
+
+ public function __construct(\OC\User\Manager $userManager) {
+ $this->userManager = $userManager;
+ parent::__construct();
+ }
+
+ protected function configure() {
+ $this
+ ->setName('user:resetpassword')
+ ->setDescription('Resets the password of the named user')
+ ->addArgument(
+ 'user',
+ InputArgument::REQUIRED,
+ 'Username to reset password'
+ )
+ ;
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output) {
+ $username = $input->getArgument('user');
+
+ /** @var $user \OC\User\User */
+ $user = $this->userManager->get($username);
+ if (is_null($user)) {
+ $output->writeln("<error>There is no user called " . $username . "</error>");
+ return 1;
+ }
+
+ if ($input->isInteractive()) {
+ /** @var $dialog \Symfony\Component\Console\Helper\DialogHelper */
+ $dialog = $this->getHelperSet()->get('dialog');
+ $password = $dialog->askHiddenResponse(
+ $output,
+ '<question>Enter a new password: </question>',
+ false
+ );
+ $confirm = $dialog->askHiddenResponse(
+ $output,
+ '<question>Confirm the new password: </question>',
+ false
+ );
+
+ if ($password === $confirm) {
+ $success = $user->setPassword($password);
+ if ($success) {
+ $output->writeln("<info>Successfully reset password for " . $username . "</info>");
+ } else {
+ $output->writeln("<error>Error while resetting password!</error>");
+ return 1;
+ }
+ } else {
+ $output->writeln("<error>Passwords did not match!</error>");
+ return 1;
+ }
+ } else {
+ $output->writeln("<error>Interactive input is needed for entering a new password!</error>");
+ return 1;
+ }
+ }
+}
diff --git a/core/css/apps.css b/core/css/apps.css
index a0bb262854dcbbb4ca97b03cc911021649cd5aa0..377878467c0be2f8c84abe06d8f108bfb83e8162 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -178,6 +178,9 @@
bottom: 0;
border-top: 1px solid #ccc;
}
+#app-settings.opened #app-settings-content {
+ display: block;
+}
#app-settings-header {
background-color: #eee;
}
diff --git a/core/css/fixes.css b/core/css/fixes.css
index a33afd5cf77f945c9c007057d99ee097e6cba78e..91267c276ae72573c6bc444f812d4c0874d94a7f 100644
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -5,11 +5,31 @@
border: 0;
}
+/* fix height of select boxes for OS X */
+select {
+ min-height: 29px;
+}
+
.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');
}
+.lte9 .icon-triangle-e {
+ background-image: url('../img/actions/triangle-e.png');
+}
+.lte9 .icon-triangle-n {
+ background-image: url('../img/actions/triangle-n.png');
+}
+.lte9 .icon-triangle-s {
+ background-image: url('../img/actions/triangle-s.png');
+}
+.lte9 .icon-settings,
+.lte9 .settings-button {
+ background-image: url('../img/actions/settings.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 */
diff --git a/core/css/icons.css b/core/css/icons.css
index cdfdd8e43efca459088faa661518ffadde41b212..75d66a773a1e4c83c8135c0a55f0275d31b346ae 100644
--- a/core/css/icons.css
+++ b/core/css/icons.css
@@ -22,11 +22,6 @@
background-image: url('../img/loading-small.gif');
}
-.icon-noise {
- background-image: url('../img/noise.png');
- background-repeat: repeat;
-}
-
diff --git a/core/css/mobile.css b/core/css/mobile.css
index fd0628d7e28150169d8b6211cb9dd8b84a088739..018526130622419bdc67792ea88fc95c665d76b2 100644
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -1,5 +1,26 @@
@media only screen and (max-width: 768px) {
+#body-login #header {
+ padding-top: 10px;
+}
+
+#body-login .wrapper {
+ display: -webkit-box;
+ -webkit-box-orient: horizontal;
+ -webkit-box-pack: center;
+ -webkit-box-align: center;
+
+ display: -moz-box;
+ -moz-box-orient: horizontal;
+ -moz-box-pack: center;
+ -moz-box-align: center;
+
+ display: box;
+ box-orient: horizontal;
+ box-pack: center;
+ box-align: center;
+}
+
/* show caret indicator next to logo to make clear it is tappable */
#owncloud.menutoggle {
background-image: url('../img/actions/caret.svg');
diff --git a/core/css/multiselect.css b/core/css/multiselect.css
index 8d949e7cdb7fd4b6e17fa22c09714921df80234a..b3393c450d481ad0af261897d0d692f42cd92485 100644
--- a/core/css/multiselect.css
+++ b/core/css/multiselect.css
@@ -50,7 +50,7 @@ ul.multiselectoptions > li input[type='checkbox']:checked+label {
div.multiselect, select.multiselect {
display: inline-block;
- max-width: 400px;
+ max-width: 200px;
min-width: 150px;
padding-right: 10px;
min-height: 20px;
diff --git a/core/css/share.css b/core/css/share.css
index 4ae3b77757e68fdd5ccfd6bee88728cb54760f7e..1527a3a0c0fdf07def2bb9295bac976e05ea506d 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -11,7 +11,7 @@
margin-right:112px;
position:absolute;
right:0;
- width:320px;
+ width:420px;
z-index:500;
padding:16px;
}
diff --git a/core/css/styles.css b/core/css/styles.css
index 26aaa1be944c6f0b2c08177d552d81a408dbef7d..4a84568244ca661110dd12a91860d27807922427 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -33,7 +33,7 @@ body {
z-index: 100;
height: 45px;
line-height: 2.5em;
- background: #1d2d44 url('../img/noise.png') repeat;
+ background-color: #1d2d44;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
@@ -41,12 +41,12 @@ body {
#body-login {
text-align: center;
background: #1d2d44; /* Old browsers */
- background: url('../img/noise.png'), -moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */
- background: url('../img/noise.png'), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */
- background: url('../img/noise.png'), -webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */
- background: url('../img/noise.png'), -o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */
- background: url('../img/noise.png'), -ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */
- background: url('../img/noise.png'), linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */
+ background: -moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */
+ background: -ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */
+ background: linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */
}
@@ -204,10 +204,26 @@ input img, button img, .button img {
}
+/* prevent ugly selection effect on accidental selection */
+#header,
+#navigation,
+#expanddiv {
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+}
+
+
/* SCROLLING */
-::-webkit-scrollbar { width:8px; }
-::-webkit-scrollbar-track-piece { background-color:transparent; }
-::-webkit-scrollbar-thumb { background:#ddd; }
+::-webkit-scrollbar {
+ width: 8px;
+}
+::-webkit-scrollbar-track-piece {
+ background-color: transparent;
+}
+::-webkit-scrollbar-thumb {
+ background: #ccc;
+}
/* BUTTONS */
@@ -352,9 +368,9 @@ input[type="submit"].enabled {
#body-login #header {
padding-top: 100px;
}
-/* Fix background gradient */
#body-login {
- background-attachment: fixed;
+ background-attachment: fixed; /* fix background gradient */
+ height: 100%; /* fix sticky footer */
}
/* Dark subtle label text */
@@ -370,6 +386,16 @@ input[type="submit"].enabled {
opacity: .6;
}
+#body-login .update h2 {
+ font-weight: bold;
+ font-size: 18px;
+ margin-bottom: 30px;
+}
+
+#body-login .infogroup {
+ margin-bottom: 15px;
+}
+
#body-login p#message img {
vertical-align: middle;
padding: 5px;
@@ -699,12 +725,10 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
width: 80px;
margin-top:45px;
z-index: 75;
- background: #383c43 url('../img/noise.png') repeat;
+ background-color: #383c43;
overflow-y: auto;
overflow-x: hidden;
-moz-box-sizing:border-box; box-sizing:border-box;
- /* prevent ugly selection effect on accidental selection */
- -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;
}
#apps {
height: 100%;
@@ -791,12 +815,10 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
#expand:hover img, #expand:focus img, #expand:active img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
#expanddiv {
position:absolute; right:0; top:45px; z-index:76; display:none;
- background:#383c43 url('../img/noise.png') repeat;
+ background-color: #383c43;
border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid;
box-shadow:0 0 7px rgb(29,45,68);
-moz-box-sizing: border-box; box-sizing: border-box;
- /* prevent ugly selection effect on accidental selection */
- -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;
}
#expanddiv a {
display: block;
diff --git a/core/img/noise.png b/core/img/noise.png
deleted file mode 100644
index 6c06c8a4d6d0874e78211acbafcf0ca9e77a7017..0000000000000000000000000000000000000000
Binary files a/core/img/noise.png and /dev/null differ
diff --git a/core/img/places/folder.svg b/core/img/places/folder.svg
index edc9e7e208a10d0a8266cadf5a14eccc9aa4dec5..7ac5d6ddf5dcc571cb42d8384b9a07cc73dac350 100644
--- a/core/img/places/folder.svg
+++ b/core/img/places/folder.svg
@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs>
- <linearGradient id="a" y2="1013.5" gradientUnits="userSpaceOnUse" y1="998.46" x2="209.34" x1="209.34">
+ <linearGradient id="a" y2="1013.5" gradientUnits="userSpaceOnUse" x2="209.34" y1="998.46" x1="209.34">
<stop offset="0"/>
<stop stop-color="#363636" offset="1"/>
</linearGradient>
</defs>
- <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
<g transform="translate(-7.5118e-7 40)" fill-rule="evenodd">
<g opacity=".6" transform="matrix(.86667 0 0 .86667 -172.04 -903.43)" fill="#fff">
- <path fill="#fff" d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd"/>
+ <path fill-rule="evenodd" d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill="#fff"/>
</g>
<g opacity=".7" transform="matrix(.86667 0 0 .86667 -172.04 -904.43)" fill="url(#a)">
- <path fill="url(#a)" d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd"/>
+ <path fill-rule="evenodd" d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill="url(#a)"/>
</g>
</g>
</svg>
diff --git a/core/js/config.php b/core/js/config.php
index 7e23f3e2e41bf686aa94c174047bff2b6424786f..80b1b6d242d6f776d335fcf9c911234b8ae55597 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -25,6 +25,13 @@ foreach(OC_App::getEnabledApps() as $app) {
$apps_paths[$app] = OC_App::getAppWebPath($app);
}
+$defaultExpireDateEnabled = \OCP\Config::getAppValue('core', 'shareapi_default_expire_date', 'no');
+$defaultExpireDate = $enforceDefaultExpireDate = null;
+if ($defaultExpireDateEnabled === 'yes') {
+ $defaultExpireDate = \OCP\Config::getAppValue('core', 'shareapi_expire_after_n_days', '7');
+ $enforceDefaultExpireDate = \OCP\Config::getAppValue('core', 'shareapi_enforce_expire_date', 'no');
+}
+
$array = array(
"oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false',
"oc_isadmin" => OC_User::isAdminUser(OC_User::getUser()) ? 'true' : 'false',
@@ -67,6 +74,16 @@ $array = array(
'versionstring' => OC_Util::getVersionString(),
)
),
+ "oc_appconfig" => json_encode(
+ array("core" => array(
+ 'defaultExpireDateEnabled' => $defaultExpireDateEnabled,
+ 'defaultExpireDate' => $defaultExpireDate,
+ 'defaultExpireDateEnforced' => $enforceDefaultExpireDate,
+ 'enforcePasswordForPublicLink' => \OCP\Util::isPublicLinkPasswordRequired(),
+ 'sharingDisabledForUser' => \OCP\Util::isSharingDisabledForUser(),
+ )
+ )
+ ),
"oc_defaults" => json_encode(
array(
'entity' => $defaults->getEntity(),
diff --git a/core/js/core.json b/core/js/core.json
index 05c2a17a679839dbb7e57fb7de2c322c18ef56de..f1e0ba883d0f0d9378cabacab46303c2307edaa1 100644
--- a/core/js/core.json
+++ b/core/js/core.json
@@ -14,6 +14,7 @@
"jquery.ocdialog.js",
"oc-dialogs.js",
"js.js",
+ "share.js",
"octemplate.js",
"eventsource.js",
"config.js",
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index 02cd6ac146635895de58127b0f38a03b0d1a88eb..e2433f5f9804a41518f621379456ff346606df8f 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -67,8 +67,8 @@
self.parent = self.$dialog.parent().length > 0 ? self.$dialog.parent() : $('body');
var pos = self.parent.position();
self.$dialog.css({
- left: pos.left + (self.parent.width() - self.$dialog.outerWidth())/2,
- top: pos.top + (self.parent.height() - self.$dialog.outerHeight())/2
+ left: pos.left + ($(window).innerWidth() - self.$dialog.outerWidth())/2,
+ top: pos.top + ($(window).innerHeight() - self.$dialog.outerHeight())/2
});
});
@@ -160,10 +160,16 @@
}
this.parent = this.$dialog.parent().length > 0 ? this.$dialog.parent() : $('body');
content_height = Math.min(content_height, this.parent.height()-20);
- this.element.css({
- height: content_height + 'px',
- width: this.$dialog.innerWidth()-20 + 'px'
- });
+ if (content_height> 0) {
+ this.element.css({
+ height: content_height + 'px',
+ width: this.$dialog.innerWidth()-20 + 'px'
+ });
+ } else {
+ this.element.css({
+ width : this.$dialog.innerWidth() - 20 + 'px'
+ });
+ }
},
_createOverlay: function() {
if(!this.options.modal) {
diff --git a/core/js/js.js b/core/js/js.js
index 27bc3c651e33125ef27986314b3576df4ac27477..e31f67cca9cf028222d235115822da2ac14bceed 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -175,9 +175,13 @@ var OC={
PERMISSION_DELETE:8,
PERMISSION_SHARE:16,
PERMISSION_ALL:31,
+ /* jshint camelcase: false */
webroot:oc_webroot,
appswebroots:(typeof oc_appswebroots !== 'undefined') ? oc_appswebroots:false,
currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false,
+ config: oc_config,
+ appConfig: oc_appconfig || {},
+ theme: oc_defaults || {},
coreApps:['', 'admin','log','search','settings','core','3rdparty'],
/**
@@ -207,7 +211,16 @@ var OC={
linkToRemote:function(service) {
return window.location.protocol + '//' + window.location.host + OC.linkToRemoteBase(service);
},
-
+
+ /**
+ * Gets the base path for the given OCS API service.
+ * @param {string} service name
+ * @return {string} OCS API base path
+ */
+ linkToOCS: function(service) {
+ return window.location.protocol + '//' + window.location.host + OC.webroot + '/ocs/v1.php/' + service + '/';
+ },
+
/**
* Generates the absolute url for the given relative url, which can contain parameters.
* @param {string} url
@@ -934,39 +947,6 @@ function object(o) {
return new F();
}
-/**
- * Fills height of window. (more precise than height: 100%;)
- * @param selector
- */
-function fillHeight(selector) {
- if (selector.length === 0) {
- return;
- }
- var height = parseFloat($(window).height())-selector.offset().top;
- selector.css('height', height + 'px');
- if(selector.outerHeight() > selector.height()){
- selector.css('height', height-(selector.outerHeight()-selector.height()) + 'px');
- }
- console.warn("This function is deprecated! Use CSS instead");
-}
-
-/**
- * Fills height and width of window. (more precise than height: 100%; or width: 100%;)
- * @param selector
- */
-function fillWindow(selector) {
- if (selector.length === 0) {
- return;
- }
- fillHeight(selector);
- var width = parseFloat($(window).width())-selector.offset().left;
- selector.css('width', width + 'px');
- if(selector.outerWidth() > selector.width()){
- selector.css('width', width-(selector.outerWidth()-selector.width()) + 'px');
- }
- console.warn("This function is deprecated! Use CSS instead");
-}
-
/**
* Initializes core
*/
@@ -1270,7 +1250,7 @@ OC.Util = {
* @return {string} fixed image path with png extension if SVG is not supported
*/
replaceSVGIcon: function(file) {
- if (!OC.Util.hasSVGSupport()) {
+ if (file && !OC.Util.hasSVGSupport()) {
var i = file.lastIndexOf('.svg');
if (i >= 0) {
file = file.substr(0, i) + '.png' + file.substr(i+4);
@@ -1318,6 +1298,114 @@ OC.Util = {
}
};
+/**
+ * Utility class for the history API,
+ * includes fallback to using the URL hash when
+ * the browser doesn't support the history API.
+ */
+OC.Util.History = {
+ _handlers: [],
+
+ /**
+ * Push the current URL parameters to the history stack
+ * and change the visible URL.
+ * Note: this includes a workaround for IE8/IE9 that uses
+ * the hash part instead of the search part.
+ *
+ * @param params to append to the URL, can be either a string
+ * or a map
+ */
+ pushState: function(params) {
+ var strParams;
+ if (typeof(params) === 'string') {
+ strParams = params;
+ }
+ else {
+ strParams = OC.buildQueryString(params);
+ }
+ if (window.history.pushState) {
+ var url = location.pathname + '?' + strParams;
+ window.history.pushState(params, '', url);
+ }
+ // use URL hash for IE8
+ else {
+ window.location.hash = '?' + strParams;
+ // inhibit next onhashchange that just added itself
+ // to the event queue
+ this._cancelPop = true;
+ }
+ },
+
+ /**
+ * Add a popstate handler
+ *
+ * @param handler function
+ */
+ addOnPopStateHandler: function(handler) {
+ this._handlers.push(handler);
+ },
+
+ /**
+ * Parse a query string from the hash part of the URL.
+ * (workaround for IE8 / IE9)
+ */
+ _parseHashQuery: function() {
+ var hash = window.location.hash,
+ pos = hash.indexOf('?');
+ if (pos >= 0) {
+ return hash.substr(pos + 1);
+ }
+ return '';
+ },
+
+ _decodeQuery: function(query) {
+ return query.replace(/\+/g, ' ');
+ },
+
+ /**
+ * Parse the query/search part of the URL.
+ * Also try and parse it from the URL hash (for IE8)
+ *
+ * @return map of parameters
+ */
+ parseUrlQuery: function() {
+ var query = this._parseHashQuery(),
+ params;
+ // try and parse from URL hash first
+ if (query) {
+ params = OC.parseQueryString(this._decodeQuery(query));
+ }
+ // else read from query attributes
+ if (!params) {
+ params = OC.parseQueryString(this._decodeQuery(location.search));
+ }
+ return params || {};
+ },
+
+ _onPopState: function(e) {
+ if (this._cancelPop) {
+ this._cancelPop = false;
+ return;
+ }
+ var params;
+ if (!this._handlers.length) {
+ return;
+ }
+ params = (e && e.state) || this.parseUrlQuery() || {};
+ for (var i = 0; i < this._handlers.length; i++) {
+ this._handlers[i](params);
+ }
+ }
+};
+
+// fallback to hashchange when no history support
+if (window.history.pushState) {
+ window.onpopstate = _.bind(OC.Util.History._onPopState, OC.Util.History);
+}
+else {
+ $(window).on('hashchange', _.bind(OC.Util.History._onPopState, OC.Util.History));
+}
+
/**
* Get a variable by name
* @param {string} name
@@ -1367,6 +1455,11 @@ OC.set=function(name, value) {
}
})();
+/**
+ * Namespace for apps
+ */
+window.OCA = {};
+
/**
* select a range in an input field
* @link http://stackoverflow.com/questions/499126/jquery-set-cursor-position-in-text-area
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 11833f12e2d108118533aa5fbf88c6edfda475a2..54b9442af27e985dbc7bf733281e91c0f601a44c 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -19,7 +19,7 @@
*
*/
-/* global OC, t, alert */
+/* global OC, t, alert, $ */
/**
* this class to ease the usage of jquery dialogs
@@ -61,6 +61,65 @@ var OCdialogs = {
confirm:function(text, title, callback, modal) {
this.message(text, title, 'notice', OCdialogs.YES_NO_BUTTONS, callback, modal);
},
+ /**
+ * displays prompt dialog
+ * @param text content of dialog
+ * @param title dialog title
+ * @param callback which will be triggered when user presses YES or NO
+ * (true or false would be passed to callback respectively)
+ * @param modal make the dialog modal
+ * @param name name of the input field
+ * @param password whether the input should be a password input
+ */
+ prompt: function (text, title, callback, modal, name, password) {
+ $.when(this._getMessageTemplate()).then(function ($tmpl) {
+ var dialogName = 'oc-dialog-' + OCdialogs.dialogsCounter + '-content';
+ var dialogId = '#' + dialogName;
+ var $dlg = $tmpl.octemplate({
+ dialog_name: dialogName,
+ title : title,
+ message : text,
+ type : 'notice'
+ });
+ var input = $('<input/>');
+ input.attr('type', password ? 'password' : 'text').attr('id', dialogName + '-input');
+ var label = $('<label/>').attr('for', dialogName + '-input').text(name + ': ');
+ $dlg.append(label);
+ $dlg.append(input);
+ if (modal === undefined) {
+ modal = false;
+ }
+ $('body').append($dlg);
+ var buttonlist = [
+ {
+ text : t('core', 'Yes'),
+ click : function () {
+ if (callback !== undefined) {
+ callback(true, input.val());
+ }
+ $(dialogId).ocdialog('close');
+ },
+ defaultButton: true
+ },
+ {
+ text : t('core', 'No'),
+ click: function () {
+ if (callback !== undefined) {
+ callback(false, input.val());
+ }
+ $(dialogId).ocdialog('close');
+ }
+ }
+ ];
+
+ $(dialogId).ocdialog({
+ closeOnEscape: true,
+ modal : modal,
+ buttons : buttonlist
+ });
+ OCdialogs.dialogsCounter++;
+ });
+ },
/**
* show a file picker to pick a file from
* @param title dialog title
@@ -292,7 +351,7 @@ var OCdialogs = {
conflict.find('.filename').text(original.name);
conflict.find('.original .size').text(humanFileSize(original.size));
- conflict.find('.original .mtime').text(formatDate(original.mtime*1000));
+ conflict.find('.original .mtime').text(formatDate(original.mtime));
// ie sucks
if (replacement.size && replacement.lastModifiedDate) {
conflict.find('.replacement .size').text(humanFileSize(replacement.size));
@@ -315,9 +374,9 @@ var OCdialogs = {
//set more recent mtime bold
// ie sucks
- if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() > original.mtime*1000) {
+ if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() > original.mtime) {
conflict.find('.replacement .mtime').css('font-weight', 'bold');
- } else if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() < original.mtime*1000) {
+ } else if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() < original.mtime) {
conflict.find('.original .mtime').css('font-weight', 'bold');
} else {
//TODO add to same mtime collection?
diff --git a/core/js/share.js b/core/js/share.js
index 2813570f718d91bbce3a8bcc9def35fd18d4ffe6..90f6c7fdc7c46b780c506876cba0c8545d75ad30 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -10,8 +10,11 @@ OC.Share={
* Loads ALL share statuses from server, stores them in OC.Share.statuses then
* calls OC.Share.updateIcons() to update the files "Share" icon to "Shared"
* according to their share status and share type.
+ *
+ * @param itemType item type
+ * @param fileList file list instance, defaults to OCA.Files.App.fileList
*/
- loadIcons:function(itemType) {
+ loadIcons:function(itemType, fileList) {
// Load all share icons
$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemsSharedStatuses', itemType: itemType }, function(result) {
if (result && result.status === 'success') {
@@ -19,7 +22,7 @@ OC.Share={
$.each(result.data, function(item, data) {
OC.Share.statuses[item] = data;
});
- OC.Share.updateIcons(itemType);
+ OC.Share.updateIcons(itemType, fileList);
}
});
},
@@ -27,40 +30,55 @@ OC.Share={
* Updates the files' "Share" icons according to the known
* sharing states stored in OC.Share.statuses.
* (not reloaded from server)
+ *
+ * @param itemType item type
+ * @param fileList file list instance
+ * defaults to OCA.Files.App.fileList
*/
- updateIcons:function(itemType){
+ updateIcons:function(itemType, fileList){
var item;
+ var $fileList;
+ var currentDir;
+ if (!fileList && OCA.Files) {
+ fileList = OCA.Files.App.fileList;
+ }
+ // fileList is usually only defined in the files app
+ if (fileList) {
+ $fileList = fileList.$fileList;
+ currentDir = fileList.getCurrentDirectory();
+ }
for (item in OC.Share.statuses){
+ var image;
var data = OC.Share.statuses[item];
- var hasLink = data['link'];
+ var hasLink = data.link;
// Links override shared in terms of icon display
if (hasLink) {
- var image = OC.imagePath('core', 'actions/public');
+ image = OC.imagePath('core', 'actions/public');
} else {
- var image = OC.imagePath('core', 'actions/shared');
+ image = OC.imagePath('core', 'actions/shared');
}
- if (itemType != 'file' && itemType != 'folder') {
- $('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center');
+ if (itemType !== 'file' && itemType !== 'folder') {
+ $fileList.find('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center');
} else {
- var file = $('tr[data-id="'+item+'"]');
+ var file = $fileList.find('tr[data-id="'+item+'"]');
if (file.length > 0) {
var action = $(file).find('.fileactions .action[data-action="Share"]');
var img = action.find('img').attr('src', image);
action.addClass('permanent');
action.html(' <span>'+t('core', 'Shared')+'</span>').prepend(img);
} else {
- var dir = $('#dir').val();
+ var dir = currentDir;
if (dir.length > 1) {
var last = '';
var path = dir;
// Search for possible parent folders that are shared
while (path != last) {
- if (path == data['path'] && !data['link']) {
- var actions = $('.fileactions .action[data-action="Share"]');
+ if (path === data.path && !data.link) {
+ var actions = $fileList.find('.fileactions .action[data-action="Share"]');
$.each(actions, function(index, action) {
var img = $(action).find('img');
- if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
+ if (img.attr('src') !== OC.imagePath('core', 'actions/public')) {
img.attr('src', image);
$(action).addClass('permanent');
$(action).html(' <span>'+t('core', 'Shared')+'</span>').prepend(img);
@@ -100,14 +118,18 @@ OC.Share={
var file = $('tr').filterAttr('data-id', String(itemSource));
if (file.length > 0) {
var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
- var img = action.find('img').attr('src', image);
- if (shares) {
- action.addClass('permanent');
- action.html(' <span>'+ escapeHTML(t('core', 'Shared'))+'</span>').prepend(img);
- } else {
- action.removeClass('permanent');
- action.html(' <span>'+ escapeHTML(t('core', 'Share'))+'</span>').prepend(img);
- }
+ // in case of multiple lists/rows, there might be more than one visible
+ action.each(function() {
+ var action = $(this);
+ var img = action.find('img').attr('src', image);
+ if (shares) {
+ action.addClass('permanent');
+ action.html(' <span>'+ escapeHTML(t('core', 'Shared'))+'</span>').prepend(img);
+ } else {
+ action.removeClass('permanent');
+ action.html(' <span>'+ escapeHTML(t('core', 'Share'))+'</span>').prepend(img);
+ }
+ });
}
}
if (shares) {
@@ -136,7 +158,21 @@ OC.Share={
return data;
},
- share:function(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, callback) {
+ share:function(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, expirationDate, callback) {
+ // Add a fallback for old share() calls without expirationDate.
+ // We should remove this in a later version,
+ // after the Apps have been updated.
+ if (typeof callback === 'undefined' &&
+ typeof expirationDate === 'function') {
+ callback = expirationDate;
+ expirationDate = '';
+ console.warn(
+ "Call to 'OC.Share.share()' with too few arguments. " +
+ "'expirationDate' was assumed to be 'callback'. " +
+ "Please revisit the call and fix the list of arguments."
+ );
+ }
+
$.post(OC.filePath('core', 'ajax', 'share.php'),
{
action: 'share',
@@ -145,7 +181,8 @@ OC.Share={
shareType: shareType,
shareWith: shareWith,
permissions: permissions,
- itemSourceName: itemSourceName
+ itemSourceName: itemSourceName,
+ expirationDate: expirationDate
}, function (result) {
if (result && result.status === 'success') {
if (callback) {
@@ -219,11 +256,22 @@ OC.Share={
html += '<div id="link">';
html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share link')+'</label>';
html += '<br />';
+
+ var defaultExpireMessage = '';
+ if ((itemType === 'folder' || itemType === 'file') && oc_appconfig.core.defaultExpireDateEnabled === 'yes') {
+ if (oc_appconfig.core.defaultExpireDateEnforced === 'yes') {
+ defaultExpireMessage = t('core', 'The public link will expire no later than {days} days after it is created', {'days': oc_appconfig.core.defaultExpireDate}) + '<br/>';
+ } else {
+ defaultExpireMessage = t('core', 'By default the public link will expire after {days} days', {'days': oc_appconfig.core.defaultExpireDate}) + '<br/>';
+ }
+ }
+
html += '<input id="linkText" type="text" readonly="readonly" />';
html += '<input type="checkbox" name="showPassword" id="showPassword" value="1" style="display:none;" /><label for="showPassword" style="display:none;">'+t('core', 'Password protect')+'</label>';
html += '<div id="linkPass">';
- html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
+ html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Choose a password for the public link')+'" />';
html += '</div>';
+
if (itemType === 'folder' && (possiblePermissions & OC.PERMISSION_CREATE) && publicUploadEnabled === 'yes') {
html += '<div id="allowPublicUploadWrapper" style="display:none;">';
html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
@@ -239,6 +287,7 @@ OC.Share={
html += '<div id="expiration">';
html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>';
html += '<input id="expirationDate" type="text" placeholder="'+t('core', 'Expiration date')+'" style="display:none; width:90%;" />';
+ html += '<div id="defaultExpireMessage">'+defaultExpireMessage+'</div>';
html += '</div>';
dropDownEl = $(html);
dropDownEl = dropDownEl.appendTo(appendTo);
@@ -291,6 +340,10 @@ OC.Share={
var itemType = $('#dropdown').data('item-type');
var itemSource = $('#dropdown').data('item-source');
var itemSourceName = $('#dropdown').data('item-source-name');
+ var expirationDate = '';
+ if ( $('#expirationCheckbox').is(':checked') === true ) {
+ expirationDate = $( "#expirationDate" ).val();
+ }
var shareType = selected.item.value.shareType;
var shareWith = selected.item.value.shareWith;
$(this).val(shareWith);
@@ -310,7 +363,7 @@ OC.Share={
permissions = permissions | OC.PERMISSION_SHARE;
}
- OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, function() {
+ OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, expirationDate, function() {
OC.Share.addShareWith(shareType, shareWith, selected.item.label, permissions, possiblePermissions);
$('#shareWith').val('');
OC.Share.updateIcon(itemType, itemSource);
@@ -347,8 +400,8 @@ OC.Share={
}
})
.data("ui-autocomplete")._renderItem = function( ul, item ) {
- return $( "<li>" )
- .append( "<a>" + item.displayname + "<br>" + item.email + "</a>" )
+ return $('<li>')
+ .append('<a>' + escapeHTML(item.displayname) + "<br>" + escapeHTML(item.email) + '</a>' )
.appendTo( ul );
};
}
@@ -420,7 +473,7 @@ OC.Share={
}
var html = '<li style="clear: both;" data-share-type="'+escapeHTML(shareType)+'" data-share-with="'+escapeHTML(shareWith)+'" title="' + escapeHTML(shareWith) + '">';
var showCrudsButton;
- html += '<a href="#" class="unshare"><img class="svg" alt="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
+ html += '<a href="#" class="unshare"><img class="svg" alt="'+t('core', 'Unshare')+'" title="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
html += '<span class="username">' + escapeHTML(shareWithDisplayName) + '</span>';
var mailNotificationEnabled = $('input:hidden[name=mailNotificationEnabled]').val();
if (mailNotificationEnabled === 'yes') {
@@ -433,7 +486,7 @@ OC.Share={
if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
html += '<label><input type="checkbox" name="edit" class="permissions" '+editChecked+' />'+t('core', 'can edit')+'</label> ';
}
- showCrudsButton = '<a href="#" class="showCruds"><img class="svg" alt="'+t('core', 'access control')+'" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>';
+ showCrudsButton = '<a href="#" class="showCruds"><img class="svg" alt="'+t('core', 'access control')+'" title="'+t('core', 'access control')+'" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>';
html += '<div class="cruds" style="display:none;">';
if (possiblePermissions & OC.PERMISSION_CREATE) {
html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.PERMISSION_CREATE+'" />'+t('core', 'create')+'</label>';
@@ -464,6 +517,10 @@ OC.Share={
showLink:function(token, password, itemSource) {
OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true;
$('#linkCheckbox').attr('checked', true);
+
+ //check itemType
+ var linkSharetype=$('#dropdown').data('item-type');
+
if (! token) {
//fallback to pre token link
var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
@@ -477,32 +534,43 @@ OC.Share={
var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+encodeURIComponent(file);
} else {
//TODO add path param when showing a link to file in a subfolder of a public link share
- var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&t='+token;
+ var service='';
+ if(linkSharetype === 'folder' || linkSharetype === 'file'){
+ service='files';
+ }else{
+ service=linkSharetype;
+ }
+
+ var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service='+service+'&t='+token;
+
}
$('#linkText').val(link);
$('#linkText').show('blind');
$('#linkText').css('display','block');
- $('#showPassword').show();
- $('#showPassword+label').show();
+ if (oc_appconfig.core.enforcePasswordForPublicLink === false || password === null) {
+ $('#showPassword').show();
+ $('#showPassword+label').show();
+ }
if (password != null) {
$('#linkPass').show('blind');
$('#showPassword').attr('checked', true);
$('#linkPassText').attr('placeholder', '**********');
}
$('#expiration').show();
+ $('#defaultExpireMessage').show();
$('#emailPrivateLink #email').show();
$('#emailPrivateLink #emailButton').show();
$('#allowPublicUploadWrapper').show();
},
hideLink:function() {
$('#linkText').hide('blind');
+ $('#defaultExpireMessage').hide();
$('#showPassword').hide();
$('#showPassword+label').hide();
- $('#linkPass').hide();
+ $('#linkPass').hide('blind');
$('#emailPrivateLink #email').hide();
$('#emailPrivateLink #emailButton').hide();
$('#allowPublicUploadWrapper').hide();
- $('#expirationDate').hide();
},
dirname:function(path) {
return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
@@ -628,22 +696,33 @@ $(document).ready(function() {
var itemType = $('#dropdown').data('item-type');
var itemSource = $('#dropdown').data('item-source');
var itemSourceName = $('#dropdown').data('item-source-name');
+ var expirationDate = '';
+ if ($('#expirationCheckbox').is(':checked') === true) {
+ expirationDate = $( "#expirationDate" ).val();
+ }
if (this.checked) {
// Create a link
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, itemSourceName, function(data) {
- OC.Share.showLink(data.token, null, itemSource);
- OC.Share.updateIcon(itemType, itemSource);
- });
+ if (oc_appconfig.core.enforcePasswordForPublicLink === false) {
+ OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, itemSourceName, expirationDate, function(data) {
+ OC.Share.showLink(data.token, null, itemSource);
+ OC.Share.updateIcon(itemType, itemSource);
+ });
+ } else {
+ $('#linkPass').toggle('blind');
+ $('#linkPassText').focus();
+ }
} else {
// Delete private link
- OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
- OC.Share.hideLink();
- OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = false;
- OC.Share.updateIcon(itemType, itemSource);
- if (typeof OC.Share.statuses[itemSource] === 'undefined') {
- $('#expiration').hide('blind');
- }
- });
+ OC.Share.hideLink();
+ if ($('#linkText').val() !== '') {
+ OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
+ OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = false;
+ OC.Share.updateIcon(itemType, itemSource);
+ if (typeof OC.Share.statuses[itemSource] === 'undefined') {
+ $('#expiration').hide('blind');
+ }
+ });
+ }
}
});
@@ -660,6 +739,10 @@ $(document).ready(function() {
var itemType = $('#dropdown').data('item-type');
var itemSource = $('#dropdown').data('item-source');
var itemSourceName = $('#dropdown').data('item-source-name');
+ var expirationDate = '';
+ if ($('#expirationCheckbox').is(':checked') === true) {
+ expirationDate = $( "#expirationDate" ).val();
+ }
var permissions = 0;
// Calculate permissions
@@ -670,7 +753,7 @@ $(document).ready(function() {
}
// Update the share information
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName, function(data) {
+ OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName, expirationDate, function(data) {
});
});
@@ -715,11 +798,16 @@ $(document).ready(function() {
permissions = OC.PERMISSION_READ;
}
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), permissions, itemSourceName, function() {
- console.log("password set to: '" + linkPassText.val() +"' by event: " + event.type);
+ OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), permissions, itemSourceName, function(data) {
linkPassText.val('');
linkPassText.attr('placeholder', t('core', 'Password protected'));
+
+ if (oc_appconfig.core.enforcePasswordForPublicLink) {
+ OC.Share.showLink(data.token, "password set", itemSource);
+ OC.Share.updateIcon(itemType, itemSource);
+ }
});
+
}
});
@@ -734,6 +822,9 @@ $(document).ready(function() {
OC.dialogs.alert(t('core', 'Error unsetting expiration date'), t('core', 'Error'));
}
$('#expirationDate').hide('blind');
+ if (oc_appconfig.core.defaultExpireDateEnforced === 'no') {
+ $('#defaultExpireMessage'). show('blind');
+ }
});
}
});
@@ -756,6 +847,10 @@ $(document).ready(function() {
expirationDateField.tipsy({gravity: 'n', fade: true});
expirationDateField.tipsy('show');
expirationDateField.addClass('error');
+ } else {
+ if (oc_appconfig.core.defaultExpireDateEnforced === 'no') {
+ $('#defaultExpireMessage'). hide('blind');
+ }
}
});
});
diff --git a/core/js/tests/specHelper.js b/core/js/tests/specHelper.js
index d86cd81cda86b58a20c0879b3061c708bf895c22..b9be9188a4e77f20c179ce5c26a703fa397927c5 100644
--- a/core/js/tests/specHelper.js
+++ b/core/js/tests/specHelper.js
@@ -63,6 +63,9 @@ window.oc_config = {
session_lifetime: 600 * 1000,
session_keepalive: false
};
+window.oc_appconfig = {
+ core: {}
+};
window.oc_defaults = {};
// global setup for all tests
diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js
new file mode 100644
index 0000000000000000000000000000000000000000..a487b71fdbb274571097b13073edf338131d29bf
--- /dev/null
+++ b/core/js/tests/specs/shareSpec.js
@@ -0,0 +1,97 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2014 Vincent Petry <pvince81@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/>.
+*
+*/
+
+/* global oc_appconfig */
+describe('OC.Share tests', function() {
+ describe('dropdown', function() {
+ var $container;
+ var oldAppConfig;
+ var loadItemStub;
+ var autocompleteStub;
+ beforeEach(function() {
+ $('#testArea').append($('<div id="shareContainer"></div>'));
+ $container = $('#shareContainer');
+ /* jshint camelcase:false */
+ oldAppConfig = oc_appconfig.core;
+ loadItemStub = sinon.stub(OC.Share, 'loadItem');
+
+ loadItemStub.returns({
+ reshare: [],
+ shares: []
+ });
+
+ autocompleteStub = sinon.stub($.fn, 'autocomplete', function() {
+ // dummy container with the expected attributes
+ var $el = $('<div></div>').data('ui-autocomplete', {});
+ return $el;
+ });
+ });
+ afterEach(function() {
+ /* jshint camelcase:false */
+ oc_appconfig.core = oldAppConfig;
+ loadItemStub.restore();
+
+ autocompleteStub.restore();
+ });
+ it('calls loadItem with the correct arguments', function() {
+ OC.Share.showDropDown(
+ 'file',
+ 123,
+ $container,
+ 'http://localhost/dummylink',
+ 31,
+ 'shared_file_name.txt'
+ );
+ expect(loadItemStub.calledOnce).toEqual(true);
+ expect(loadItemStub.calledWith('file', 123)).toEqual(true);
+ });
+ it('shows the dropdown with default values', function() {
+ var $el;
+ OC.Share.showDropDown(
+ 'file',
+ 123,
+ $container,
+ 'http://localhost/dummylink',
+ 31,
+ 'shared_file_name.txt'
+ );
+ $el = $container.find('#dropdown');
+ expect($el.length).toEqual(1);
+ expect($el.attr('data-item-type')).toEqual('file');
+ expect($el.attr('data-item-source')).toEqual('123');
+ // TODO: expect that other parts are rendered correctly
+ });
+ it('shows default expiration date when set', function() {
+ oc_appconfig.core.defaultExpireDateEnabled = "yes";
+ oc_appconfig.core.defaultExpireDate = '';
+ // TODO: expect that default date was set
+ });
+ it('shows default expiration date is set but disabled', function() {
+ oc_appconfig.core.defaultExpireDateEnabled = "no";
+ oc_appconfig.core.defaultExpireDate = '';
+ // TODO: expect that default date was NOT set
+ });
+ // TODO: test password field visibility (whenever enforced or not)
+ // TODO: check link share field visibility based on whether it is allowed
+ // TODO: check public upload visibility based on config
+ });
+});
+
diff --git a/core/js/update.js b/core/js/update.js
index b1b7f6e37e81293f3932ca286b207169cbe879cc..cc0f541bd7985c9e9afd8bedb4f28e0106883a2a 100644
--- a/core/js/update.js
+++ b/core/js/update.js
@@ -1,26 +1,86 @@
-$(document).ready(function () {
- var updateEventSource = new OC.EventSource(OC.webroot+'/core/ajax/update.php');
- updateEventSource.listen('success', function(message) {
- $('<span>').append(message).append('<br />').appendTo($('.update'));
- });
- updateEventSource.listen('error', function(message) {
- $('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
- message = t('core', 'Please reload the page.');
- $('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
- updateEventSource.close();
- });
- updateEventSource.listen('failure', function(message) {
- $('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
- $('<span>')
- .addClass('error bold')
- .append('<br />')
- .append(t('core', 'The update was unsuccessful. Please report this issue to the <a href="https://github.com/owncloud/core/issues" target="_blank">ownCloud community</a>.'))
- .appendTo($('.update'));
- });
- updateEventSource.listen('done', function(message) {
- $('<span>').addClass('bold').append('<br />').append(t('core', 'The update was successful. Redirecting you to ownCloud now.')).appendTo($('.update'));
- setTimeout(function () {
- window.location.href = OC.webroot;
- }, 3000);
+/*
+ * Copyright (c) 2014
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+ OC.Update = {
+ _started : false,
+
+ /**
+ * Start the upgrade process.
+ *
+ * @param $el progress list element
+ */
+ start: function($el) {
+ if (this._started) {
+ return;
+ }
+
+ this.$el = $el;
+
+ this._started = true;
+ this.addMessage(t(
+ 'core',
+ 'Updating {productName} to version {version}, this may take a while.', {
+ productName: OC.theme.name,
+ version: OC.config.versionstring
+ }),
+ 'bold'
+ ).append('<br />'); // FIXME: these should be ul/li with CSS paddings!
+
+ var updateEventSource = new OC.EventSource(OC.webroot+'/core/ajax/update.php');
+ updateEventSource.listen('success', function(message) {
+ $('<span>').append(message).append('<br />').appendTo($el);
+ });
+ updateEventSource.listen('error', function(message) {
+ $('<span>').addClass('error').append(message).append('<br />').appendTo($el);
+ message = t('core', 'Please reload the page.');
+ $('<span>').addClass('error').append(message).append('<br />').appendTo($el);
+ updateEventSource.close();
+ });
+ updateEventSource.listen('failure', function(message) {
+ $('<span>').addClass('error').append(message).append('<br />').appendTo($el);
+ $('<span>')
+ .addClass('error bold')
+ .append('<br />')
+ .append(t('core', 'The update was unsuccessful.' +
+ 'Please report this issue to the ' +
+ '<a href="https://github.com/owncloud/core/issues" target="_blank">ownCloud community</a>.'))
+ .appendTo($el);
+ });
+ updateEventSource.listen('done', function() {
+ // FIXME: use product name
+ $('<span>').addClass('bold')
+ .append('<br />')
+ .append(t('core', 'The update was successful. Redirecting you to ownCloud now.'))
+ .appendTo($el);
+ setTimeout(function () {
+ OC.redirect(OC.webroot);
+ }, 3000);
+ });
+ },
+
+ addMessage: function(message, className) {
+ var $span = $('<span>');
+ $span.addClass(className).append(message).append('<br />').appendTo(this.$el);
+ return $span;
+ }
+ };
+
+})();
+
+$(document).ready(function() {
+ $('.updateButton').on('click', function() {
+ var $progressEl = $('.updateProgress');
+ $progressEl.removeClass('hidden');
+ $('.updateOverview').addClass('hidden');
+ OC.Update.start($progressEl);
+ return false;
});
});
diff --git a/core/js/visitortimezone.js b/core/js/visitortimezone.js
index ee0105c783d4e969116d12ac43efa8c55631c7ae..d9b63a108798456c060cdb0640a3ca009cf2ae94 100644
--- a/core/js/visitortimezone.js
+++ b/core/js/visitortimezone.js
@@ -1,4 +1,10 @@
$(document).ready(function () {
var visitortimezone = (-new Date().getTimezoneOffset() / 60);
$('#timezone-offset').val(visitortimezone);
+
+ // only enable the submit button once we are sure that the timezone is set
+ var $loginForm = $('form[name="login"]');
+ if ($loginForm.length) {
+ $loginForm.find('input#submit').prop('disabled', false);
+ }
});
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
index 79efa67242c82d3cc33af484a23fafe693be1896..a5facc4f9ef3cc4a4fa2b912a27b89e135def03f 100644
--- a/core/l10n/af_ZA.php
+++ b/core/l10n/af_ZA.php
@@ -37,9 +37,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n maande gelede","%n maande gelede"),
"last year" => "verlede jaar",
"years ago" => "jare gelede",
-"Choose" => "Kies",
"Yes" => "Ja",
"No" => "Nee",
+"Choose" => "Kies",
"Ok" => "OK",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"New Files" => "Nuwe leêrs",
@@ -60,7 +60,6 @@ $TRANSLATIONS = array(
"Shared with you and the group {group} by {owner}" => "Met jou en die groep {group} gedeel deur {owner}",
"Shared with you by {owner}" => "Met jou gedeel deur {owner}",
"Password protect" => "Beskerm met Wagwoord",
-"Password" => "Wagwoord",
"Allow Public Upload" => "Laat Publieke Oplaai toe",
"Email link to person" => "E-pos aan persoon",
"Send" => "Stuur",
@@ -83,9 +82,9 @@ $TRANSLATIONS = array(
"Error setting expiration date" => "Fout met opstel van verval datum",
"Sending ..." => "Stuur ...",
"Email sent" => "E-pos gestuur",
+"Warning" => "Waarskuwing",
"The object type is not specified." => "Hierdie objek tipe is nie gespesifiseer nie.",
"Add" => "Voeg by",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Die opdatering was nie suksesvol nie. Rapporteer die probleem by <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.",
"%s password reset" => "%s wagwoord herstel",
"Use the following link to reset your password: {link}" => "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
@@ -113,6 +112,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Jou data gids en leers is moontlik toeganklik vanaf die internet omdat die .htaccess leer nie werk nie.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien asseblief die<a href=\"%s\" target=\"_blank\">dokumentasie</a>.",
"Create an <strong>admin account</strong>" => "Skep `n <strong>admin-rekening</strong>",
+"Password" => "Wagwoord",
"Data folder" => "Data vouer",
"Configure the database" => "Stel databasis op",
"will be used" => "sal gebruik word",
@@ -131,7 +131,6 @@ $TRANSLATIONS = array(
"remember" => "onthou",
"Log in" => "Teken aan",
"Alternative Logins" => "Alternatiewe aantekeninge",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>",
-"Updating ownCloud to version %s, this may take a while." => "Opdatering a ownCloud versie %s - dit kan 'n tydjie vat."
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 16092348ec67ce04f1a0c1c008026a785a5d90aa..8905516c42d4c6236ba684d20ca774c1ad12f135 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","","","","",""),
"last year" => "السنةالماضية",
"years ago" => "سنة مضت",
-"Choose" => "اختيار",
"Yes" => "نعم",
"No" => "لا",
+"Choose" => "اختيار",
"Ok" => "مواÙÙ‚",
"_{count} file conflict_::_{count} file conflicts_" => array("","","","","",""),
"Cancel" => "الغاء",
@@ -54,7 +54,6 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "شورك معك من قبل {owner}",
"Share link" => "شارك الرابط",
"Password protect" => "Øماية كلمة السر",
-"Password" => "كلمة المرور",
"Allow Public Upload" => "Ø§Ø³Ù…Ø Ø¨Ø§Ù„Ø±Ùع للعامة",
"Email link to person" => "ارسل الرابط بالبريد الى صديق",
"Send" => "أرسل",
@@ -81,7 +80,6 @@ $TRANSLATIONS = array(
"The object type is not specified." => "نوع العنصر غير Ù…Øدد.",
"Delete" => "إلغاء",
"Add" => "اضÙ",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Øصل خطأ ÙÙŠ عملية التØديث, يرجى ارسال تقرير بهذه المشكلة الى <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "تم التØديث Ø¨Ù†Ø¬Ø§Ø , يتم اعادة توجيهك الان الى Owncloud",
"%s password reset" => "تمت إعادة ضبط كلمة مرور %s",
"Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
@@ -109,6 +107,7 @@ $TRANSLATIONS = array(
"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>",
+"Password" => "كلمة المرور",
"Data folder" => "مجلد المعلومات",
"Configure the database" => "أسس قاعدة البيانات",
"will be used" => "سيتم استخدمه",
@@ -125,7 +124,6 @@ $TRANSLATIONS = array(
"Lost your password?" => "هل نسيت كلمة السر؟",
"remember" => "تذكر",
"Log in" => "أدخل",
-"Alternative Logins" => "اسماء دخول بديلة",
-"Updating ownCloud to version %s, this may take a while." => "جاري تØديث Owncloud الى اصدار %s , قد يستغرق هذا بعض الوقت."
+"Alternative Logins" => "اسماء دخول بديلة"
);
$PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/core/l10n/ast.php b/core/l10n/ast.php
index c479b96faab090092fd1f3c46b39836d9a03b39b..0624b2bbf316a54103fa3426c97965337038de0d 100644
--- a/core/l10n/ast.php
+++ b/core/l10n/ast.php
@@ -1,7 +1,14 @@
<?php
$TRANSLATIONS = array(
+"Couldn't send mail to following users: %s " => "Nun pudo dunviase'l corréu a los usuarios siguientes: %s",
+"Turned on maintenance mode" => "Activáu el mou de mantenimientu",
+"Turned off maintenance mode" => "Apagáu el mou de mantenimientu",
"Updated database" => "Base de datos anovada",
+"No image or file provided" => "Nun s'especificó nenguna imaxe o ficheru",
+"Unknown filetype" => "Triba de ficheru desconocida",
"Invalid image" => "Imaxe inválida",
+"No temporary profile picture available, try again" => "Nengún perfil d'imaxe temporal disponible, intentalo de nueves",
+"No crop data provided" => "Nun s'apurrió'l retayu de datos",
"Sunday" => "Domingu",
"Monday" => "Llunes",
"Tuesday" => "Martes",
@@ -33,13 +40,22 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("fai %n mes","fai %n meses"),
"last year" => "añu caberu",
"years ago" => "fai años",
-"Choose" => "Esbillar",
"Yes" => "SÃ",
"No" => "Non",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Choose" => "Esbillar",
+"Error loading file picker template: {error}" => "Fallu cargando'l ficheru de plantÃa d'escoyeta: {error}",
+"Ok" => "Aceutar",
+"Error loading message template: {error}" => "Fallu cargando'l mensaxe de la plantÃa: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflictu de ficheru","{count} conflictos de ficheru "),
+"One file conflict" => "Conflictu nun ficheru",
+"New Files" => "Ficheros nuevos",
+"Already existing files" => "Ficheros qu'esisten yá",
"Which files do you want to keep?" => "¿Qué ficheros quies caltener?",
+"If you select both versions, the copied file will have a number added to its name." => "Si seleiciones dames versiones, el ficheru copiáu tendrá un númberu amestáu al so nome",
"Cancel" => "Encaboxar",
"Continue" => "Continuar",
+"(all selected)" => "(esbillao too)",
+"({count} selected)" => "(esbillaos {count})",
"Very weak password" => "Contraseña mui feble",
"Weak password" => "Contraseña feble",
"So-so password" => "Contraseña pasable",
@@ -48,10 +64,24 @@ $TRANSLATIONS = array(
"Shared" => "CompartÃu",
"Share" => "Compartir",
"Error" => "Fallu",
+"Error while sharing" => "Fallu mientres la compartición",
+"Error while unsharing" => "Fallu mientres se dexaba de compartir",
+"Error while changing permissions" => "Fallu mientres camudaben los permisos",
+"Shared with you and the group {group} by {owner}" => "CompartÃu contigo y col grupu {group} por {owner}",
+"Shared with you by {owner}" => "CompartÃu contigo por {owner}",
"Share link" => "Compartir enllaz",
-"Password" => "Contraseña",
+"Password protect" => "Protexer con contraseña",
+"Choose a password for the public link" => "Escueyi una contraseña pal enllaz públicu",
+"Allow Public Upload" => "Permitir xuba pública",
+"Email link to person" => "Enlláz de corréu electrónicu a la persona",
"Send" => "Unviar",
+"Set expiration date" => "Afitar la data de caducidá",
+"Expiration date" => "Data de caducidá",
+"Share via email:" => "Compartir vÃa corréu electrónicu:",
+"No people found" => "Nun s'atoparon persones",
"group" => "grupu",
+"Resharing is not allowed" => "Recompartir nun ta permitÃu",
+"Shared in {item} with {user}" => "CompartÃu en {item} con {user}",
"Unshare" => "Dexar de compartir",
"notify by email" => "notificar per corréu",
"can edit" => "pue editar",
@@ -61,23 +91,68 @@ $TRANSLATIONS = array(
"delete" => "desaniciar",
"share" => "compartir",
"Password protected" => "Contraseña protexida",
+"Error unsetting expiration date" => "Fallu desafitando la data de caducidá",
+"Error setting expiration date" => "Fallu afitando la fecha de caducidá",
+"Sending ..." => "Unviando ...",
"Email sent" => "Corréu unviáu",
"Warning" => "Avisu",
+"The object type is not specified." => "El tipu d'oxetu nun ta especificáu.",
"Delete" => "Desaniciar",
"Add" => "Amestar",
"Edit tags" => "Editar etiquetes",
+"Please reload the page." => "Por favor, recarga la páxina",
+"The update was successful. Redirecting you to ownCloud now." => "L'anovamientu fÃzose con ésitu. Redirixiendo agora al to ownCloud.",
+"%s password reset" => "%s restablecer contraseña",
+"Use the following link to reset your password: {link}" => "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Dunviósete al to corréu l'enllaz pa reaniciar la to contraseña.<br>Si nun lu recibes dientro de dellos minutos, comprueba les tos carpetes de corréu puxarra.<br>Sinón, pues entrugar al to alministrador llocal.",
+"Request failed!<br>Did you make sure your email/username was right?" => "¡Petición fallida!<br>¿Asegurástite qué'l to nome d'usuariu/corréu tean bien?",
+"You will receive a link to reset your password via Email." => "Vas recibir un enllaz vÃa Corréu-e pa restablecer la to contraseña",
"Username" => "Nome d'usuariu",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Los tos ficheros tan cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru que facer, por favor contauta col to alministrador enantes de siguir. ¿De xuru quies continuar?",
+"Yes, I really want to reset my password now" => "SÃ, quiero reaniciar daveres la mio contraseña agora",
"Reset" => "Reaniciar",
+"Your password was reset" => "Restablecióse la contraseña",
+"To login page" => "Aniciar sesión na páxina",
"New password" => "Contraseña nueva",
+"Reset password" => "Restablecer contraseña",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!",
"For the best results, please consider using a GNU/Linux server instead." => "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.",
"Personal" => "Personal",
"Users" => "Usuarios",
+"Apps" => "Aplicaciones",
+"Admin" => "Alministrador",
+"Help" => "Ayuda",
+"Access forbidden" => "Accesu denegáu",
+"Cloud not found" => "Ñube non atopada",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hola, ¿qué hai?\n\nnamái déxanos dicite que %s compartió %s contigo.\nVelu: %s\n\n",
"Cheers!" => "¡Salú!",
"Security Warning" => "Avisu de seguridá",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La to versión de PHP ye vulnerable al ataque NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Por favor, anova la to instalación de PHP pa usar %s de mou seguru.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nun ta disponible'l xenerador de númberos al debalu, por favor activa la estensión PHP OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ensin un xenerador de númberos al debalu, un atacante podrÃa aldovinar los tokens pa restablecer la contraseña y tomar el control de la cuenta.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pa informase de cómo configurar el so sirvidor, por favor güeya la <a href=\"%s\" target=\"_blank\">documentación</a>.",
+"Create an <strong>admin account</strong>" => "Crea una <strong>cuenta d'alministrador</strong>",
+"Password" => "Contraseña",
+"Data folder" => "Carpeta de datos",
+"Configure the database" => "Configura la base de datos",
"will be used" => "usaráse",
+"Database user" => "Usuariu de la base de datos",
+"Database password" => "Contraseña de la base de datos",
+"Database name" => "Nome de la base de datos",
+"Database tablespace" => "Espaciu de tables de la base de datos",
+"Database host" => "Agospiador de la base de datos",
+"Finish setup" => "Finar la configuración ",
"Finishing …" => "Finando ...",
+"%s is available. Get more information on how to update." => "Ta disponible %s. Consigui más información en como anovar·",
"Log out" => "Zarrar sesión",
+"Automatic logon rejected!" => "¡Aniciu de sesión automáticu refugáu!",
+"If you did not change your password recently, your account may be compromised!" => "¡Si nun camudó la so contraseña últimamente, la so cuenta pue tar comprometida!",
+"Please change your password to secure your account again." => "Por favor, camude la so contraseña p'asegurar la so cuenta de nueves",
+"Please contact your administrator." => "Por favor, contauta col to alministrador",
"Lost your password?" => "¿Escaeciesti la to contraseña?",
+"remember" => "recordar",
"Log in" => "Aniciar sesión",
"Alternative Logins" => "Anicios de sesión alternativos",
"Thank you for your patience." => "Gracies pola to paciencia."
diff --git a/core/l10n/be.php b/core/l10n/be.php
index 383d2494d2c56777f96d2bf832f1c50972d61458..d0c3b3ecba7d14dd5cc4fed9de7a06936a646cf3 100644
--- a/core/l10n/be.php
+++ b/core/l10n/be.php
@@ -30,9 +30,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","","",""),
"last year" => "У мінулым годзе",
"years ago" => "Гадоў таму",
-"Choose" => "Выбар",
"Yes" => "Так",
"No" => "Ðе",
+"Choose" => "Выбар",
"Ok" => "Добра",
"_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
"Error" => "Памылка",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 861d7370ed129999418f26990db40babf42bf372..8653f2435cd95b3e3e43dd643c855985ca13f212 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "поÑледната година",
"years ago" => "поÑледните години",
-"Choose" => "Избери",
"Yes" => "Да",
"No" => "Ðе",
+"Choose" => "Избери",
"Ok" => "Добре",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Отказ",
@@ -46,7 +46,6 @@ $TRANSLATIONS = array(
"Shared with you and the group {group} by {owner}" => "Споделено Ñ Ñ‚ÐµÐ±Ðµ и група {group} от {owner}",
"Shared with you by {owner}" => "Споделено Ñ Ñ‚ÐµÐ±Ðµ от {owner}",
"Password protect" => "Защитено Ñ Ð¿Ð°Ñ€Ð¾Ð»Ð°",
-"Password" => "Парола",
"Email link to person" => "Изпрати връзка до пощата на нÑкои",
"Send" => "Изпрати",
"Set expiration date" => "ПоÑочи дата на изтичане",
@@ -85,6 +84,7 @@ $TRANSLATIONS = array(
"Access forbidden" => "ДоÑтъпът е забранен",
"Cloud not found" => "облакът не намерен",
"Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>",
+"Password" => "Парола",
"Data folder" => "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° данни",
"Configure the database" => "Конфигуриране на базата",
"will be used" => "ще Ñе ползва",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index e9f46d686c14d0adc72a8f8db470235442d9fb0c..90540d6ef8a7795bd1394a8ac610c7eb01be2ea7 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "গত বছর",
"years ago" => "বছর পূরà§à¦¬à§‡",
-"Choose" => "বেছে নিন",
"Yes" => "হà§à¦¯à¦¾à¦",
"No" => "না",
+"Choose" => "বেছে নিন",
"Ok" => "তথাসà§à¦¤à§",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "বাতির",
@@ -46,7 +46,6 @@ $TRANSLATIONS = array(
"Shared with you and the group {group} by {owner}" => "{owner} আপনার à¦à¦¬à¦‚ {group} গোষà§à¦ ীর সাথে à¦à¦¾à¦—াà¦à¦¾à¦—ি করেছেন",
"Shared with you by {owner}" => "{owner} আপনার সাথে à¦à¦¾à¦—াà¦à¦¾à¦—ি করেছেন",
"Password protect" => "কূটশবà§à¦¦ সà§à¦°à¦•à§à¦·à¦¿à¦¤",
-"Password" => "কূটশবà§à¦¦",
"Email link to person" => "বà§à¦¯à¦•à§à¦¤à¦¿à¦° সাথে ই-মেইল যà§à¦•à§à¦¤ কর",
"Send" => "পাঠাও",
"Set expiration date" => "মেয়াদোতà§à¦¤à§€à¦°à§à¦£ হওয়ার তারিখ নিরà§à¦§à¦¾à¦°à¦£ করà§à¦¨",
@@ -87,6 +86,7 @@ $TRANSLATIONS = array(
"Cloud not found" => "কà§à¦²à¦¾à¦‰à¦¡ খà§à¦à¦œà§‡ পাওয়া গেল না",
"Security Warning" => "নিরাপতà§à¦¤à¦¾à¦œà¦¨à¦¿à¦¤ সতরà§à¦•à¦¤à¦¾",
"Create an <strong>admin account</strong>" => "<strong>পà§à¦°à¦¶à¦¾à¦¸à¦• à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ</strong> তৈরী করà§à¦¨",
+"Password" => "কূটশবà§à¦¦",
"Data folder" => "ডাটা ফোলà§à¦¡à¦¾à¦° ",
"Configure the database" => "ডাটাবেচ কনফিগার করà§à¦¨",
"will be used" => "বà§à¦¯à¦¬à¦¹à§ƒà¦¤ হবে",
@@ -99,7 +99,6 @@ $TRANSLATIONS = array(
"Log out" => "পà§à¦°à¦¸à§à¦¥à¦¾à¦¨",
"Lost your password?" => "কূটশবà§à¦¦ হারিয়েছেন?",
"remember" => "মনে রাখ",
-"Log in" => "পà§à¦°à¦¬à§‡à¦¶",
-"Updating ownCloud to version %s, this may take a while." => "%s à¦à¦¾à¦°à§à¦¸à¦¨à§‡ ownCloud পরিবরà§à¦§à¦¨ করা হচà§à¦›à§‡, à¦à¦œà¦¨à§à¦¯ কিছৠসময় পà§à¦°à§Ÿà§‹à¦œà¦¨à¥¤"
+"Log in" => "পà§à¦°à¦¬à§‡à¦¶"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/bn_IN.php b/core/l10n/bn_IN.php
new file mode 100644
index 0000000000000000000000000000000000000000..ffcdde48d47cbbe4730b36aec880f7e1642688fb
--- /dev/null
+++ b/core/l10n/bn_IN.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/ca.php b/core/l10n/ca.php
index d4adb682f8a5122d8f4fe523ff9dc4e2144db187..b7866bcbeb77b2d6eff492d6adec500cb011dfd3 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("fa %n mes","fa %n mesos"),
"last year" => "l'any passat",
"years ago" => "anys enrere",
-"Choose" => "Escull",
-"Error loading file picker template: {error}" => "Error en carregar la plantilla de cà rrega de fitxers: {error}",
"Yes" => "SÃ",
"No" => "No",
+"Choose" => "Escull",
+"Error loading file picker template: {error}" => "Error en carregar la plantilla de cà rrega de fitxers: {error}",
"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"),
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
"Share with user or group …" => "Comparteix amb usuari o grup...",
"Share link" => "Enllaç de compartició",
"Password protect" => "Protegir amb contrasenya",
-"Password" => "Contrasenya",
"Allow Public Upload" => "Permet pujada pública",
"Email link to person" => "Enllaç per correu electrónic amb la persona",
"Send" => "Envia",
@@ -107,7 +106,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Error en carregar la plantilla de dià leg: {error}",
"No tags selected for deletion." => "No heu seleccionat les etiquetes a eliminar.",
"Please reload the page." => "Carregueu la pà gina de nou.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">la comunitat ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
"%s password reset" => "restableix la contrasenya %s",
"A problem has occurred whilst sending the email, please contact your administrator." => "Hi ha hagut un problema enviant el correu, parleu amb el vostre administrador.",
@@ -150,6 +148,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
"Create an <strong>admin account</strong>" => "Crea un <strong>compte d'administrador</strong>",
+"Password" => "Contrasenya",
"Storage & database" => "Emmagatzematge i base de dades",
"Data folder" => "Carpeta de dades",
"Configure the database" => "Configura la base de dades",
@@ -178,7 +177,6 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Això significa que només els administradors poden usar la instà ncia.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacteu amb l'administrador del sistema si aquest missatge persisteix o apareix inesperadament.",
"Thank you for your patience." => "Grà cies per la paciència.",
-"Updating ownCloud to version %s, this may take a while." => "S'està actualitzant ownCloud a la versió %s, pot trigar una estona.",
"This ownCloud instance is currently being updated, which may take a while." => "Aquesta instà ncia d'ownCloud s'està actualitzant i podria trigar una estona.",
"Please reload this page after a short time to continue using ownCloud." => "Carregueu de nou aquesta pà gina d'aquà a poc temps per continuar usant ownCloud."
);
diff --git a/core/l10n/ca@valencia.php b/core/l10n/ca@valencia.php
new file mode 100644
index 0000000000000000000000000000000000000000..ffcdde48d47cbbe4730b36aec880f7e1642688fb
--- /dev/null
+++ b/core/l10n/ca@valencia.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 2e373e63bae8e222e0aee230fcc8b9f698b7235c..54ba2b4b94fde22d9e39a0a8549ae67c1989edb8 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("pÅ™ed %n mÄ›sÃcem","pÅ™ed %n mÄ›sÃci","pÅ™ed %n mÄ›sÃci"),
"last year" => "minulý rok",
"years ago" => "před lety",
-"Choose" => "Vybrat",
-"Error loading file picker template: {error}" => "Chyba při nahrávánà šablony výběru souborů: {error}",
"Yes" => "Ano",
"No" => "Ne",
+"Choose" => "Vybrat",
+"Error loading file picker template: {error}" => "Chyba při nahrávánà šablony výběru souborů: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Chyba při nahrávánà šablony zprávy: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} souborový konflikt","{count} souborové konflikty","{count} souborových konfliktů"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "S Vámi sdÃlà {owner}",
"Share with user or group …" => "SdÃlet s uživatelem nebo skupinou",
"Share link" => "SdÃlet odkaz",
+"The public link will expire no later than {days} days after it is created" => "VeÅ™ejný odkaz nevyprÅ¡Ã dÅ™Ãve než za {days} dnà po svém vytvoÅ™enÃ",
+"By default the public link will expire after {days} days" => "Ve výchozÃm nastavenà vyprÅ¡Ã veÅ™ejný odkaz za {days} dnÃ",
"Password protect" => "Chránit heslem",
-"Password" => "Heslo",
+"Choose a password for the public link" => "Zadej heslo pro tento veřejný odkaz",
"Allow Public Upload" => "Povolit veÅ™ejné nahrávánÃ",
"Email link to person" => "Odeslat osobÄ› odkaz e-mailem",
"Send" => "Odeslat",
@@ -107,7 +109,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Chyba pÅ™i naÄÃtánà šablony dialogu: {error}",
"No tags selected for deletion." => "Žádné Å¡tÃtky nebyly vybrány ke smazánÃ.",
"Please reload the page." => "NaÄtÄ›te stránku znovu, prosÃm.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizace neprobÄ›hla úspěšnÄ›. Nahlaste prosÃm problém do <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">evidence chyb ownCloud</a>",
"The update was successful. Redirecting you to ownCloud now." => "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
"%s password reset" => "reset hesla %s",
"A problem has occurred whilst sending the email, please contact your administrator." => "PÅ™i odesÃlánà e-mailu nastala chyba, kontaktujte prosÃm svého administrátora.",
@@ -150,6 +151,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pro informace, jak správnÄ› nastavit váš server, se podÃvejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
"Create an <strong>admin account</strong>" => "VytvoÅ™it <strong>úÄet správce</strong>",
+"Password" => "Heslo",
"Storage & database" => "Úložiště & databáze",
"Data folder" => "Složka s daty",
"Configure the database" => "Nastavit databázi",
@@ -178,7 +180,6 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "To znamená, že pouze správci systému mohou aplikaci použÃvat.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktujte, prosÃm, správce systému, pokud se tato zpráva objevuje opakovanÄ› nebo neÄekanÄ›.",
"Thank you for your patience." => "Děkuji za trpělivost.",
-"Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvÃli trvat.",
"This ownCloud instance is currently being updated, which may take a while." => "Tato instalace ownCloud je právÄ› aktualizována, může to chvÃli trvat.",
"Please reload this page after a short time to continue using ownCloud." => "Pro pokraÄovánà naÄtÄ›te, prosÃm, stránku po chvÃli znovu."
);
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index b79c1d5df59b1531bb0725203eea053865d4eb17..ade2eeb56418220956d8e25df8c955fe2caa5852 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","","",""),
"last year" => "y llynedd",
"years ago" => "blwyddyn yn ôl",
-"Choose" => "Dewisiwch",
"Yes" => "Ie",
"No" => "Na",
+"Choose" => "Dewisiwch",
"Ok" => "Iawn",
"_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
"Cancel" => "Diddymu",
@@ -46,7 +46,6 @@ $TRANSLATIONS = array(
"Shared with you and the group {group} by {owner}" => "Rhannwyd â chi a'r grŵp {group} gan {owner}",
"Shared with you by {owner}" => "Rhannwyd â chi gan {owner}",
"Password protect" => "Diogelu cyfrinair",
-"Password" => "Cyfrinair",
"Email link to person" => "E-bostio dolen at berson",
"Send" => "Anfon",
"Set expiration date" => "Gosod dyddiad dod i ben",
@@ -72,7 +71,6 @@ $TRANSLATIONS = array(
"The object type is not specified." => "Nid yw'r math o wrthrych wedi cael ei nodi.",
"Delete" => "Dileu",
"Add" => "Ychwanegu",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">gymuned ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
"Use the following link to reset your password: {link}" => "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Anfonwyd y ddolen i ailosod eich cyfrinair i'ch cyfeiriad ebost.<br>Os nad yw'n cyrraedd o fewn amser rhesymol gwiriwch eich plygell spam/sothach.<br>Os nad yw yno, cysylltwch â'ch gweinyddwr lleol.",
@@ -96,6 +94,7 @@ $TRANSLATIONS = array(
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Heb gynhyrchydd rhifau hap diogel efallai y gall ymosodwr ragweld tocynnau ailosod cyfrinair a meddiannu eich cyfrif.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
"Create an <strong>admin account</strong>" => "Crewch <strong>gyfrif gweinyddol</strong>",
+"Password" => "Cyfrinair",
"Data folder" => "Plygell data",
"Configure the database" => "Cyflunio'r gronfa ddata",
"will be used" => "ddefnyddir",
@@ -113,7 +112,6 @@ $TRANSLATIONS = array(
"Lost your password?" => "Wedi colli'ch cyfrinair?",
"remember" => "cofio",
"Log in" => "Mewngofnodi",
-"Alternative Logins" => "Mewngofnodiadau Amgen",
-"Updating ownCloud to version %s, this may take a while." => "Yn diweddaru owncloud i fersiwn %s, gall hyn gymryd amser."
+"Alternative Logins" => "Mewngofnodiadau Amgen"
);
$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 9991e3e4907abd8591e1247cd80c3063b1a75569..9facf96ea4d4b769e9ca5959234d49ca9e6a0b3b 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Expiration date is in the past." => "Udløbsdatoen er overskredet.",
"Couldn't send mail to following users: %s " => "Kunne ikke sende mail til følgende brugere: %s",
"Turned on maintenance mode" => "Startede vedligeholdelsestilstand",
"Turned off maintenance mode" => "standsede vedligeholdelsestilstand",
@@ -40,15 +41,16 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n måned siden","%n måneder siden"),
"last year" => "sidste år",
"years ago" => "Ã¥r siden",
-"Choose" => "Vælg",
-"Error loading file picker template: {error}" => "Fejl ved indlæsning af filvælger skabelon: {error}",
"Yes" => "Ja",
"No" => "Nej",
+"Choose" => "Vælg",
+"Error loading file picker template: {error}" => "Fejl ved indlæsning af filvælger skabelon: {error}",
"Ok" => "OK",
"Error loading message template: {error}" => "Fejl ved indlæsning af besked skabelon: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
"One file conflict" => "En filkonflikt",
"New Files" => "Nye filer",
+"Already existing files" => "Allerede eksisterende filer",
"Which files do you want to keep?" => "Hvilke filer ønsker du at beholde?",
"If you select both versions, the copied file will have a number added to its name." => "Hvis du vælger begge versioner, vil den kopierede fil få tilføjet et nummer til sit navn.",
"Cancel" => "Annuller",
@@ -72,7 +74,6 @@ $TRANSLATIONS = array(
"Share with user or group …" => "Del med bruger eller gruppe ...",
"Share link" => "Del link",
"Password protect" => "Beskyt med adgangskode",
-"Password" => "Kodeord",
"Allow Public Upload" => "Tillad Offentlig Upload",
"Email link to person" => "E-mail link til person",
"Send" => "Send",
@@ -105,7 +106,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Fejl ved indlæsning dialog skabelon: {error}",
"No tags selected for deletion." => "Ingen tags markeret til sletning.",
"Please reload the page." => "Genindlæs venligst siden",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouds community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
"%s password reset" => "%s adgangskode nulstillet",
"A problem has occurred whilst sending the email, please contact your administrator." => "Der opstod et problem under afsending af emailen. Kontakt venligst systemadministratoren.",
@@ -121,6 +121,8 @@ $TRANSLATIONS = array(
"To login page" => "Til login-side",
"New password" => "Nyt kodeord",
"Reset password" => "Nulstil kodeord",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!",
+"For the best results, please consider using a GNU/Linux server instead." => "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet.",
"Personal" => "Personligt",
"Users" => "Brugere",
"Apps" => "Apps",
@@ -146,6 +148,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
"Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
+"Password" => "Kodeord",
"Storage & database" => "Lager & database",
"Data folder" => "Datamappe",
"Configure the database" => "Konfigurer databasen",
@@ -169,11 +172,11 @@ $TRANSLATIONS = array(
"remember" => "husk",
"Log in" => "Log ind",
"Alternative Logins" => "Alternative logins",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hej med dig,<br><br>Dette er blot for at informere dig om, at %s har delt <strong>%s</strong> med dig.<br><a href=\"%s\">Se det her!</a><br><br>",
"This ownCloud instance is currently in single user mode." => "Denne ownCloud instans er lige nu i enkeltbruger tilstand.",
"This means only administrators can use the instance." => "Det betyder at det kun er administrator, som kan benytte ownCloud.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakt systemadministratoren, hvis denne meddelelse fortsætter eller optrådte uventet.",
"Thank you for your patience." => "Tak for din tålmodighed.",
-"Updating ownCloud to version %s, this may take a while." => "Opdatere Owncloud til version %s, dette kan tage et stykke tid.",
"This ownCloud instance is currently being updated, which may take a while." => "Opdatere Owncloud, dette kan tage et stykke tid.",
"Please reload this page after a short time to continue using ownCloud." => "Genindlæs denne side efter kort tid til at fortsætte med at bruge ownCloud."
);
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 7a0aecf4d5f7f095fbc6cdafcc0eb199d8007b85..20b7c8004edb1d846b1af6d0552be66232a761f0 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"Turned on maintenance mode" => "Wartungsmodus eingeschaltet",
"Turned off maintenance mode" => "Wartungsmodus ausgeschaltet",
"Updated database" => "Datenbank aktualisiert",
+"Disabled incompatible apps: %s" => "Deaktivierte inkompatible Apps: %s",
"No image or file provided" => "Kein Bild oder Datei zur Verfügung gestellt",
"Unknown filetype" => "Unbekannter Dateityp",
"Invalid image" => "Ungültiges Bild",
@@ -41,10 +42,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
-"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
"Yes" => "Ja",
"No" => "Nein",
+"Choose" => "Auswählen",
+"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
"Ok" => "OK",
"Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
@@ -73,8 +74,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "{owner} hat dies mit Dir geteilt",
"Share with user or group …" => "Mit Benutzer oder Gruppe teilen ....",
"Share link" => "Link Teilen",
+"The public link will expire no later than {days} days after it is created" => "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
+"By default the public link will expire after {days} days" => "Standardmäßig wird der öffentliche Link nach {days} Tagen ablaufen",
"Password protect" => "Passwortschutz",
-"Password" => "Passwort",
+"Choose a password for the public link" => "Wählen Sie ein Passwort für den öffentlichen Link",
"Allow Public Upload" => "Öffentliches Hochladen erlauben",
"Email link to person" => "Link per E-Mail verschicken",
"Send" => "Senden",
@@ -106,8 +109,9 @@ $TRANSLATIONS = array(
"Edit tags" => "Schlagwörter bearbeiten",
"Error loading dialog template: {error}" => "Fehler beim Laden der Dialogvorlage: {error}",
"No tags selected for deletion." => "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
+"Updating {productName} to version {version}, this may take a while." => "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.",
"Please reload the page." => "Bitte lade diese Seite neu.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
+"The update was unsuccessful." => "Die Aktualisierung war erfolgreich.",
"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
"%s password reset" => "%s-Passwort zurücksetzen",
"A problem has occurred whilst sending the email, please contact your administrator." => "Beim Senden der E-Mail ist ein Fehler aufgetreten, bitte kontaktiere deinen Administrator.",
@@ -150,6 +154,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
"Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
+"Password" => "Passwort",
"Storage & database" => "Speicher & Datenbank",
"Data folder" => "Datenverzeichnis",
"Configure the database" => "Datenbank einrichten",
@@ -178,7 +183,11 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Dies bedeutet, dass diese Instanz nur von Administratoren genutzt werden kann.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktiere Deinen Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
"Thank you for your patience." => "Vielen Dank für Deine Geduld.",
-"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern.",
+"%s will be updated to version %s." => "%s wird auf Version %s aktualisiert.",
+"The following apps will be disabled:" => "Die folgenden Apps werden deaktiviert:",
+"The theme %s has been disabled." => "Das Theme %s wurde deaktiviert.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Stelle vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurde.",
+"Start update" => "Aktualisierung starten",
"This ownCloud instance is currently being updated, which may take a while." => "Diese OwnCloud-Instanz wird gerade aktualisiert, was eine Weile dauert.",
"Please reload this page after a short time to continue using ownCloud." => "Bitte lade diese Seite nach kurzer Zeit neu, um mit der Nutzung von OwnCloud fortzufahren."
);
diff --git a/core/l10n/de_AT.php b/core/l10n/de_AT.php
index 54c39463427e8b41fd66ceed9682d69d4e08c21b..18a4adb948ee98845e280a99f8842e79202dbd92 100644
--- a/core/l10n/de_AT.php
+++ b/core/l10n/de_AT.php
@@ -27,11 +27,11 @@ $TRANSLATIONS = array(
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Abbrechen",
"Share" => "Freigeben",
-"Password" => "Passwort",
"group" => "Gruppe",
"Unshare" => "Teilung zurücknehmen",
"can edit" => "kann bearbeiten",
"Delete" => "Löschen",
-"Personal" => "Persönlich"
+"Personal" => "Persönlich",
+"Password" => "Passwort"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
index 1a2c56635cfad34b78650f78cc9a9a24f94b48e6..84ef4085d552f5ccc11b6d287bc865e6453901ea 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
"Yes" => "Ja",
"No" => "Nein",
+"Choose" => "Auswählen",
"Ok" => "OK",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"New Files" => "Neue Dateien",
@@ -50,7 +50,6 @@ $TRANSLATIONS = array(
"Shared with you and the group {group} by {owner}" => "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
"Shared with you by {owner}" => "Von {owner} mit Ihnen geteilt.",
"Password protect" => "Passwortschutz",
-"Password" => "Passwort",
"Allow Public Upload" => "Öffentliches Hochladen erlauben",
"Email link to person" => "Link per E-Mail verschicken",
"Send" => "Senden",
@@ -77,7 +76,6 @@ $TRANSLATIONS = array(
"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
"Delete" => "Löschen",
"Add" => "Hinzufügen",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
"%s password reset" => "%s-Passwort zurücksetzen",
"Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
@@ -107,6 +105,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
"Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
+"Password" => "Passwort",
"Data folder" => "Datenverzeichnis",
"Configure the database" => "Datenbank einrichten",
"will be used" => "wird verwendet",
@@ -124,7 +123,6 @@ $TRANSLATIONS = array(
"Lost your password?" => "Passwort vergessen?",
"remember" => "merken",
"Log in" => "Einloggen",
-"Alternative Logins" => "Alternative Logins",
-"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
+"Alternative Logins" => "Alternative Logins"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index b8bce778f8704bc259672e3be6d136ac2b2e5ed6..b145700bfdd5ad09245c0fbb23933fdd00718a04 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"Turned on maintenance mode" => "Wartungsmodus eingeschaltet ",
"Turned off maintenance mode" => "Wartungsmodus ausgeschaltet",
"Updated database" => "Datenbank aktualisiert",
+"Disabled incompatible apps: %s" => "Deaktivierte inkompatible Apps: %s",
"No image or file provided" => "Weder Bild noch ein Datei wurden zur Verfügung gestellt",
"Unknown filetype" => "Unbekannter Dateityp",
"Invalid image" => "Ungültiges Bild",
@@ -41,10 +42,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
-"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
"Yes" => "Ja",
"No" => "Nein",
+"Choose" => "Auswählen",
+"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
"Ok" => "OK",
"Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
@@ -73,8 +74,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "Von {owner} mit Ihnen geteilt.",
"Share with user or group …" => "Mit Benutzer oder Gruppe teilen ....",
"Share link" => "Link teilen",
+"The public link will expire no later than {days} days after it is created" => "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
+"By default the public link will expire after {days} days" => "Standardmäßig wird der öffentliche Link nach {days} Tagen ablaufen",
"Password protect" => "Passwortschutz",
-"Password" => "Passwort",
+"Choose a password for the public link" => "Wählen Sie ein Passwort für den öffentlichen Link",
"Allow Public Upload" => "Öffentliches Hochladen erlauben",
"Email link to person" => "Link per E-Mail verschicken",
"Send" => "Senden",
@@ -106,8 +109,9 @@ $TRANSLATIONS = array(
"Edit tags" => "Schlagwörter bearbeiten",
"Error loading dialog template: {error}" => "Fehler beim Laden der Dialogvorlage: {error}",
"No tags selected for deletion." => "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
+"Updating {productName} to version {version}, this may take a while." => "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.",
"Please reload the page." => "Bitte laden Sie diese Seite neu.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
+"The update was unsuccessful." => "Die Aktualisierung war erfolgreich.",
"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
"%s password reset" => "%s-Passwort zurücksetzen",
"A problem has occurred whilst sending the email, please contact your administrator." => "Beim Senden der E-Mail ist ein Problem aufgetreten, bitte kontaktieren Sie Ihren Administrator.",
@@ -150,6 +154,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihren Server richtig konfigurieren können.",
"Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
+"Password" => "Passwort",
"Storage & database" => "Speicher & Datenbank",
"Data folder" => "Datenverzeichnis",
"Configure the database" => "Datenbank einrichten",
@@ -178,7 +183,11 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Dies bedeutet, dass diese Instanz nur von Administratoren genutzt werden kann.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktieren Sie Ihren Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
"Thank you for your patience." => "Vielen Dank für Ihre Geduld.",
-"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern.",
+"%s will be updated to version %s." => "%s wird auf Version %s aktualisiert.",
+"The following apps will be disabled:" => "Die folgenden Apps werden deaktiviert:",
+"The theme %s has been disabled." => "Das Theme %s wurde deaktiviert.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Stellen Sie vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurde.",
+"Start update" => "Aktualisierung starten",
"This ownCloud instance is currently being updated, which may take a while." => "Diese ownCloud-Instanz wird gerade aktualisiert, was eine Weile dauert.",
"Please reload this page after a short time to continue using ownCloud." => "Bitte laden Sie diese Seite nach kurzer Zeit neu, um mit der Nutzung von ownCloud fortzufahren."
);
diff --git a/core/l10n/el.php b/core/l10n/el.php
index c9506fda05a28c22e3fc891506334c389e3133be..ec47f40ad9849e21f9026341a94f43e65a5ab75f 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"Turned on maintenance mode" => "Η κατάσταση συντήÏησης ενεÏγοποιήθηκε",
"Turned off maintenance mode" => "Η κατάσταση συντήÏησης απενεÏγοποιήθηκε",
"Updated database" => "ΕνημεÏωμÎνη βάση δεδομÎνων",
+"Disabled incompatible apps: %s" => "ΑπενεÏγοποιημÎνες μη συμβατÎÏ‚ εφαÏμογÎÏ‚: %s",
"No image or file provided" => "Δεν δόθηκε εικόνα ή αÏχείο",
"Unknown filetype" => "Άγνωστος Ï„Ïπος αÏχείου",
"Invalid image" => "Μη ÎγκυÏη εικόνα",
@@ -41,15 +42,16 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n μήνας Ï€Ïιν","%n μήνες Ï€Ïιν"),
"last year" => "τελευταίο χÏόνο",
"years ago" => "χÏόνια Ï€Ïιν",
-"Choose" => "ΕπιλÎξτε",
-"Error loading file picker template: {error}" => "Σφάλμα κατά την φόÏτωση Ï€ÏοτÏπου επιλογÎα αÏχείων: {σφάλμα}",
"Yes" => "Îαι",
"No" => "Όχι",
+"Choose" => "ΕπιλÎξτε",
+"Error loading file picker template: {error}" => "Σφάλμα κατά την φόÏτωση Ï€ÏοτÏπου επιλογÎα αÏχείων: {σφάλμα}",
"Ok" => "Οκ",
"Error loading message template: {error}" => "Σφάλμα φόÏτωσης Ï€ÏοτÏπου μηνυμάτων: {σφάλμα}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} αÏχείο διαφÎÏει","{count} αÏχεία διαφÎÏουν"),
"One file conflict" => "Ένα αÏχείο διαφÎÏει",
"New Files" => "ÎÎα ΑÏχεία",
+"Already existing files" => "Ήδη υπάÏχοντα αÏχεία",
"Which files do you want to keep?" => "Ποια αÏχεία θÎλετε να κÏατήσετε;",
"If you select both versions, the copied file will have a number added to its name." => "Εάν επιλÎξετε και τις δυο εκδοχÎÏ‚, Îνας αÏιθμός θα Ï€Ïοστεθεί στο αντιγÏαφόμενο αÏχείο.",
"Cancel" => "ΆκυÏο",
@@ -72,8 +74,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "ΔιαμοιÏάστηκε με σας από τον {owner}",
"Share with user or group …" => "ΔιαμοιÏασμός με χÏήστη ή ομάδα ...",
"Share link" => "ΔιαμοιÏασμός συνδÎσμου",
+"The public link will expire no later than {days} days after it is created" => "Ο δημόσιος σÏνδεσμος θα απενεÏγοποιηθεί το Ï€Î¿Î»Ï {days} ημÎÏες μετά την δημιουÏγία του",
+"By default the public link will expire after {days} days" => "Ο δημόσιος σÏνδεσμος θα απενεÏγοποιηθεί εÏήμην μετά από {days} ημÎÏες",
"Password protect" => "Î Ïοστασία συνθηματικοÏ",
-"Password" => "Συνθηματικό",
+"Choose a password for the public link" => "ΕπιλÎξτε κωδικό για τον δημόσιο σÏνδεσμο",
"Allow Public Upload" => "ΕπιτÏÎπεται η Δημόσια Αποστολή",
"Email link to person" => "Αποστολή συνδÎσμου με email ",
"Send" => "Αποστολή",
@@ -105,8 +109,9 @@ $TRANSLATIONS = array(
"Edit tags" => "ΕπεξεÏγασία ετικετών",
"Error loading dialog template: {error}" => "Σφάλμα φόÏτωσης Ï€ÏοτÏπου διαλόγων: {σφάλμα}",
"No tags selected for deletion." => "Καμμία ετικÎτα δεν επιλÎχθηκε για διαγÏαφή.",
+"Updating {productName} to version {version}, this may take a while." => "ΕνημÎÏωση του {productName} στην Îκδοση {version}, αυτό μποÏεί να διαÏκÎσει λίγη ÏŽÏα.",
"Please reload the page." => "ΠαÏακαλώ επαναφοÏτώστε τη σελίδα.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Η ενημÎÏωση ήταν ανεπιτυχής. ΠαÏακαλώ στείλτε αναφοÏά στην <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">κοινότητα ownCloud</a>.",
+"The update was unsuccessful." => "Η ενημÎÏωση δεν ήταν επιτυχής.",
"The update was successful. Redirecting you to ownCloud now." => "Η ενημÎÏωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
"%s password reset" => "%s επαναφοÏά ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης",
"A problem has occurred whilst sending the email, please contact your administrator." => "ΠαÏουσιάστηκε σφάλμα κατά την αποστολή email, παÏακαλώ επικοινωνήστε με τον διαχειÏιστή.",
@@ -149,6 +154,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ο κατάλογος δεδομÎνων και τα αÏχεία σας είναι πιθανό Ï€Ïοσβάσιμα από το internet γιατί δεν δουλεÏει το αÏχείο .htaccess.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Για πληÏοφοÏίες πως να Ïυθμίσετε οÏθά τον διακομιστή σας, παÏακαλώ δείτε την <a href=\"%s\" target=\"_blank\">τεκμηÏίωση</a>.",
"Create an <strong>admin account</strong>" => "ΔημιουÏγήστε Îναν <strong>λογαÏιασμό διαχειÏιστή</strong>",
+"Password" => "Συνθηματικό",
"Storage & database" => "Αποθήκευση & βάση δεδομÎνων",
"Data folder" => "Φάκελος δεδομÎνων",
"Configure the database" => "ΡÏθμιση της βάσης δεδομÎνων",
@@ -177,7 +183,11 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Αυτό σημαίνει ότι μόνο διαχειÏιστÎÏ‚ μποÏοÏν να χÏησιμοποιήσουν την εγκατάσταση.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Επικοινωνήστε με το διαχειÏιστή του συστήματος αν αυτό το μήνυμα συνεχίζει να εμφανίζεται ή εμφανίστηκε απÏόσμενα.",
"Thank you for your patience." => "Σας ευχαÏιστοÏμε για την υπομονή σας.",
-"Updating ownCloud to version %s, this may take a while." => "ΕνημεÏώνοντας το ownCloud στην Îκδοση %s,μποÏεί να πάÏει λίγο χÏόνο.",
+"%s will be updated to version %s." => "Το %s θα ενημεÏωθεί στην Îκδοση %s.",
+"The following apps will be disabled:" => "Οι παÏακάτω εφαÏμογÎÏ‚ θα απενεÏγοποιηθοÏν:",
+"The theme %s has been disabled." => "Το θÎμα %s Îχει απενεÏγοποιηθεί.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "ΠαÏακαλώ βεβαιωθείτε ότι Îχουν ληψθεί αντίγÏαφα ασφαλείας της βάσης δεδομÎνων, του φακÎλου Ïυθμίσεων και του φακÎλου δεδομÎνων Ï€Ïιν Ï€ÏοχωÏήσετε.",
+"Start update" => "ΈναÏξη ενημÎÏωσης",
"This ownCloud instance is currently being updated, which may take a while." => "Αυτή η εγκατάσταση ownCloud ενημεÏώνεται, το οποίο μποÏεί να πάÏει κάποιο χÏόνο.",
"Please reload this page after a short time to continue using ownCloud." => "ΠαÏακαλώ ανανεώστε αυτή τη σελίδα μετά από Îνα σÏντομο χÏονικό διάστημα ώστε να συνεχίσετε να χÏησιμοποιείτε το ownCloud."
);
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
index 016bf23e8e18bba61e9d476f4b4eec8d5b1e2084..36753fb884e87b68b9e732ecfdf7281f06317245 100644
--- a/core/l10n/en_GB.php
+++ b/core/l10n/en_GB.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"Turned on maintenance mode" => "Turned on maintenance mode",
"Turned off maintenance mode" => "Turned off maintenance mode",
"Updated database" => "Updated database",
+"Disabled incompatible apps: %s" => "Disabled incompatible apps: %s",
"No image or file provided" => "No image or file provided",
"Unknown filetype" => "Unknown filetype",
"Invalid image" => "Invalid image",
@@ -41,10 +42,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n month ago","%n 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",
+"Choose" => "Choose",
+"Error loading file picker template: {error}" => "Error loading file picker template: {error}",
"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"),
@@ -73,8 +74,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "Shared with you by {owner}",
"Share with user or group …" => "Share with user or group …",
"Share link" => "Share link",
+"The public link will expire no later than {days} days after it is created" => "The public link will expire no later than {days} days after it is created",
+"By default the public link will expire after {days} days" => "By default the public link will expire after {days} days",
"Password protect" => "Password protect",
-"Password" => "Password",
+"Choose a password for the public link" => "Choose a password for the public link",
"Allow Public Upload" => "Allow Public Upload",
"Email link to person" => "Email link to person",
"Send" => "Send",
@@ -106,8 +109,9 @@ $TRANSLATIONS = array(
"Edit tags" => "Edit tags",
"Error loading dialog template: {error}" => "Error loading dialog template: {error}",
"No tags selected for deletion." => "No tags selected for deletion.",
+"Updating {productName} to version {version}, this may take a while." => "Updating {productName} to version {version}, this may take a while.",
"Please reload the page." => "Please reload the page.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
+"The update was unsuccessful." => "The update was unsuccessful.",
"The update was successful. Redirecting you to ownCloud now." => "The update was successful. Redirecting you to ownCloud now.",
"%s password reset" => "%s password reset",
"A problem has occurred whilst sending the email, please contact your administrator." => "A problem has occurred whilst sending the email, please contact your administrator.",
@@ -150,6 +154,7 @@ $TRANSLATIONS = array(
"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>",
+"Password" => "Password",
"Storage & database" => "Storage & database",
"Data folder" => "Data folder",
"Configure the database" => "Configure the database",
@@ -178,7 +183,11 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "This means only administrators can use the instance.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Contact your system administrator if this message persists or appeared unexpectedly.",
"Thank you for your patience." => "Thank you for your patience.",
-"Updating ownCloud to version %s, this may take a while." => "Updating ownCloud to version %s, this may take a while.",
+"%s will be updated to version %s." => "%s will be updated to version %s.",
+"The following apps will be disabled:" => "The following apps will be disabled:",
+"The theme %s has been disabled." => "The theme %s has been disabled.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Please make sure that the database, the config folder and the data folder have been backed up before proceeding.",
+"Start update" => "Start update",
"This ownCloud instance is currently being updated, which may take a while." => "This ownCloud instance is currently being updated, which may take a while.",
"Please reload this page after a short time to continue using ownCloud." => "Please reload this page after a short time to continue using ownCloud."
);
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 19d330e5c2658765243a88d704168047bdfa0041..f5844f9469ba59017b8a441ed73e1b12000801be 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("antaÅ %n monato","antaÅ %n monatoj"),
"last year" => "lastajare",
"years ago" => "jaroj antaÅe",
-"Choose" => "Elekti",
"Yes" => "Jes",
"No" => "Ne",
+"Choose" => "Elekti",
"Ok" => "Akcepti",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} dosierkonflikto","{count} dosierkonfliktoj"),
"One file conflict" => "Unu dosierkonflikto",
@@ -46,6 +46,11 @@ $TRANSLATIONS = array(
"Cancel" => "Nuligi",
"(all selected)" => "(ĉiuj elektitas)",
"({count} selected)" => "({count} elektitas)",
+"Very weak password" => "Tre malforta pasvorto",
+"Weak password" => "Malforta pasvorto",
+"So-so password" => "Mezaĉa pasvorto",
+"Good password" => "Bona pasvorto",
+"Strong password" => "Forta pasvorto",
"Shared" => "Dividita",
"Share" => "Kunhavigi",
"Error" => "Eraro",
@@ -57,7 +62,6 @@ $TRANSLATIONS = array(
"Share with user or group …" => "Kunhavigi kun uzanto aŠgrupo...",
"Share link" => "Konhavigi ligilon",
"Password protect" => "Protekti per pasvorto",
-"Password" => "Pasvorto",
"Email link to person" => "RetpoÅti la ligilon al ulo",
"Send" => "Sendi",
"Set expiration date" => "Agordi limdaton",
@@ -88,7 +92,6 @@ $TRANSLATIONS = array(
"Edit tags" => "Redakti etikedojn",
"No tags selected for deletion." => "Neniu etikedo elektitas por forigo.",
"Please reload the page." => "Bonvolu reÅargi la paÄon.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La Äisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouda komunumo</a>.",
"The update was successful. Redirecting you to ownCloud now." => "La Äisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
"Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
"Request failed!<br>Did you make sure your email/username was right?" => "La peto malsukcesis!<br />Ĉu vi certiÄis, ke via retpoÅto/uzantonomo Äustas?",
@@ -116,6 +119,7 @@ $TRANSLATIONS = array(
"Please update your PHP installation to use %s securely." => "Bonvolu Äisdatigi vian PHP-instalon por uzi %s sekure.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ne disponeblas sekura generilo de hazardaj numeroj; bonvolu kapabligi la OpenSSL-kromaĵon por PHP.",
"Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>",
+"Password" => "Pasvorto",
"Data folder" => "Datuma dosierujo",
"Configure the database" => "Agordi la datumbazon",
"will be used" => "estos uzata",
@@ -136,7 +140,6 @@ $TRANSLATIONS = array(
"remember" => "memori",
"Log in" => "Ensaluti",
"Alternative Logins" => "Alternativaj ensalutoj",
-"Thank you for your patience." => "Dankon pro via pacienco.",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud ÄisdatiÄas al eldono %s, tio ĉi povas daÅri je iom da tempo."
+"Thank you for your patience." => "Dankon pro via pacienco."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 53d2a9f4c2b9508be4087c903fe6438643e9f843..b53cbaa5c27787d7d746b8273bd5bee289690aa1 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -31,20 +31,20 @@ $TRANSLATIONS = array(
"December" => "Diciembre",
"Settings" => "Ajustes",
"Saving..." => "Guardando...",
-"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"),
+"seconds ago" => "hace segundos",
+"_%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("Hace %n dÃa","Hace %n dÃas"),
+"_%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("Hace %n mes","Hace %n meses"),
+"_%n month ago_::_%n months ago_" => array("Hace %n mes","hace %n meses"),
"last year" => "el año pasado",
-"years ago" => "años antes",
-"Choose" => "Seleccionar",
-"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
+"years ago" => "hace años",
"Yes" => "SÃ",
"No" => "No",
+"Choose" => "Seleccionar",
+"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
"Ok" => "Aceptar",
"Error loading message template: {error}" => "Error cargando plantilla del mensaje: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de archivo","{count} conflictos de archivo"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "Compartido contigo por {owner}",
"Share with user or group …" => "Compartido con el usuario o con el grupo ...",
"Share link" => "Enlace compartido",
+"The public link will expire no later than {days} days after it is created" => "El link publico no expirará antes de {days} desde que fué creado",
+"By default the public link will expire after {days} days" => "El link publico expirará por defecto pasados {days} dias",
"Password protect" => "Protección con contraseña",
-"Password" => "Contraseña",
+"Choose a password for the public link" => "Elija una contraseña para el enlace publico",
"Allow Public Upload" => "Permitir Subida Pública",
"Email link to person" => "Enviar enlace por correo electrónico a una persona",
"Send" => "Enviar",
@@ -107,7 +109,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Error cargando plantilla de diálogo: {error}",
"No tags selected for deletion." => "No hay etiquetas seleccionadas para borrar.",
"Please reload the page." => "Recargue/Actualice la página",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
"%s password reset" => "%s restablecer contraseña",
"A problem has occurred whilst sending the email, please contact your administrator." => "Ocurrió un problema al enviar el mensaje de correo electrónico. Contacte a su administrador.",
@@ -150,6 +151,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
"Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
+"Password" => "Contraseña",
"Storage & database" => "Almacenamiento y base de datos",
"Data folder" => "Directorio de datos",
"Configure the database" => "Configurar la base de datos",
@@ -178,7 +180,6 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Esto quiere decir que solo un administrador puede usarla.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte con su administrador de sistemas si este mensaje persiste o aparece de forma inesperada.",
"Thank you for your patience." => "Gracias por su paciencia.",
-"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo.",
"This ownCloud instance is currently being updated, which may take a while." => "Esta versión de owncloud se está actualizando, esto puede demorar un tiempo.",
"Please reload this page after a short time to continue using ownCloud." => "Por favor, recargue la página tras un corto periodo de tiempo para continuar usando ownCloud"
);
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 1bf43449fd7cd3bc7fa346840c26d5109f96bac3..5548476e872fd41f76ef41e016b6002821eb6262 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = 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",
-"Choose" => "Elegir",
-"Error loading file picker template: {error}" => "Error cargando la plantilla del selector de archivo: {error}",
"Yes" => "SÃ",
"No" => "No",
+"Choose" => "Elegir",
+"Error loading file picker template: {error}" => "Error cargando la plantilla del selector de archivo: {error}",
"Ok" => "Aceptar",
"Error loading message template: {error}" => "Error cargando la plantilla del mensaje: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("un archivo en conflicto","{count} archivos en conflicto"),
@@ -72,7 +72,6 @@ $TRANSLATIONS = array(
"Share with user or group …" => "Compartir con usuario o grupo ...",
"Share link" => "Compartir vÃnculo",
"Password protect" => "Proteger con contraseña ",
-"Password" => "Contraseña",
"Allow Public Upload" => "Permitir Subida Pública",
"Email link to person" => "Enviar el enlace por e-mail.",
"Send" => "Mandar",
@@ -105,7 +104,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Error cargando la plantilla de dialogo: {error}",
"No tags selected for deletion." => "No se han seleccionado etiquetas para eliminar.",
"Please reload the page." => "Por favor, recargue la página.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización no pudo ser completada. Por favor, reportá el inconveniente a la comunidad <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
"%s password reset" => "%s restablecer contraseña",
"Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
@@ -145,6 +143,7 @@ $TRANSLATIONS = array(
"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>",
+"Password" => "Contraseña",
"Data folder" => "Directorio de almacenamiento",
"Configure the database" => "Configurar la base de datos",
"will be used" => "se usarán",
@@ -171,7 +170,6 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Esto significa que solo administradores pueden usar esta instancia.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte su administrador de sistema si este mensaje persiste o aparece inesperadamente.",
"Thank you for your patience." => "Gracias por su paciencia.",
-"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, puede demorar un rato.",
"This ownCloud instance is currently being updated, which may take a while." => "Esta instancia de ownClod está siendo actualizada, puede tardar un momento.",
"Please reload this page after a short time to continue using ownCloud." => "Por favor, recargue esta página después de un tiempo para continuar usando ownCloud."
);
diff --git a/core/l10n/es_BO.php b/core/l10n/es_BO.php
new file mode 100644
index 0000000000000000000000000000000000000000..ffcdde48d47cbbe4730b36aec880f7e1642688fb
--- /dev/null
+++ b/core/l10n/es_BO.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/es_CL.php b/core/l10n/es_CL.php
index cab130cbd3caf2213a995b59beb45761e635d748..05588a6d67152857aeeebd01ce58fbf9f84d8bb4 100644
--- a/core/l10n/es_CL.php
+++ b/core/l10n/es_CL.php
@@ -30,9 +30,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "último año",
"years ago" => "años anteriores",
-"Choose" => "Choose",
"Yes" => "Si",
"No" => "No",
+"Choose" => "Choose",
"Ok" => "Ok",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Cancelar",
@@ -42,8 +42,8 @@ $TRANSLATIONS = array(
"Error while sharing" => "Ocurrió un error mientras compartÃa",
"Error while unsharing" => "Ocurrió un error mientras dejaba de compartir",
"Error while changing permissions" => "Ocurrió un error mientras se cambiaban los permisos",
-"Password" => "Clave",
"The object type is not specified." => "El tipo de objeto no está especificado.",
-"Username" => "Usuario"
+"Username" => "Usuario",
+"Password" => "Clave"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_CO.php b/core/l10n/es_CO.php
new file mode 100644
index 0000000000000000000000000000000000000000..ffcdde48d47cbbe4730b36aec880f7e1642688fb
--- /dev/null
+++ b/core/l10n/es_CO.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/es_EC.php b/core/l10n/es_EC.php
new file mode 100644
index 0000000000000000000000000000000000000000..ffcdde48d47cbbe4730b36aec880f7e1642688fb
--- /dev/null
+++ b/core/l10n/es_EC.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/es_MX.php b/core/l10n/es_MX.php
index dca69ebaa332674781fe7b9f6618530d58ea7af1..b4c9939c5c9f2fa95ce8b5b27fb4fae3c2f9027b 100644
--- a/core/l10n/es_MX.php
+++ b/core/l10n/es_MX.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
"last year" => "el año pasado",
"years ago" => "años antes",
-"Choose" => "Seleccionar",
-"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
"Yes" => "SÃ",
"No" => "No",
+"Choose" => "Seleccionar",
+"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
"Ok" => "Aceptar",
"Error loading message template: {error}" => "Error cargando plantilla del mensaje: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de archivo","{count} conflictos de archivo"),
@@ -66,7 +66,6 @@ $TRANSLATIONS = array(
"Share with user or group …" => "Compartido con el usuario o con el grupo …",
"Share link" => "Enlace compartido",
"Password protect" => "Protección con contraseña",
-"Password" => "Contraseña",
"Allow Public Upload" => "Permitir Subida Pública",
"Email link to person" => "Enviar enlace por correo electrónico a una persona",
"Send" => "Enviar",
@@ -99,7 +98,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Error cargando plantilla de diálogo: {error}",
"No tags selected for deletion." => "No hay etiquetas seleccionadas para borrar.",
"Please reload the page." => "Vuelva a cargar la página.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
"%s password reset" => "%s restablecer contraseña",
"Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseña: {link}",
@@ -139,6 +137,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
"Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
+"Password" => "Contraseña",
"Data folder" => "Directorio de datos",
"Configure the database" => "Configurar la base de datos",
"will be used" => "se utilizarán",
@@ -165,7 +164,6 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Esto quiere decir que solo un administrador puede usarla.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte con su administrador de sistemas si este mensaje persiste o aparece de forma inesperada.",
"Thank you for your patience." => "Gracias por su paciencia.",
-"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo.",
"This ownCloud instance is currently being updated, which may take a while." => "Esta versión de ownCloud se está actualizando, esto puede demorar un tiempo.",
"Please reload this page after a short time to continue using ownCloud." => "Por favor, recargue esta instancia de onwcloud tras un corto periodo de tiempo y continue usándolo."
);
diff --git a/core/l10n/es_PE.php b/core/l10n/es_PE.php
new file mode 100644
index 0000000000000000000000000000000000000000..ffcdde48d47cbbe4730b36aec880f7e1642688fb
--- /dev/null
+++ b/core/l10n/es_PE.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/es_PY.php b/core/l10n/es_PY.php
new file mode 100644
index 0000000000000000000000000000000000000000..ffcdde48d47cbbe4730b36aec880f7e1642688fb
--- /dev/null
+++ b/core/l10n/es_PY.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/es_US.php b/core/l10n/es_US.php
new file mode 100644
index 0000000000000000000000000000000000000000..ffcdde48d47cbbe4730b36aec880f7e1642688fb
--- /dev/null
+++ b/core/l10n/es_US.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/es_UY.php b/core/l10n/es_UY.php
new file mode 100644
index 0000000000000000000000000000000000000000..ffcdde48d47cbbe4730b36aec880f7e1642688fb
--- /dev/null
+++ b/core/l10n/es_UY.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 4807bc0414c91aaa06fe8ca7cb98deed2e860a3a..559fc2215a1167fac523bf84d4cd20db432f9916 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n kuu tagasi","%n kuud tagasi"),
"last year" => "viimasel aastal",
"years ago" => "aastat tagasi",
-"Choose" => "Vali",
-"Error loading file picker template: {error}" => "Viga failivalija malli laadimisel: {error}",
"Yes" => "Jah",
"No" => "Ei",
+"Choose" => "Vali",
+"Error loading file picker template: {error}" => "Viga failivalija malli laadimisel: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Viga sõnumi malli laadimisel: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} failikonflikt","{count} failikonflikti"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "Sinuga jagas {owner}",
"Share with user or group …" => "Jaga kasutaja või grupiga ...",
"Share link" => "Jaga linki",
+"The public link will expire no later than {days} days after it is created" => "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist",
+"By default the public link will expire after {days} days" => "Avalik link aegub vaikimisi pärast {days} päeva",
"Password protect" => "Parooliga kaitstud",
-"Password" => "Parool",
+"Choose a password for the public link" => "Vali avaliku lingi jaoks parool",
"Allow Public Upload" => "Luba avalik üleslaadimine",
"Email link to person" => "Saada link isikule e-postiga",
"Send" => "Saada",
@@ -107,7 +109,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Viga dialoogi malli laadimisel: {error}",
"No tags selected for deletion." => "Kustutamiseks pole ühtegi silti valitud.",
"Please reload the page." => "Palun laadi see uuesti.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uuendus ebaõnnestus. Palun teavita probleemidest <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kogukonda</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.",
"%s password reset" => "%s parooli lähtestus",
"A problem has occurred whilst sending the email, please contact your administrator." => "Tekkis tõrge e-posti saatmisel, palun kontakteeru administraatoriga.",
@@ -150,6 +151,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.",
"Create an <strong>admin account</strong>" => "Loo <strong>admini konto</strong>",
+"Password" => "Parool",
"Storage & database" => "Andmehoidla ja andmebaas",
"Data folder" => "Andmete kaust",
"Configure the database" => "Seadista andmebaasi",
@@ -178,7 +180,6 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "See tähendab, et seda saavad kasutada ainult administraatorid.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakteeru oma süsteemihalduriga, kui see teade püsib või on tekkinud ootamatult.",
"Thank you for your patience." => "Täname kannatlikkuse eest.",
-"Updating ownCloud to version %s, this may take a while." => "ownCloudi uuendamine versioonile %s. See võib veidi aega võtta.",
"This ownCloud instance is currently being updated, which may take a while." => "Seda ownCloud instantsi hetkel uuendatakse, võib võtta veidi aega.",
"Please reload this page after a short time to continue using ownCloud." => "Palun laadi see leht uuesti veidi aja pärast jätkamaks ownCloud kasutamist."
);
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 3b59fcdddb7f86f13098159b6c34b09f32179334..7c696f50f5840288139c26fec3569a5852e9d29a 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Expiration date is in the past." => "Muga data iraganekoa da",
"Couldn't send mail to following users: %s " => "Ezin izan da posta bidali hurrengo erabiltzaileei: %s",
"Turned on maintenance mode" => "Mantenu modua gaitu da",
"Turned off maintenance mode" => "Mantenu modua desgaitu da",
@@ -40,15 +41,16 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("orain dela hilabete %n","orain dela %n hilabete"),
"last year" => "joan den urtean",
"years ago" => "urte",
-"Choose" => "Aukeratu",
-"Error loading file picker template: {error}" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
"Yes" => "Bai",
"No" => "Ez",
+"Choose" => "Aukeratu",
+"Error loading file picker template: {error}" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
"Ok" => "Ados",
"Error loading message template: {error}" => "Errorea mezu txantiloia kargatzean: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("fitxategi {count}ek konfliktua sortu du","{count} fitxategik konfliktua sortu dute"),
"One file conflict" => "Fitxategi batek konfliktua sortu du",
"New Files" => "Fitxategi Berriak",
+"Already existing files" => "Dagoeneko existitzen diren fitxategiak",
"Which files do you want to keep?" => "Ze fitxategi mantendu nahi duzu?",
"If you select both versions, the copied file will have a number added to its name." => "Bi bertsioak hautatzen badituzu, kopiatutako fitxategiaren izenean zenbaki bat atxikituko zaio.",
"Cancel" => "Ezeztatu",
@@ -56,6 +58,11 @@ $TRANSLATIONS = array(
"(all selected)" => "(denak hautatuta)",
"({count} selected)" => "({count} hautatuta)",
"Error loading file exists template" => "Errorea fitxategia existitzen da txantiloiak kargatzerakoan",
+"Very weak password" => "Pasahitz oso ahula",
+"Weak password" => "Pasahitz ahula",
+"So-so password" => "Halamoduzko pasahitza",
+"Good password" => "Pasahitz ona",
+"Strong password" => "Pasahitz sendoa",
"Shared" => "Elkarbanatuta",
"Share" => "Elkarbanatu",
"Error" => "Errorea",
@@ -67,7 +74,6 @@ $TRANSLATIONS = array(
"Share with user or group …" => "Elkarbanatu erabiltzaile edo taldearekin...",
"Share link" => "Elkarbanatu lotura",
"Password protect" => "Babestu pasahitzarekin",
-"Password" => "Pasahitza",
"Allow Public Upload" => "Gaitu igotze publikoa",
"Email link to person" => "Postaz bidali lotura ",
"Send" => "Bidali",
@@ -100,9 +106,9 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Errorea elkarrizketa txantiloia kargatzean: {errorea}",
"No tags selected for deletion." => "Ez dira ezabatzeko etiketak hautatu.",
"Please reload the page." => "Mesedez birkargatu orria.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud komunitatearentzako</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
"%s password reset" => "%s pasahitza berrezarri",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Arazo bat gertatu da posta elektronikoa bidaltzerakoan, mesedez jarri harremanetan zure administrariarekin.",
"Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora \nepe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan ipini.",
"Request failed!<br>Did you make sure your email/username was right?" => "Eskaerak huts egin du!<br>Ziur zaude posta/pasahitza zuzenak direla?",
@@ -115,6 +121,7 @@ $TRANSLATIONS = array(
"To login page" => "Sarrera orrira",
"New password" => "Pasahitz berria",
"Reset password" => "Berrezarri pasahitza",
+"For the best results, please consider using a GNU/Linux server instead." => "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.",
"Personal" => "Pertsonala",
"Users" => "Erabiltzaileak",
"Apps" => "Aplikazioak",
@@ -140,6 +147,8 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.",
"Create an <strong>admin account</strong>" => "Sortu <strong>kudeatzaile kontu<strong> bat",
+"Password" => "Pasahitza",
+"Storage & database" => "Biltegia & datubasea",
"Data folder" => "Datuen karpeta",
"Configure the database" => "Konfiguratu datu basea",
"will be used" => "erabiliko da",
@@ -162,11 +171,11 @@ $TRANSLATIONS = array(
"remember" => "gogoratu",
"Log in" => "Hasi saioa",
"Alternative Logins" => "Beste erabiltzaile izenak",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s",
"This ownCloud instance is currently in single user mode." => "ownCloud instantzia hau erabiltzaile bakar moduan dago.",
"This means only administrators can use the instance." => "Honek administradoreak bakarrik erabili dezakeela esan nahi du.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Jarri harremanetan zure sistema administratzailearekin mezu hau irauten badu edo bat-batean agertu bada.",
"Thank you for your patience." => "Milesker zure patzientziagatik.",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud %s bertsiora eguneratzen, denbora har dezake.",
"This ownCloud instance is currently being updated, which may take a while." => "ownCloud instantzia hau eguneratzen ari da, honek denbora har dezake.",
"Please reload this page after a short time to continue using ownCloud." => "Mesedez birkargatu orri hau denbora gutxi barru ownCloud erabiltzen jarraitzeko."
);
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index ee634f466c8e3f7c61becc6c9d330281b724eda5..cfde371e4677e017ce9f0ed3ebda49f650281e77 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
+"Unknown filetype" => "نوع Ùایل ناشناخته",
+"Invalid image" => "عکس نامعتبر",
"Sunday" => "یکشنبه",
"Monday" => "دوشنبه",
"Tuesday" => "سه شنبه",
@@ -22,22 +24,27 @@ $TRANSLATIONS = array(
"Settings" => "تنظیمات",
"Saving..." => "در Øال ذخیره سازی...",
"seconds ago" => "ثانیه‌ها پیش",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n minute ago_::_%n minutes ago_" => array("%n دقیقه قبل"),
+"_%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 ماه قبل"),
"last year" => "سال قبل",
"years ago" => "سال‌های قبل",
-"Choose" => "انتخاب کردن",
"Yes" => "بله",
"No" => "نه",
+"Choose" => "انتخاب کردن",
"Ok" => "قبول",
"_{count} file conflict_::_{count} file conflicts_" => array(""),
"New Files" => "Ùایل های جدید",
"Cancel" => "منصر٠شدن",
+"Continue" => "ادامه",
+"Weak password" => "رمز عبور ضعیÙ",
+"So-so password" => "رمز عبور متوسط",
+"Good password" => "رمز عبور خوب",
+"Strong password" => "رمز عبور قوی",
"Shared" => "اشتراک گذاشته شده",
"Share" => "اشتراک‌گذاری",
"Error" => "خطا",
@@ -48,7 +55,6 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "به اشتراک گذاشته شده با شما توسط { دارنده}",
"Share link" => "اشتراک گذاشتن لینک",
"Password protect" => "نگهداری کردن رمز عبور",
-"Password" => "گذرواژه",
"Allow Public Upload" => "اجازه آپلود عمومی",
"Email link to person" => "پیوند ایمیل برای شخص.",
"Send" => "ارسال",
@@ -75,7 +81,6 @@ $TRANSLATIONS = array(
"The object type is not specified." => "نوع شی تعیین نشده است.",
"Delete" => "ØØ°Ù",
"Add" => "اÙزودن",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "به روز رسانی ناموÙÙ‚ بود. لطÙا این خطا را به <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">جامعه ÛŒ OwnCloud</a> گزارش نمایید.",
"The update was successful. Redirecting you to ownCloud now." => "به روزرسانی موÙقیت آمیز بود. در Øال انتقال شما به OwnCloud.",
"Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استÙاده کنید :\n{link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "لینک تنظیم مجدد رمز عبور به ایمیل شما ارسال شده است.<br>اگر آن رادر یک زمان مشخصی دریاÙت نکرده اید، لطÙا هرزنامه/ پوشه های ناخواسته را بررسی کنید.<br>در صورت نبودن از مدیر خود بپرسید.",
@@ -96,12 +101,15 @@ $TRANSLATIONS = array(
"Help" => "راه‌نما",
"Access forbidden" => "اجازه دسترسی به مناطق ممنوعه را ندارید",
"Cloud not found" => "پیدا نشد",
+"Cheers!" => "سلامتی!",
"Security Warning" => "اخطار امنیتی",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "نسخه ÛŒ PHP شما در برابر Øملات NULL Byte آسیب پذیر است.(CVE-2006-7243)",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "هیچ مولد تصادÙÛŒ امن در دسترس نیست، لطÙا Ùرمت PHP OpenSSL را Ùعال نمایید.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "بدون وجود یک تولید کننده اعداد تصادÙÛŒ امن ØŒ یک مهاجم ممکن است این قابلیت را داشته باشد Ú©Ù‡ پیشگویی کند پسوورد های راه انداز گرÙته شده Ùˆ کنترلی روی Øساب کاربری شما داشته باشد .",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ùایلها Ùˆ Ùهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه Ùایل htacces. کار نمی کند.",
"Create an <strong>admin account</strong>" => "لطÙا یک <strong> شناسه برای مدیر</strong> بسازید",
+"Password" => "گذرواژه",
+"Storage & database" => "انبارش و پایگاه داده",
"Data folder" => "پوشه اطلاعاتی",
"Configure the database" => "پایگاه داده برنامه ریزی شدند",
"will be used" => "استÙاده خواهد شد",
@@ -119,7 +127,6 @@ $TRANSLATIONS = array(
"Lost your password?" => "آیا گذرواژه تان را به یاد نمی آورید؟",
"remember" => "بیاد آوری",
"Log in" => "ورود",
-"Alternative Logins" => "ورود متناوب",
-"Updating ownCloud to version %s, this may take a while." => "به روز رسانی OwnCloud به نسخه ی %s، این عملیات ممکن است زمان بر باشد."
+"Alternative Logins" => "ورود متناوب"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 9188469abc2f2e60f69a806f6ce43c26b42e0d70..7bfae86a2306108bb9cc0cb04f4ecc872655031f 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"Turned on maintenance mode" => "Siirrytty ylläpitotilaan",
"Turned off maintenance mode" => "Ylläpitotila laitettu pois päältä",
"Updated database" => "Tietokanta ajan tasalla",
+"Disabled incompatible apps: %s" => "Yhteensopimattomat sovellukset poistettiin käytöstä: %s",
"No image or file provided" => "Kuvaa tai tiedostoa ei määritelty",
"Unknown filetype" => "Tuntematon tiedostotyyppi",
"Invalid image" => "Virhellinen kuva",
@@ -41,10 +42,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n kuukausi sitten","%n kuukautta sitten"),
"last year" => "viime vuonna",
"years ago" => "vuotta sitten",
-"Choose" => "Valitse",
-"Error loading file picker template: {error}" => "Virhe ladatessa tiedostopohjia: {error}",
"Yes" => "Kyllä",
"No" => "Ei",
+"Choose" => "Valitse",
+"Error loading file picker template: {error}" => "Virhe ladatessa tiedostopohjia: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Virhe ladatessa viestipohjaa: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} tiedoston ristiriita","{count} tiedoston ristiriita"),
@@ -73,8 +74,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "Jaettu kanssasi käyttäjän {owner} toimesta",
"Share with user or group …" => "Jaa käyttäjän tai ryhmän kanssa…",
"Share link" => "Jaa linkki",
+"The public link will expire no later than {days} days after it is created" => "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta",
+"By default the public link will expire after {days} days" => "Oletuksena julkinen linkki vanhenee {days} päivässä",
"Password protect" => "Suojaa salasanalla",
-"Password" => "Salasana",
+"Choose a password for the public link" => "Valitse salasana julkiselle linkille",
"Allow Public Upload" => "Salli julkinen lähetys",
"Email link to person" => "Lähetä linkki sähköpostitse",
"Send" => "Lähetä",
@@ -106,8 +109,9 @@ $TRANSLATIONS = array(
"Edit tags" => "Muokkaa tunnisteita",
"Error loading dialog template: {error}" => "Virhe ladatessa keskustelupohja: {error}",
"No tags selected for deletion." => "Tunnisteita ei valittu poistettavaksi.",
+"Updating {productName} to version {version}, this may take a while." => "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.",
"Please reload the page." => "Päivitä sivu.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-yhteisölle</a>.",
+"The update was unsuccessful." => "Päivitys epäonnistui.",
"The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
"%s password reset" => "%s salasanan nollaus",
"A problem has occurred whilst sending the email, please contact your administrator." => "Sähköpostia lähettäessä tapahtui virhe, ota yhteys järjestelmän ylläpitäjään.",
@@ -150,6 +154,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.",
"Create an <strong>admin account</strong>" => "Luo <strong>ylläpitäjän tunnus</strong>",
+"Password" => "Salasana",
"Storage & database" => "Tallennus ja tietokanta",
"Data folder" => "Datakansio",
"Configure the database" => "Muokkaa tietokantaa",
@@ -178,7 +183,11 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Se tarkoittaa, että vain ylläpitäjät voivat nyt käyttää tätä ownCloudia.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Ota yhteys järjestelmän ylläpitäjään, jos tämä viesti ilmenee uudelleen tai odottamatta.",
"Thank you for your patience." => "Kiitos kärsivällisyydestäsi.",
-"Updating ownCloud to version %s, this may take a while." => "Päivitetään ownCloud versioon %s, tämä saattaa kestää hetken.",
+"%s will be updated to version %s." => "%s päivitetään versioon %s.",
+"The following apps will be disabled:" => "Seuraavat sovellukset poistetaan käytöstä:",
+"The theme %s has been disabled." => "Teema %s on poistettu käytöstä.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Varmista ennen jatkamista, että tietokanta, asetuskansio ja datakansio on varmuuskopioitu.",
+"Start update" => "Käynnistä päivitys",
"This ownCloud instance is currently being updated, which may take a while." => "Tätä ownCloud-asennusta päivitetään parhaillaan, siinä saattaa kestää hetki.",
"Please reload this page after a short time to continue using ownCloud." => "Päivitä tämä sivu hetken kuluttua jatkaaksesi ownCloudin käyttämistä."
);
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 49be57abf37a58e833cb2e82a48841c86765d08f..f24f0ec25905a9fda45e63eaa6091dc170614b0b 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"Turned on maintenance mode" => "Basculé en mode maintenance",
"Turned off maintenance mode" => "Basculé en mode production (non maintenance)",
"Updated database" => "Base de données mise à jour",
+"Disabled incompatible apps: %s" => "Applications incompatibles désactivées: %s",
"No image or file provided" => "Aucune image ou fichier fourni",
"Unknown filetype" => "Type de fichier inconnu",
"Invalid image" => "Image invalide",
@@ -41,10 +42,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Il y a %n mois","Il y a %n mois"),
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
-"Choose" => "Choisir",
-"Error loading file picker template: {error}" => "Erreur de chargement du modèle de sélectionneur de fichiers : {error}",
"Yes" => "Oui",
"No" => "Non",
+"Choose" => "Choisir",
+"Error loading file picker template: {error}" => "Erreur de chargement du modèle de sélectionneur de fichiers : {error}",
"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"),
@@ -73,8 +74,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "Partagé avec vous par {owner}",
"Share with user or group …" => "Partager avec un utilisateur ou un groupe...",
"Share link" => "Partager le lien",
+"The public link will expire no later than {days} days after it is created" => "Ce lien public expirera au plus tard, dans {days} jours après sa création.",
+"By default the public link will expire after {days} days" => "Par défaut, le lien public expire après {days} jour(s).",
"Password protect" => "Protéger par un mot de passe",
-"Password" => "Mot de passe",
+"Choose a password for the public link" => "Choisissez un mot de passe pour le lien public.",
"Allow Public Upload" => "Autoriser l'upload par les utilisateurs non enregistrés",
"Email link to person" => "Envoyez le lien par email",
"Send" => "Envoyer",
@@ -106,8 +109,9 @@ $TRANSLATIONS = array(
"Edit tags" => "Modifier les balises",
"Error loading dialog template: {error}" => "Erreur de chargement du modèle de dialogue : {error}",
"No tags selected for deletion." => "Aucune balise sélectionnée pour la suppression.",
+"Updating {productName} to version {version}, this may take a while." => "Mise à jour en cours de {productName} vers la version {version}, cela peut prendre du temps.",
"Please reload the page." => "Veuillez recharger la page.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La mise à jour a échoué. Veuillez signaler ce problème à la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communauté ownCloud</a>.",
+"The update was unsuccessful." => "La mise à jour a échoué.",
"The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.",
"%s password reset" => "Réinitialisation de votre mot de passe %s",
"A problem has occurred whilst sending the email, please contact your administrator." => "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez contacter votre administrateur.",
@@ -150,6 +154,7 @@ $TRANSLATIONS = array(
"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>",
+"Password" => "Mot de passe",
"Storage & database" => "Support de stockage & base de données",
"Data folder" => "Répertoire des données",
"Configure the database" => "Configurer la base de données",
@@ -178,7 +183,11 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Cela signifie que uniquement les administrateurs peuvent utiliser l'instance.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Contactez votre administrateur système si ce message persiste ou apparaît de façon innatendue.",
"Thank you for your patience." => "Merci de votre patience.",
-"Updating ownCloud to version %s, this may take a while." => "Mise à jour en cours d'ownCloud vers la version %s, cela peut prendre du temps.",
+"%s will be updated to version %s." => "%s sera mis à jour vers la version %s.",
+"The following apps will be disabled:" => "Les applications suivantes seront désactivées :",
+"The theme %s has been disabled." => "Le thème %s a été désactivé.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Veuillez vous assurer qu'une copie de sauvegarde de la base de données, du dossier de configuration et du dossier de données a été réalisée avant le commencement de la procédure.",
+"Start update" => "Démarrer la mise à jour.",
"This ownCloud instance is currently being updated, which may take a while." => "Cette instance d'ownCloud est en cours de mise à jour, cela peut prendre du temps.",
"Please reload this page after a short time to continue using ownCloud." => "Merci de recharger cette page après un moment pour continuer à utiliser ownCloud."
);
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 9509446ec7c6c3ac7a0a0f161702471df70c85e0..e43ca0423c145b2e0fce390f3a245928ae9e886c 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"Turned on maintenance mode" => "Modo de mantemento activado",
"Turned off maintenance mode" => "Modo de mantemento desactivado",
"Updated database" => "Base de datos actualizada",
+"Disabled incompatible apps: %s" => "Aplicativos incompatÃbeis desactivados: %s",
"No image or file provided" => "Non forneceu ningunha imaxe ou ficheiro",
"Unknown filetype" => "Tipo de ficheiro descoñecido",
"Invalid image" => "Imaxe incorrecta",
@@ -41,10 +42,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("hai %n mes","hai %n meses"),
"last year" => "último ano",
"years ago" => "anos atrás",
-"Choose" => "Escoller",
-"Error loading file picker template: {error}" => "Produciuse un erro ao cargar o modelo do selector: {error}",
"Yes" => "Si",
"No" => "Non",
+"Choose" => "Escoller",
+"Error loading file picker template: {error}" => "Produciuse un erro ao cargar o modelo do selector: {error}",
"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"),
@@ -73,8 +74,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "Compartido con vostede por {owner}",
"Share with user or group …" => "Compartir cun usuario ou grupo ...",
"Share link" => "Ligazón para compartir",
+"The public link will expire no later than {days} days after it is created" => "A ligazón pública caducará, a máis tardar, {days} dÃas após a súa creación",
+"By default the public link will expire after {days} days" => "De xeito predeterminado, a ligazón pública caduca aos {days} dÃas",
"Password protect" => "Protexido con contrasinais",
-"Password" => "Contrasinal",
+"Choose a password for the public link" => "Escolla un contrasinal para a ligazón pública",
"Allow Public Upload" => "Permitir o envÃo público",
"Email link to person" => "Enviar ligazón por correo",
"Send" => "Enviar",
@@ -106,8 +109,9 @@ $TRANSLATIONS = array(
"Edit tags" => "Editar etiquetas",
"Error loading dialog template: {error}" => "Produciuse un erro ao cargar o modelo do dialogo: {error}",
"No tags selected for deletion." => "Non se seleccionaron etiquetas para borrado.",
+"Updating {productName} to version {version}, this may take a while." => "Actualizando {productName} a versión {version}, isto pode levar un anaco.",
"Please reload the page." => "Volva a cargar a páxina.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualización non foi satisfactoria, informe deste problema á <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade de ownCloud</a>.",
+"The update was unsuccessful." => "A actualización foi satisfactoria.",
"The update was successful. Redirecting you to ownCloud now." => "A actualización realizouse correctamente. RedirixÃndoo agora á ownCloud.",
"%s password reset" => "Restabelecer o contrasinal %s",
"A problem has occurred whilst sending the email, please contact your administrator." => "Produciuse un problema ao mesmo tempo que enviaba o correo, póñase en contacto co administrador.",
@@ -150,6 +154,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "O seu directorio de datos e os ficheiros probabelmente sexan accesÃbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.",
"Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>",
+"Password" => "Contrasinal",
"Storage & database" => "Almacenamento e base de datos",
"Data folder" => "Cartafol de datos",
"Configure the database" => "Configurar a base de datos",
@@ -178,7 +183,11 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Isto significa que só os administradores poden utilizar a instancia.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Póñase en contacto co administrador do sistema se persiste esta mensaxe ou se aparece de forma inesperada.",
"Thank you for your patience." => "Grazas pola súa paciencia.",
-"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a versión %s, esto pode levar un anaco.",
+"%s will be updated to version %s." => "%s actualizarase á versión %s.",
+"The following apps will be disabled:" => "Os seguintes aplicativos van desactivarse:",
+"The theme %s has been disabled." => "O tema %s foi desactivado.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Asegúrese de ter feito unha copia de seguranza da base de datos, do cartafol de configuración e do cartafol de datos, antes de proceder.",
+"Start update" => "Iniciar a actualización",
"This ownCloud instance is currently being updated, which may take a while." => "Esta instancia do ownCloud está actualizandose neste momento, pode levarlle un chisco.",
"Please reload this page after a short time to continue using ownCloud." => "Volva cargar a páxina de aquà a pouco para para continuar co ownCloud."
);
diff --git a/core/l10n/he.php b/core/l10n/he.php
index d629ac662138d855834e83966d3ea796cc4f6786..d139056ec878b50ed177e62bd62eca2672e70ab1 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("×œ×¤× ×™ %n חודש","×œ×¤× ×™ %n חודשי×"),
"last year" => "×©× ×” שעברה",
"years ago" => "×©× ×™×",
-"Choose" => "בחירה",
"Yes" => "כן",
"No" => "ל×",
+"Choose" => "בחירה",
"Ok" => "בסדר",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"New Files" => "×§×‘×¦×™× ×—×“×©×™×",
@@ -47,7 +47,6 @@ $TRANSLATIONS = array(
"Shared with you and the group {group} by {owner}" => "שותף ×תך ×•×¢× ×”×§×‘×•×¦×” {group} שבבעלות {owner}",
"Shared with you by {owner}" => "שותף ×תך על ידי {owner}",
"Password protect" => "×”×’× ×” בססמה",
-"Password" => "סיסמ×",
"Email link to person" => "שליחת קישור בדו×״ל למשתמש",
"Send" => "שליחה",
"Set expiration date" => "הגדרת ת×ריך תפוגה",
@@ -73,7 +72,6 @@ $TRANSLATIONS = array(
"The object type is not specified." => "סוג הפריט ×œ× ×¦×•×™×Ÿ.",
"Delete" => "מחיקה",
"Add" => "הוספה",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "תהליך העדכון ×œ× ×”×•×©×œ× ×‘×”×¦×œ×—×”. × × ×“×•×•×— ×ת הבעיה ב<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">קהילת ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "תהליך העדכון ×”×¡×ª×™×™× ×‘×”×¦×œ×—×”. עכשיו ×ž× ×ª×‘ ×ותך ×ל ownCloud.",
"Use the following link to reset your password: {link}" => "יש להשתמש בקישור ×”×‘× ×›×“×™ ל×פס ×ת הססמה שלך: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "הקישור ל×יפוס הססמה שלך × ×©×œ×— ×ליך בדו×״ל.<br>×× ×œ× ×§×™×‘×œ×ª ×ת הקישור תוך זמן סביר, מוטב לבדוק ×ת תיבת הזבל שלך.<br>×× ×”×”×•×“×¢×” ×œ× ×©×, כד××™ לש×ול ×ת ×ž× ×”×œ הרשת שלך .",
@@ -99,6 +97,7 @@ $TRANSLATIONS = array(
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "×œ×œ× ×ž×—×•×œ×œ ×ž×¡×¤×¨×™× ×קר××™×™× ×ž×ובטח תוקף יכול ×œ× ×‘× ×ת מחרוזות ×יפוס הססמה ולהשתלט על החשבון שלך.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "תיקיית וקבצי המידע שלך ×›× ×¨××” × ×’×™×©×™× ×ž×”××™× ×˜×¨× ×˜ מכיוון שקובץ ×”.htaccess ×œ× ×¢×•×‘×“.",
"Create an <strong>admin account</strong>" => "יצירת <strong>חשבון ×ž× ×”×œ</strong>",
+"Password" => "סיסמ×",
"Data folder" => "תיקיית × ×ª×•× ×™×",
"Configure the database" => "הגדרת מסד ×”× ×ª×•× ×™×",
"will be used" => "×™× ×•×¦×œ×•",
@@ -116,7 +115,6 @@ $TRANSLATIONS = array(
"Lost your password?" => "שכחת ×ת ססמתך?",
"remember" => "שמירת הססמה",
"Log in" => "×›× ×™×¡×”",
-"Alternative Logins" => "×›× ×™×¡×•×ª ××œ×˜×¨× ×˜×™×‘×™×•×ª",
-"Updating ownCloud to version %s, this may take a while." => "מעדכן ×ת ownCloud ×ל ×’×¨×¡× %s, ×–×” עלול לקחת זמן מה."
+"Alternative Logins" => "×›× ×™×¡×•×ª ××œ×˜×¨× ×˜×™×‘×™×•×ª"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index 3fad334f70fbf4b1c493f1fc192df19b6572cbde..1b156291681bb753c91de3799c757d2e484d2a2b 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -27,7 +27,6 @@ $TRANSLATIONS = array(
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Share" => "साà¤à¤¾ करें",
"Error" => "तà¥à¤°à¥à¤Ÿà¤¿",
-"Password" => "पासवरà¥à¤¡",
"Send" => "à¤à¥‡à¤œà¥‡à¤‚",
"No people found" => "कोई वà¥à¤¯à¤•à¥à¤¤à¤¿ नहीं मिले ",
"Sending ..." => "à¤à¥‡à¤œà¤¾ जा रहा है",
@@ -46,6 +45,7 @@ $TRANSLATIONS = array(
"Cloud not found" => "कà¥à¤²à¥Œà¤¡ नहीं मिला ",
"Security Warning" => "सà¥à¤°à¤•à¥à¤·à¤¾ चेतावनी ",
"Create an <strong>admin account</strong>" => "वà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾à¤ªà¤• खाता बनाà¤à¤",
+"Password" => "पासवरà¥à¤¡",
"Data folder" => "डाटा फोलà¥à¤¡à¤°",
"Configure the database" => "डेटाबेस कॉनà¥à¤«à¤¼à¤¿à¤—र करें ",
"will be used" => "उपयोग होगा",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 60b82a22ad78d609a8db45ef54dfa75b48efdcf2..248a56e4fa195eaf85e6d73a36d637c0f5b66789 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "prošlu godinu",
"years ago" => "godina",
-"Choose" => "Izaberi",
"Yes" => "Da",
"No" => "Ne",
+"Choose" => "Izaberi",
"Ok" => "U redu",
"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
"Cancel" => "Odustani",
@@ -43,7 +43,6 @@ $TRANSLATIONS = array(
"Error while unsharing" => "GreÅ¡ka prilikom iskljuÄivanja djeljenja",
"Error while changing permissions" => "Greška prilikom promjena prava",
"Password protect" => "Zaštiti lozinkom",
-"Password" => "Lozinka",
"Set expiration date" => "Postavi datum isteka",
"Expiration date" => "Datum isteka",
"Share via email:" => "Dijeli preko email-a:",
@@ -76,6 +75,7 @@ $TRANSLATIONS = array(
"Access forbidden" => "Pristup zabranjen",
"Cloud not found" => "Cloud nije pronađen",
"Create an <strong>admin account</strong>" => "Stvori <strong>administratorski raÄun</strong>",
+"Password" => "Lozinka",
"Data folder" => "Mapa baze podataka",
"Configure the database" => "Konfiguriraj bazu podataka",
"will be used" => "će se koristiti",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 56b8b4dbc4a823f9cd40ceeb6b74508b457a1f86..7ceb0b4164158baff26a7d8c7d15c671e3878c56 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -4,11 +4,11 @@ $TRANSLATIONS = array(
"Couldn't send mail to following users: %s " => "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s",
"Turned on maintenance mode" => "A karbantartási mód bekapcsolva",
"Turned off maintenance mode" => "A karbantartási mód kikapcsolva",
-"Updated database" => "FrissÃtet adatbázis",
+"Updated database" => "Az adatbázis frissÃtése megtörtént",
"No image or file provided" => "Nincs kép vagy file megadva",
-"Unknown filetype" => "Ismeretlen file tipús",
+"Unknown filetype" => "Ismeretlen fájltÃpus",
"Invalid image" => "Hibás kép",
-"No temporary profile picture available, try again" => "Az átmeneti profil kép nem elérhető, próbáld újra",
+"No temporary profile picture available, try again" => "Az átmeneti profilkép nem elérhető, próbálja újra",
"No crop data provided" => "Vágáshoz nincs adat megadva",
"Sunday" => "vasárnap",
"Monday" => "hétfő",
@@ -41,23 +41,23 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n hónappal ezelőtt","%n hónappal ezelőtt"),
"last year" => "tavaly",
"years ago" => "több éve",
-"Choose" => "Válasszon",
-"Error loading file picker template: {error}" => "Nem sikerült betölteni a fájlkiválasztó sablont: {error}",
"Yes" => "Igen",
"No" => "Nem",
+"Choose" => "Válasszon",
+"Error loading file picker template: {error}" => "Nem sikerült betölteni a fájlkiválasztó sablont: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Nem sikerült betölteni az üzenet sablont: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} fájl ütközik","{count} fájl ütközik"),
"One file conflict" => "Egy file ütközik",
"New Files" => "Új fájlok",
-"Already existing files" => "A fájlok már láteznek",
-"Which files do you want to keep?" => "Melyik file-okat akarod megtartani?",
-"If you select both versions, the copied file will have a number added to its name." => "Ha kiválasztod mindazokaz a verziókat, a másolt fileok neve sorszámozva lesz.",
+"Already existing files" => "A fájlok már léteznek",
+"Which files do you want to keep?" => "Melyik fájlokat akarja megtartani?",
+"If you select both versions, the copied file will have a number added to its name." => "Ha mindkét verziót kiválasztja, a másolt fájlok neve sorszámozva lesz.",
"Cancel" => "Mégsem",
"Continue" => "Folytatás",
"(all selected)" => "(az összes ki lett választva)",
"({count} selected)" => "({count} lett kiválasztva)",
-"Error loading file exists template" => "Hiba a létező sablon betöltésekor",
+"Error loading file exists template" => "Hiba a létezőfájl-sablon betöltésekor",
"Very weak password" => "Nagyon gyenge jelszó",
"Weak password" => "Gyenge jelszó",
"So-so password" => "Nem túl jó jelszó",
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "Megosztotta Önnel: {owner}",
"Share with user or group …" => "Megosztani egy felhasználóval vagy csoporttal ...",
"Share link" => "Megosztás hivatkozással",
+"The public link will expire no later than {days} days after it is created" => "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le",
+"By default the public link will expire after {days} days" => "A nyilvános link érvényessége alapértelmezetten {days} nap múlva jár le",
"Password protect" => "Jelszóval is védem",
-"Password" => "Jelszó",
+"Choose a password for the public link" => "Válasszon egy jelszót a nyilvános linkhez",
"Allow Public Upload" => "Feltöltést is engedélyezek",
"Email link to person" => "Email cÃmre küldjük el",
"Send" => "Küldjük el",
@@ -106,8 +108,7 @@ $TRANSLATIONS = array(
"Edit tags" => "CÃmkék szerkesztése",
"Error loading dialog template: {error}" => "Hiba a párbeszédpanel-sablon betöltésekor: {error}",
"No tags selected for deletion." => "Nincs törlésre kijelölt cÃmke.",
-"Please reload the page." => "Kérlek tölts be újra az oldalt",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A frissÃtés nem sikerült. Kérem értesÃtse errÅ‘l a problémáról az <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud közösséget</a>.",
+"Please reload the page." => "Kérjük frissÃtse az oldalt!",
"The update was successful. Redirecting you to ownCloud now." => "A frissÃtés sikeres volt. VisszairányÃtjuk az ownCloud szolgáltatáshoz.",
"%s password reset" => "%s jelszó visszaállÃtás",
"A problem has occurred whilst sending the email, please contact your administrator." => "Hiba történt e-mail küldése közben. Érdemes az adminisztrátort értesÃteni.",
@@ -119,7 +120,7 @@ $TRANSLATIONS = array(
"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Az Ön állományai titkosÃtva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követÅ‘en nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielÅ‘tt továbbmenne. Biztos, hogy folytatni kÃvánja?",
"Yes, I really want to reset my password now" => "Igen, tényleg meg akarom változtatni a jelszavam",
"Reset" => "VisszaállÃtás",
-"Your password was reset" => "Jelszó megváltoztatva",
+"Your password was reset" => "A jelszava megváltozott",
"To login page" => "A bejelentkező ablakhoz",
"New password" => "Az új jelszó",
"Reset password" => "Jelszó-visszaállÃtás",
@@ -139,7 +140,7 @@ $TRANSLATIONS = array(
"Error unfavoriting" => "Hiba a kedvencekből törléskor",
"Access forbidden" => "A hozzáférés nem engedélyezett",
"Cloud not found" => "A felhő nem található",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Szia!\\n\n\\n\nÉrtesÃtünk, hogy %s megosztotta veled a következÅ‘t: %s.\\n\nItt tudod megnézni: %s\\n\n\\n",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ãœdv!\\n\n\\n\nÉrtesÃtjük, hogy %s megosztotta Önnel a következÅ‘t: %s.\\n\nItt lehet megnézni: %s\\n\n\\n",
"The share will expire on %s." => "A megosztás lejár ekkor %s",
"Cheers!" => "Ãœdv.",
"Security Warning" => "Biztonsági figyelmeztetés",
@@ -150,7 +151,8 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Az adatkönyvtár és a benne levÅ‘ állományok valószÃnűleg közvetlenül is elérhetÅ‘k az internetrÅ‘l, mert a .htaccess állomány nem érvényesül.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "A kiszolgáló megfelelÅ‘ beállÃtásához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.",
"Create an <strong>admin account</strong>" => "<strong>Rendszergazdai belépés</strong> létrehozása",
-"Storage & database" => "Tárolás & adatbázis",
+"Password" => "Jelszó",
+"Storage & database" => "Tárolás és adatbázis",
"Data folder" => "Adatkönyvtár",
"Configure the database" => "Adatbázis konfigurálása",
"will be used" => "adatbázist fogunk használni",
@@ -161,7 +163,7 @@ $TRANSLATIONS = array(
"Database host" => "Adatbázis szerver",
"Finish setup" => "A beállÃtások befejezése",
"Finishing …" => "Befejezés ...",
-"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Az alkalmazás megfelelő működéséhez szükség van JavaScript-re. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Engedélyezd a JavaScript-et</a> és töltsd újra az interfészt.",
+"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Az alkalmazás megfelelÅ‘ működéséhez szükség van JavaScriptre. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Engedélyezze a JavaScriptet</a> és frissÃtse az oldalt!",
"%s is available. Get more information on how to update." => "%s rendelkezésre áll. További információ a frissÃtéshez.",
"Log out" => "Kilépés",
"Automatic logon rejected!" => "Az automatikus bejelentkezés sikertelen!",
@@ -173,12 +175,12 @@ $TRANSLATIONS = array(
"remember" => "emlékezzen",
"Log in" => "Bejelentkezés",
"Alternative Logins" => "AlternatÃv bejelentkezés",
-"This ownCloud instance is currently in single user mode." => "Az Owncloud frissÃtés elezdÅ‘dött egy felhasználós módban.",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ãœdvözöljük!<br><br>\n\nÉrtesÃtjük, hogy %s megosztotta Önnel ezt az állományt: <strong>%s</strong><br>\n<a href=\"%s\">Itt lehet megnézni!</a><br><br>",
+"This ownCloud instance is currently in single user mode." => "Ez az ownCloud szolgáltatás jelenleg egyfelhasználós üzemmódban működik.",
"This means only administrators can use the instance." => "Ez azt jelenti, hogy csak az adminisztrátor használhatja ezt a példányt",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Ha ezt az üzenetet már többször látod akkor keresd meg a rendszer adminját.",
+"Contact your system administrator if this message persists or appeared unexpectedly." => "Ha ez az üzenet ismételten vagy indokolatlanul megjelenik, akkor keresse a rendszergazda segÃtségét!",
"Thank you for your patience." => "Köszönjük a türelmét.",
-"Updating ownCloud to version %s, this may take a while." => "Owncloud frissÃtés a %s verzióra folyamatban. Kis türelmet.",
-"This ownCloud instance is currently being updated, which may take a while." => "Az Owncloud frissÃtés elezdÅ‘dött, eltarthat egy ideig.",
-"Please reload this page after a short time to continue using ownCloud." => "Frissitsd az oldalt ha \"Please reload this page after a short time to continue using ownCloud. \""
+"This ownCloud instance is currently being updated, which may take a while." => "Az ownCloud frissÃtés elkezdÅ‘dött, ez eltarthat egy ideig.",
+"Please reload this page after a short time to continue using ownCloud." => "Frissitse az oldalt egy kis idÅ‘ múlva, ha folytatni kÃvánja az ownCloud használatát."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index ef9c79a654f375ee3cb0b9545c899a27a7cc6e0c..6db312b05567b4eb5e1b197e31a4ce564392d2c3 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -38,9 +38,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "ultime anno",
"years ago" => "annos passate",
-"Choose" => "Seliger",
"Yes" => "Si",
"No" => "No",
+"Choose" => "Seliger",
"Ok" => "Ok",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de file","{count} conflictos de file"),
"One file conflict" => "Un conflicto de file",
@@ -66,7 +66,6 @@ $TRANSLATIONS = array(
"Share with user or group …" => "Compartir con usator o gruppo ...",
"Share link" => "Compartir ligamine",
"Password protect" => "Protegite per contrasigno",
-"Password" => "Contrasigno",
"Allow Public Upload" => "Permitter incargamento public",
"Email link to person" => "Ligamine de e-posta a persona",
"Send" => "Invia",
@@ -97,7 +96,6 @@ $TRANSLATIONS = array(
"Add" => "Adder",
"Edit tags" => "Modifica etiquettas",
"Please reload the page." => "Pro favor recarga le pagina.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Le actualisation terminava sin successo. Pro favor tu reporta iste problema al <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.",
"%s password reset" => "%s contrasigno re-fixate",
"A problem has occurred whilst sending the email, please contact your administrator." => "Un problema ha occurrite quando on inviava le message de e-posta, pro favor continge tu administrator.",
@@ -123,6 +121,7 @@ $TRANSLATIONS = array(
"Security Warning" => "Aviso de securitate",
"Please update your PHP installation to use %s securely." => "Pro favor actualisa tu installation de PHP pro usar %s con securitate.",
"Create an <strong>admin account</strong>" => "Crear un <strong>conto de administration</strong>",
+"Password" => "Contrasigno",
"Storage & database" => "Immagazinage & base de datos",
"Data folder" => "Dossier de datos",
"Configure the database" => "Configurar le base de datos",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 8d18cc60a97a09ed9aacd0496da0bea01697d827..29da84c8e5bc77229d72e87189a5887a9f09cc3d 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -40,14 +40,16 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n bulan yang lalu"),
"last year" => "tahun kemarin",
"years ago" => "beberapa tahun lalu",
-"Choose" => "Pilih",
-"Error loading file picker template: {error}" => "Galat memuat templat berkas pemilih: {error}",
"Yes" => "Ya",
"No" => "Tidak",
+"Choose" => "Pilih",
+"Error loading file picker template: {error}" => "Galat memuat templat berkas pemilih: {error}",
"Ok" => "Oke",
"Error loading message template: {error}" => "Galat memuat templat pesan: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} berkas konflik"),
"One file conflict" => "Satu berkas konflik",
+"New Files" => "Berkas Baru",
+"Already existing files" => "Berkas sudah ada",
"Which files do you want to keep?" => "Berkas mana yang ingin anda pertahankan?",
"If you select both versions, the copied file will have a number added to its name." => "Jika anda memilih kedua versi, berkas yang disalin akan memiliki nomor yang ditambahkan sesuai namanya.",
"Cancel" => "Batal",
@@ -55,6 +57,11 @@ $TRANSLATIONS = array(
"(all selected)" => "(semua terpilih)",
"({count} selected)" => "({count} terpilih)",
"Error loading file exists template" => "Galat memuat templat berkas yang sudah ada",
+"Very weak password" => "Sandi sangat lemah",
+"Weak password" => "Sandi lemah",
+"So-so password" => "Sandi lumayan",
+"Good password" => "Sandi baik",
+"Strong password" => "Sandi kuat",
"Shared" => "Dibagikan",
"Share" => "Bagikan",
"Error" => "Galat",
@@ -66,7 +73,6 @@ $TRANSLATIONS = array(
"Share with user or group …" => "Bagikan dengan pengguna atau grup ...",
"Share link" => "Bagikan tautan",
"Password protect" => "Lindungi dengan sandi",
-"Password" => "Sandi",
"Allow Public Upload" => "Izinkan Unggahan Publik",
"Email link to person" => "Emailkan tautan ini ke orang",
"Send" => "Kirim",
@@ -99,9 +105,9 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Galat memuat templat dialog: {error}",
"No tags selected for deletion." => "Tidak ada tag yang terpilih untuk dihapus.",
"Please reload the page." => "Silakan muat ulang halaman.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitas ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
"%s password reset" => "%s sandi diatur ulang",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Terjadi masalah saat mengirim email, silakan hubungi administrator Anda.",
"Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {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 ." => "Tautan untuk mengatur ulang sandi anda telah dikirimkan ke email Anda.<br>Jika anda tidak menerimanya selama waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada juga, coba tanyakanlah kepada administrator lokal anda.",
"Request failed!<br>Did you make sure your email/username was right?" => "Permintaan gagal!<br>Apakah anda yakin email/nama pengguna anda benar?",
@@ -114,6 +120,8 @@ $TRANSLATIONS = array(
"To login page" => "Ke halaman masuk",
"New password" => "Sandi baru",
"Reset password" => "Atur ulang sandi",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!",
+"For the best results, please consider using a GNU/Linux server instead." => "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ",
"Personal" => "Pribadi",
"Users" => "Pengguna",
"Apps" => "Aplikasi",
@@ -139,6 +147,8 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
"Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
+"Password" => "Sandi",
+"Storage & database" => "Penyimpanan & Basis data",
"Data folder" => "Folder data",
"Configure the database" => "Konfigurasikan basis data",
"will be used" => "akan digunakan",
@@ -165,7 +175,6 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Ini berarti hanya administrator yang dapat menggunakan ownCloud.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Hubungi administrator sistem anda jika pesan ini terus muncul atau muncul tiba-tiba.",
"Thank you for your patience." => "Terima kasih atas kesabaran anda.",
-"Updating ownCloud to version %s, this may take a while." => "Memperbarui ownCloud ke versi %s, prosesnya akan berlangsung beberapa saat.",
"This ownCloud instance is currently being updated, which may take a while." => "ownCloud ini sedang diperbarui, yang mungkin memakan waktu cukup lama.",
"Please reload this page after a short time to continue using ownCloud." => "Muat ulang halaman ini setelah beberapa saat untuk tetap menggunakan ownCloud."
);
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 254c4b38689f7d3fa5d81b8cbdb3b4d9cba2b960..aa1aee6d290e6bb12e69813255f9db4c6b895bbc 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "sÃðasta ári",
"years ago" => "einhverjum árum",
-"Choose" => "Veldu",
"Yes" => "Já",
"No" => "Nei",
+"Choose" => "Veldu",
"Ok" => "Ã lagi",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Hætta við",
@@ -46,7 +46,6 @@ $TRANSLATIONS = array(
"Shared with you and the group {group} by {owner}" => "Deilt með þér og hópnum {group} af {owner}",
"Shared with you by {owner}" => "Deilt með þér af {owner}",
"Password protect" => "Verja með lykilorði",
-"Password" => "Lykilorð",
"Email link to person" => "Senda vefhlekk à tölvupóstu til notenda",
"Send" => "Senda",
"Set expiration date" => "Setja gildistÃma",
@@ -90,6 +89,7 @@ $TRANSLATIONS = array(
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Enginn traustur slembitölugjafi à boði, vinsamlegast virkjaðu PHP OpenSSL viðbótina.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ãn öruggs slembitölugjafa er mögulegt að sjá fyrir öryggis auðkenni til að endursetja lykilorð og komast inn á aðganginn þinn.",
"Create an <strong>admin account</strong>" => "Útbúa <strong>vefstjóra aðgang</strong>",
+"Password" => "Lykilorð",
"Data folder" => "Gagnamappa",
"Configure the database" => "Stilla gagnagrunn",
"will be used" => "verður notað",
@@ -106,7 +106,6 @@ $TRANSLATIONS = array(
"Please change your password to secure your account again." => "Vinsamlegast breyttu lykilorðinu þÃnu til að tryggja öryggi þitt.",
"Lost your password?" => "Týndir þú lykilorðinu?",
"remember" => "muna eftir mér",
-"Log in" => "<strong>Skrá inn</strong>",
-"Updating ownCloud to version %s, this may take a while." => "Uppfæri ownCloud à útgáfu %s, það gæti tekið smá stund."
+"Log in" => "<strong>Skrá inn</strong>"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/it.php b/core/l10n/it.php
index dfcc0a480ac40a82e1e2ac11e2ba038b3cb73c95..9e5a30cbe6481e8be1ab2ecf4afecd62e1c05864 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n mese fa","%n mesi fa"),
"last year" => "anno scorso",
"years ago" => "anni fa",
-"Choose" => "Scegli",
-"Error loading file picker template: {error}" => "Errore durante il caricamento del modello del selettore file: {error}",
"Yes" => "Sì",
"No" => "No",
+"Choose" => "Scegli",
+"Error loading file picker template: {error}" => "Errore durante il caricamento del modello del selettore file: {error}",
"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"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "Condiviso con te da {owner}",
"Share with user or group …" => "Condividi con utente o gruppo ...",
"Share link" => "Condividi collegamento",
+"The public link will expire no later than {days} days after it is created" => "Il collegamento pubblico scadrà non più tardi di {days} giorni dopo la sua creazione",
+"By default the public link will expire after {days} days" => "In modo predefinito, il collegamento pubblico scadrà dopo {days} giorni",
"Password protect" => "Proteggi con password",
-"Password" => "Password",
+"Choose a password for the public link" => "Scegli una password per il collegamento pubblico",
"Allow Public Upload" => "Consenti caricamento pubblico",
"Email link to person" => "Invia collegamento via email",
"Send" => "Invia",
@@ -107,7 +109,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Errore durante il caricamento del modello di finestra: {error}",
"No tags selected for deletion." => "Nessuna etichetta selezionata per l'eliminazione.",
"Please reload the page." => "Ricarica la pagina.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunità di ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
"%s password reset" => "Ripristino password di %s",
"A problem has occurred whilst sending the email, please contact your administrator." => "Si è verificato un problema durante l'invio della email, contatta il tuo amministratore.",
@@ -150,6 +151,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
"Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
+"Password" => "Password",
"Storage & database" => "Archiviazione e database",
"Data folder" => "Cartella dati",
"Configure the database" => "Configura il database",
@@ -178,7 +180,6 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Ciò significa che solo gli amministratori possono utilizzare l'istanza.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Contatta il tuo amministratore di sistema se questo messaggio persiste o appare inaspettatamente.",
"Thank you for your patience." => "Grazie per la pazienza.",
-"Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, ciò potrebbe richiedere del tempo.",
"This ownCloud instance is currently being updated, which may take a while." => "Questa istanza di ownCloud è in fase di aggiornamento, potrebbe richiedere del tempo.",
"Please reload this page after a short time to continue using ownCloud." => "Ricarica questa pagina per poter continuare ad usare ownCloud."
);
diff --git a/core/l10n/ja.php b/core/l10n/ja.php
index cedf0009cb5809d3cb5f90480b2da244dad871fb..187fe575e910cdcaadb190bac45d245d9de03e00 100644
--- a/core/l10n/ja.php
+++ b/core/l10n/ja.php
@@ -41,17 +41,17 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%nヶ月å‰"),
"last year" => "1å¹´å‰",
"years ago" => "æ•°å¹´å‰",
-"Choose" => "é¸æŠž",
-"Error loading file picker template: {error}" => "ファイルé¸æŠžãƒ†ãƒ³ãƒ—レートã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: {error}",
"Yes" => "ã¯ã„",
"No" => "ã„ã„ãˆ",
+"Choose" => "é¸æŠž",
+"Error loading file picker template: {error}" => "ファイルé¸æŠžãƒ†ãƒ³ãƒ—レートã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: {error}",
"Ok" => "OK",
"Error loading message template: {error}" => "メッセージテンプレートã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} ファイルãŒç«¶åˆ"),
"One file conflict" => "1ファイルãŒç«¶åˆ",
"New Files" => "æ–°ã—ã„ファイル",
-"Already existing files" => "ファイルãŒã™ã§ã«å˜åœ¨ã—ã¾ã™",
-"Which files do you want to keep?" => "ã©ã¡ã‚‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿æŒã—ãŸã„ã§ã™ã‹ï¼Ÿ",
+"Already existing files" => "æ—¢å˜ã®ãƒ•ã‚¡ã‚¤ãƒ«",
+"Which files do you want to keep?" => "ã©ã¡ã‚‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿æŒã—ã¾ã™ã‹ï¼Ÿ",
"If you select both versions, the copied file will have a number added to its name." => "両方ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’é¸æŠžã—ãŸå ´åˆã¯ã€ãƒ•ã‚¡ã‚¤ãƒ«åã®å¾Œã‚ã«æ•°å—ã‚’è¿½åŠ ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚³ãƒ”ーを作æˆã—ã¾ã™ã€‚",
"Cancel" => "ã‚ャンセル",
"Continue" => "続ã‘ã‚‹",
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "{owner} ã¨å…±æœ‰ä¸",
"Share with user or group …" => "ユーザーもã—ãã¯ã‚°ãƒ«ãƒ¼ãƒ—ã¨å…±æœ‰ ...",
"Share link" => "URLã§å…±æœ‰",
+"The public link will expire no later than {days} days after it is created" => "公開用リンクã¯ã€ä½œæˆã—ã¦ã‹ã‚‰ {days} 日以内ã«æœ‰åŠ¹æœŸé™åˆ‡ã‚Œã«ãªã‚Šã¾ã™",
+"By default the public link will expire after {days} days" => "デフォルトã®è¨å®šã§ã¯ã€å…¬é–‹ç”¨ãƒªãƒ³ã‚¯ã¯ {days} 日後ã«æœ‰åŠ¹æœŸé™åˆ‡ã‚Œã«ãªã‚Šã¾ã™",
"Password protect" => "パスワードä¿è·",
-"Password" => "パスワード",
+"Choose a password for the public link" => "公開用リンクã®ãƒ‘スワードをé¸æŠž",
"Allow Public Upload" => "アップãƒãƒ¼ãƒ‰ã‚’許å¯",
"Email link to person" => "メールリンク",
"Send" => "é€ä¿¡",
@@ -107,7 +109,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "メッセージテンプレートã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: {error}",
"No tags selected for deletion." => "削除ã™ã‚‹ã‚¿ã‚°ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。",
"Please reload the page." => "ページをリãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„。",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "アップデートã«å¤±æ•—ã—ã¾ã—ãŸã€‚ã“ã®å•é¡Œã‚’ <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a> ã«ãƒ¬ãƒãƒ¼ãƒˆã—ã¦ãã ã•ã„。",
"The update was successful. Redirecting you to ownCloud now." => "アップデートã«æˆåŠŸã—ã¾ã—ãŸã€‚今ã™ãownCloudã«ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã—ã¾ã™ã€‚",
"%s password reset" => "%s パスワードリセット",
"A problem has occurred whilst sending the email, please contact your administrator." => "メールã®é€ä¿¡ä¸ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚管ç†è€…ã«å•ã„åˆã‚ã›ãã ã•ã„。",
@@ -150,6 +151,7 @@ $TRANSLATIONS = array(
"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>を作æˆã—ã¦ãã ã•ã„",
+"Password" => "パスワード",
"Storage & database" => "ストレージã¨ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹",
"Data folder" => "データフォルダー",
"Configure the database" => "データベースをè¨å®šã—ã¦ãã ã•ã„",
@@ -178,7 +180,6 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "ã“ã‚Œã¯ã€ç®¡ç†è€…ã®ã¿ãŒã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’利用ã§ãã‚‹ã“ã¨ã‚’æ„味ã—ã¦ã„ã¾ã™ã€‚",
"Contact your system administrator if this message persists or appeared unexpectedly." => "ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒå¼•ã続ãã‚‚ã—ãã¯äºˆæœŸã›ãšç¾ã‚Œã‚‹å ´åˆã¯ã€ã‚·ã‚¹ãƒ†ãƒ 管ç†è€…ã«é€£çµ¡ã—ã¦ãã ã•ã„。",
"Thank you for your patience." => "ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„。",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud ã‚’ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s ã«æ›´æ–°ã—ã¦ã„ã¾ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„。",
"This ownCloud instance is currently being updated, which may take a while." => "ã“ã® ownCloud インスタンスã¯ç¾åœ¨ã‚¢ãƒƒãƒ—デートä¸ã®ãŸã‚ã€ã—ã°ã‚‰ã時間ãŒã‹ã‹ã‚Šã¾ã™ã€‚",
"Please reload this page after a short time to continue using ownCloud." => "ownCloud を続ã‘ã¦åˆ©ç”¨ã™ã‚‹ã«ã¯ã€ã—ã°ã‚‰ãã—ãŸå¾Œã§ãƒšãƒ¼ã‚¸ã‚’リãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„。"
);
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 3389bafa7a2886577984ca6464aec6de4fee5f0a..c753ef4e1d5df68ca28955e48656c02ab994b24b 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array(""),
"last year" => "ბáƒáƒšáƒ წელს",
"years ago" => "წლის წინ",
-"Choose" => "áƒáƒ ჩევáƒ",
"Yes" => "კი",
"No" => "áƒáƒ áƒ",
+"Choose" => "áƒáƒ ჩევáƒ",
"Ok" => "დიáƒáƒ®",
"_{count} file conflict_::_{count} file conflicts_" => array(""),
"New Files" => "áƒáƒ®áƒáƒšáƒ˜ ფáƒáƒ˜áƒšáƒ”ბი",
@@ -47,7 +47,6 @@ $TRANSLATIONS = array(
"Shared with you and the group {group} by {owner}" => "გáƒáƒ–იáƒáƒ დრთქვენთვის დრჯგუფისთვის {group}, {owner}–ის მიერ",
"Shared with you by {owner}" => "გáƒáƒ–იáƒáƒ დრთქვენთვის {owner}–ის მიერ",
"Password protect" => "პáƒáƒ áƒáƒšáƒ˜áƒ— დáƒáƒªáƒ•áƒ",
-"Password" => "პáƒáƒ áƒáƒšáƒ˜",
"Email link to person" => "ლინკის პირáƒáƒ•áƒœáƒ”ბის იმეილზე გáƒáƒ’ზáƒáƒ•áƒœáƒ",
"Send" => "გáƒáƒ’ზáƒáƒ•áƒœáƒ",
"Set expiration date" => "მიუთითე ვáƒáƒ“ის გáƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ დრáƒ",
@@ -73,7 +72,6 @@ $TRANSLATIONS = array(
"The object type is not specified." => "áƒáƒ‘იექტის ტიპი áƒáƒ áƒáƒ ის მითითებული.",
"Delete" => "წáƒáƒ¨áƒšáƒ",
"Add" => "დáƒáƒ›áƒáƒ¢áƒ”ბáƒ",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "გáƒáƒœáƒáƒ®áƒšáƒ”ბრვერგáƒáƒœáƒ®áƒáƒ ციელდáƒ. გთხáƒáƒ•áƒ— შეგვáƒáƒ¢áƒ§áƒáƒ‘ინáƒáƒ— áƒáƒ› პრáƒáƒ‘ლემის შესáƒáƒ®áƒ”ბ áƒáƒ¥: <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "გáƒáƒœáƒáƒ®áƒšáƒ”ბრვერგáƒáƒœáƒ®áƒáƒ ციელდáƒ. გáƒáƒ“áƒáƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ თებრთქვენს ownCloud–ზე.",
"Use the following link to reset your password: {link}" => "გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნე შემდეგი ლინკი პáƒáƒ áƒáƒšáƒ˜áƒ¡ შესáƒáƒªáƒ•áƒšáƒ”ლáƒáƒ“: {link}",
"You will receive a link to reset your password via Email." => "თქვენ მáƒáƒ’ივáƒáƒ— პáƒáƒ áƒáƒšáƒ˜áƒ¡ შესáƒáƒªáƒ•áƒšáƒ”ლი ლინკი მეილზე",
@@ -95,6 +93,7 @@ $TRANSLATIONS = array(
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "შემთხვევითი სიმბáƒáƒšáƒáƒ”ბის გენერáƒáƒ¢áƒáƒ ის გáƒáƒ ეშე, შემტევმრშეიძლებრáƒáƒ›áƒáƒ˜áƒªáƒœáƒáƒ¡ თქვენი პáƒáƒ áƒáƒšáƒ˜ შეგიცვáƒáƒšáƒáƒ— ის დრდáƒáƒ”უფლáƒáƒ¡ თქვენს ექáƒáƒ£áƒœáƒ—ს.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "თქვენი data დირექტáƒáƒ ირდრფáƒáƒ˜áƒšáƒ”ბი დáƒáƒ¨áƒ•áƒ”ბáƒáƒ“ირინტერნეტში რáƒáƒ“გáƒáƒœ .htaccess ფáƒáƒ˜áƒšáƒ˜ áƒáƒ მუშáƒáƒáƒ‘ს.",
"Create an <strong>admin account</strong>" => "შექმენი <strong>áƒáƒ“მინ ექáƒáƒ£áƒœáƒ¢áƒ˜</strong>",
+"Password" => "პáƒáƒ áƒáƒšáƒ˜",
"Data folder" => "მáƒáƒœáƒáƒªáƒ”მთრსáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე",
"Configure the database" => "მáƒáƒœáƒáƒªáƒ”მთრბáƒáƒ–ის კáƒáƒœáƒ¤áƒ˜áƒ’ურირებáƒ",
"will be used" => "გáƒáƒ›áƒáƒ§áƒ”ნებული იქნებáƒ",
@@ -111,7 +110,6 @@ $TRANSLATIONS = array(
"Lost your password?" => "დáƒáƒ’áƒáƒ•áƒ˜áƒ¬áƒ§áƒ“áƒáƒ— პáƒáƒ áƒáƒšáƒ˜?",
"remember" => "დáƒáƒ›áƒáƒ®áƒ¡áƒáƒ•áƒ ებáƒ",
"Log in" => "შესვლáƒ",
-"Alternative Logins" => "áƒáƒšáƒ¢áƒ”რნáƒáƒ¢áƒ˜áƒ£áƒšáƒ˜ Login–ი",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud–ის გáƒáƒœáƒáƒ®áƒšáƒ”ბრ%s–ვერსიáƒáƒ›áƒ“ე. ეს მáƒáƒ˜áƒ—ხáƒáƒ•áƒ¡ გáƒáƒ კვეულ დრáƒáƒ¡."
+"Alternative Logins" => "áƒáƒšáƒ¢áƒ”რნáƒáƒ¢áƒ˜áƒ£áƒšáƒ˜ Login–ი"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/km.php b/core/l10n/km.php
index 0eac818c5780cd7534d983931145654ed7e66892..0be6738284b06263070c2f21f10333d968db36e8 100644
--- a/core/l10n/km.php
+++ b/core/l10n/km.php
@@ -33,12 +33,22 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n ážáŸ‚​មុន"),
"last year" => "ឆ្នាំ​មុន",
"years ago" => "ឆ្នាំ​មុន",
-"Choose" => "ជ្រើស",
"Yes" => "ព្រម",
"No" => "áž‘áŸ",
+"Choose" => "ជ្រើស",
"Ok" => "ព្រម",
"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"New Files" => "ឯកសារ​ážáŸ’មី",
+"Already existing files" => "មាន​ឯកសារ​នáŸáŸ‡â€‹ážšáž½áž…​ហើយ",
"Cancel" => "លើកលែង",
+"Continue" => "បន្áž",
+"(all selected)" => "(បាន​ជ្រើស​ទាំង​អស់)",
+"({count} selected)" => "(បាន​ជ្រើស {count})",
+"Very weak password" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ​ណាស់",
+"Weak password" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ",
+"So-so password" => "ពាក្យ​សម្ងាážáŸ‹â€‹áž’ម្មážáž¶",
+"Good password" => "ពាក្យ​សម្ងាážáŸ‹â€‹áž›áŸ’អ",
+"Strong password" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’លាំង",
"Shared" => "បាន​ចែក​រំលែក",
"Share" => "ចែក​រំលែក",
"Error" => "កំហុស",
@@ -48,7 +58,7 @@ $TRANSLATIONS = array(
"Shared with you and the group {group} by {owner}" => "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}",
"Shared with you by {owner}" => "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}",
"Password protect" => "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាážáŸ‹",
-"Password" => "ពាក្យសម្ងាážáŸ‹",
+"Allow Public Upload" => "អនុញ្ញាážâ€‹áž€áž¶ážšâ€‹áž•áŸ’ទុកឡើង​ជា​សាធារណៈ",
"Send" => "ផ្ញើ",
"Set expiration date" => "កំណážáŸ‹â€‹áž–áŸáž›â€‹áž•áž»ážâ€‹áž€áŸ†ážŽážáŸ‹",
"Expiration date" => "áž–áŸáž›â€‹áž•áž»ážâ€‹áž€áŸ†ážŽážáŸ‹",
@@ -71,6 +81,8 @@ $TRANSLATIONS = array(
"The object type is not specified." => "មិន​បាន​កំណážáŸ‹â€‹áž”្រភáŸáž‘​វážáŸ’ážáž»áŸ”",
"Delete" => "លុប",
"Add" => "បញ្ចូល",
+"Please reload the page." => "សូម​ផ្ទុក​ទំពáŸážšâ€‹áž“áŸáŸ‡â€‹áž¡áž¾áž„​វិញ។",
+"A problem has occurred whilst sending the email, please contact your administrator." => "មាន​កំហុស​បាន​កើážâ€‹áž¡áž¾áž„​នៅ​ពáŸáž›áž›â€‹áž€áŸ†áž–ុង​ផ្ញើ​អ៊ីមែល​ចáŸáž‰, សូម​ទាក់ទង​អភិបាល​របស់​អ្នក។",
"Username" => "ឈ្មោះ​អ្នកប្រើ",
"Your password was reset" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក​ážáŸ’រូវ​បាន​កំណážáŸ‹â€‹áž¡áž¾áž„​វិញ",
"To login page" => "ទៅ​ទំពáŸážšâ€‹áž…ូល",
@@ -83,6 +95,25 @@ $TRANSLATIONS = array(
"Help" => "ជំនួយ",
"Access forbidden" => "បាន​ហាមឃាážáŸ‹â€‹áž€áž¶ážšâ€‹áž…ូល",
"Cloud not found" => "រក​មិន​ឃើញ Cloud",
-"Security Warning" => "បម្រាម​សុវážáŸ’ážáž·áž—ាព"
+"Security Warning" => "បម្រាម​សុវážáŸ’ážáž·áž—ាព",
+"Create an <strong>admin account</strong>" => "បង្កើážâ€‹<strong>គណនី​អភិបាល</strong>",
+"Password" => "ពាក្យសម្ងាážáŸ‹",
+"Storage & database" => "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្ននáŸáž™",
+"Data folder" => "ážážâ€‹áž‘ិន្ននáŸáž™",
+"Configure the database" => "កំណážáŸ‹â€‹ážŸážŽáŸ’ឋាន​មូលដ្ឋាន​ទិន្ននáŸáž™",
+"will be used" => "នឹង​ážáŸ’រូវ​បាន​ប្រើ",
+"Database user" => "អ្នក​ប្រើ​មូលដ្ឋាន​ទិន្ននáŸáž™",
+"Database password" => "ពាក្យ​សម្ងាážáŸ‹â€‹áž˜áž¼áž›ážŠáŸ’ឋាន​ទិន្ននáŸáž™",
+"Database name" => "ឈ្មោះ​មូលដ្ឋាន​ទិន្ននáŸáž™",
+"Database host" => "ម៉ាស៊ីន​មូលដ្ឋាន​ទិន្ននáŸáž™",
+"Finish setup" => "បញ្ចប់​ការ​ដំឡើង",
+"Finishing …" => "កំពុង​បញ្ចប់ ...",
+"Log out" => "ចាក​ចáŸáž‰",
+"Automatic logon rejected!" => "បាន​បដិសáŸáž’​ការ​ចូល​ដោយ​ស្វáŸáž™â€‹áž”្រវážáŸ’ážáž·!",
+"Please change your password to secure your account again." => "សូម​ប្ដូរ​ពាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក ដើម្បី​ការពារ​គណនី​របស់​អ្នក។",
+"Lost your password?" => "បាážáŸ‹â€‹áž–ាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក?",
+"remember" => "ចងចាំ",
+"Log in" => "ចូល",
+"Alternative Logins" => "ការ​ចូល​ជំនួស"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index d8c32e070d3dfffb894ce43f6db0ecc304cdeada..7fd17d465be04a0823dc994c304773a9dc31a7b5 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n달 ì „ "),
"last year" => "ìž‘ë…„",
"years ago" => "ë…„ ì „",
-"Choose" => "ì„ íƒ",
-"Error loading file picker template: {error}" => "íŒŒì¼ ì„ íƒ í…œí”Œë¦¿ì„ ë¶ˆëŸ¬ì˜¤ëŠ” 중 오류 ë°œìƒ: {error}",
"Yes" => "예",
"No" => "아니요",
+"Choose" => "ì„ íƒ",
+"Error loading file picker template: {error}" => "íŒŒì¼ ì„ íƒ í…œí”Œë¦¿ì„ ë¶ˆëŸ¬ì˜¤ëŠ” 중 오류 ë°œìƒ: {error}",
"Ok" => "확ì¸",
"Error loading message template: {error}" => "메시지 í…œí”Œë¦¿ì„ ë¶ˆëŸ¬ì˜¤ëŠ” 중 오류 ë°œìƒ: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("íŒŒì¼ {count}ê°œ 충ëŒ"),
@@ -71,7 +71,6 @@ $TRANSLATIONS = array(
"Share with user or group …" => "ì‚¬ìš©ìž ë° ê·¸ë£¹ê³¼ ê³µìœ ...",
"Share link" => "ë§í¬ ê³µìœ ",
"Password protect" => "암호 보호",
-"Password" => "암호",
"Allow Public Upload" => "공개 업로드 허용",
"Email link to person" => "ì´ë©”ì¼ ì£¼ì†Œ",
"Send" => "ì „ì†¡",
@@ -104,7 +103,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "대화 ìƒìž í…œí”Œë¦¿ì„ ë¶ˆëŸ¬ì˜¤ëŠ” 중 오류 ë°œìƒ: {error}",
"No tags selected for deletion." => "ì‚ì œí• íƒœê·¸ë¥¼ ì„ íƒí•˜ì§€ 않았습니다.",
"Please reload the page." => "페ì´ì§€ë¥¼ 새로 ê³ ì¹˜ì‹ì‹œì˜¤.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "ì—…ë°ì´íŠ¸ê°€ 실패하였습니다. ì´ ë¬¸ì œë¥¼ <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 커뮤니티</a>ì— ë³´ê³ í•´ 주ì‹ì‹œì˜¤.",
"The update was successful. Redirecting you to ownCloud now." => "ì—…ë°ì´íŠ¸ê°€ 성공하였습니다. ownCloudë¡œ ëŒì•„갑니다.",
"%s password reset" => "%s 암호 ìž¬ì„¤ì •",
"Use the following link to reset your password: {link}" => "ë‹¤ìŒ ë§í¬ë¥¼ 사용하여 암호를 ìž¬ì„¤ì •í• ìˆ˜ 있습니다: {link}",
@@ -144,6 +142,7 @@ $TRANSLATIONS = array(
"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> 만들기",
+"Password" => "암호",
"Storage & database" => "ìŠ¤í† ë¦¬ì§€ & ë°ì´í„°ë² ì´ìŠ¤",
"Data folder" => "ë°ì´í„° í´ë”",
"Configure the database" => "ë°ì´í„°ë² ì´ìŠ¤ ì„¤ì •",
@@ -171,7 +170,6 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "현재 시스템 관리ìžë§Œ ì¸ìŠ¤í„´ìŠ¤ë¥¼ ì‚¬ìš©í• ìˆ˜ 있습니다.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "ì´ ë©”ì‹œì§€ê°€ ê³„ì† í‘œì‹œë˜ê±°ë‚˜, 예ìƒí•˜ì§€ ëª»í•˜ì˜€ì„ ë•Œ 표시ëœë‹¤ë©´ 시스템 관리ìžì—게 ì—°ë½í•˜ì‹ì‹œì˜¤",
"Thank you for your patience." => "ê¸°ë‹¤ë ¤ 주셔서 ê°ì‚¬í•©ë‹ˆë‹¤.",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud를 ë²„ì „ %s(으)ë¡œ ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤. ìž ì‹œ ê¸°ë‹¤ë ¤ 주ì‹ì‹œì˜¤.",
"This ownCloud instance is currently being updated, which may take a while." => "ownCloud ì¸ìŠ¤í„´ìŠ¤ê°€ 현재 ì—…ë°ì´íŠ¸ 중입니다. ìž ì‹œë§Œ ê¸°ë‹¤ë ¤ 주ì‹ì‹œì˜¤.",
"Please reload this page after a short time to continue using ownCloud." => "ìž ì‹œ 후 페ì´ì§€ë¥¼ 다시 불러온 ë‹¤ìŒ ownCloud를 사용해 주ì‹ì‹œì˜¤."
);
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
index 781018d4ab859659ba4960dbf50eda631275ccc6..3aa234f1d51df844a8e03123b94675790fd64e47 100644
--- a/core/l10n/ku_IQ.php
+++ b/core/l10n/ku_IQ.php
@@ -12,7 +12,6 @@ $TRANSLATIONS = array(
"Cancel" => "لابردن",
"Share" => "هاوبەشی کردن",
"Error" => "هه‌ڵه",
-"Password" => "وشەی تێپەربو",
"Warning" => "ئاگاداری",
"Add" => "زیادکردن",
"Username" => "ناوی به‌کارهێنه‌ر",
@@ -23,6 +22,7 @@ $TRANSLATIONS = array(
"Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی",
"Help" => "یارمەتی",
"Cloud not found" => "هیچ نه‌دۆزرایه‌وه‌",
+"Password" => "وشەی تێپەربو",
"Data folder" => "زانیاری Ùۆڵده‌ر",
"Database user" => "به‌كارهێنه‌ری داتابه‌یس",
"Database password" => "وشه‌ی نهێنی داتا به‌یس",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 30337c5fc8f1438269f62cc2485eb6167c7882da..16b9ab5fe91751cc86e7c9b14e5fb526b6d1a22c 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -37,9 +37,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "Lescht Joer",
"years ago" => "Joren hir",
-"Choose" => "Auswielen",
"Yes" => "Jo",
"No" => "Nee",
+"Choose" => "Auswielen",
"Ok" => "OK",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Which files do you want to keep?" => "Weieng Fichieren wëlls de gär behalen?",
@@ -57,7 +57,6 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "Gedeelt mat dir vum {owner}",
"Share link" => "Link deelen",
"Password protect" => "Passwuertgeschützt",
-"Password" => "Passwuert",
"Allow Public Upload" => "Ëffentlechen Upload erlaaben",
"Email link to person" => "Link enger Persoun mailen",
"Send" => "Schécken",
@@ -87,7 +86,6 @@ $TRANSLATIONS = array(
"Delete" => "Läschen",
"Add" => "Dobäisetzen",
"Edit tags" => "Tags editéieren",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Den Update war net erfollegräich. Mell dëse Problem w.e.gl der<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-Community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Den Update war erfollegräich. Du gëss elo bei d'ownCloud ëmgeleet.",
"%s password reset" => "%s Passwuert ass nei gesat",
"Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
@@ -119,6 +117,7 @@ $TRANSLATIONS = array(
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ouni e sécheren Zoufallsgenerator kann en Ugräifer d'Passwuert-Zrécksetzungs-Schlësselen viraussoen an en Account iwwerhuelen.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
"Create an <strong>admin account</strong>" => "En <strong>Admin-Account</strong> uleeën",
+"Password" => "Passwuert",
"Data folder" => "Daten-Dossier",
"Configure the database" => "D'Datebank konfiguréieren",
"will be used" => "wärt benotzt ginn",
@@ -138,7 +137,6 @@ $TRANSLATIONS = array(
"remember" => "verhalen",
"Log in" => "Umellen",
"Alternative Logins" => "Alternativ Umeldungen",
-"Thank you for your patience." => "Merci fir deng Gedold.",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud gëtt op d'Versioun %s aktualiséiert, dat kéint e Moment daueren."
+"Thank you for your patience." => "Merci fir deng Gedold."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index e3b612df3fa0b2905175e659d1d79d064c15cf63..bde6285969ffe317059d913c763c51b9576e25db 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%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",
-"Choose" => "Pasirinkite",
-"Error loading file picker template: {error}" => "Klaida įkeliant failo parinkimo ruošinį: {error}",
"Yes" => "Taip",
"No" => "Ne",
+"Choose" => "Pasirinkite",
+"Error loading file picker template: {error}" => "Klaida įkeliant failo parinkimo ruošinį: {error}",
"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ų"),
@@ -66,7 +66,6 @@ $TRANSLATIONS = array(
"Share with user or group …" => "Dalintis su vartotoju arba grupe...",
"Share 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",
@@ -99,7 +98,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Klaida įkeliant dialogo ruošinį: {error}",
"No tags selected for deletion." => "Trynimui nepasirinkta jokia žymė.",
"Please reload the page." => "Prašome perkrauti puslapį.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud bendruomenei</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
"%s password reset" => "%s slaptažodžio atnaujinimas",
"Use the following link to reset your password: {link}" => "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
@@ -139,6 +137,7 @@ $TRANSLATIONS = array(
"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>",
+"Password" => "Slaptažodis",
"Data folder" => "Duomenų katalogas",
"Configure the database" => "Nustatyti duomenų bazę",
"will be used" => "bus naudojama",
@@ -165,7 +164,6 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Tai reiškia, kad tik administratorius gali naudotis sistema.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Susisiekite su savo sistemos administratoriumi jei šis pranešimas nedingsta arba jei jis pasirodė netikėtai.",
"Thank you for your patience." => "Dėkojame už jūsų kantrumą.",
-"Updating ownCloud to version %s, this may take a while." => "Atnaujinama ownCloud į %s versiją. tai gali šiek tiek užtrukti.",
"This ownCloud instance is currently being updated, which may take a while." => "Šiuo metu vyksta ownCloud atnaujinamas, tai gali šiek tiek užtrukti.",
"Please reload this page after a short time to continue using ownCloud." => "Po trupuÄio laiko atnaujinkite šį puslapį kad galÄ—tumÄ—te toliau naudoti ownCloud."
);
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 37cde915c5eea8c284d7bec380b8539bd589ec15..d395a8c91388cd5eb7159a793672d442b753700a 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Šomēnes, %n mēneši","Pirms %n mēneša","Pirms %n mēnešiem"),
"last year" => "gÄjuÅ¡ajÄ gadÄ",
"years ago" => "gadus atpakaļ",
-"Choose" => "Izvēlieties",
"Yes" => "JÄ",
"No" => "NÄ“",
+"Choose" => "Izvēlieties",
"Ok" => "Labi",
"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
"New Files" => "JaunÄs datnes",
@@ -47,7 +47,6 @@ $TRANSLATIONS = array(
"Shared with you and the group {group} by {owner}" => "{owner} dalÄ«jÄs ar jums un grupu {group}",
"Shared with you by {owner}" => "{owner} dalÄ«jÄs ar jums",
"Password protect" => "AizsargÄt ar paroli",
-"Password" => "Parole",
"Allow Public Upload" => "Ä»aut publisko augÅ¡upielÄdi.",
"Email link to person" => "Sūtīt saiti personai pa e-pastu",
"Send" => "Sūtīt",
@@ -74,7 +73,6 @@ $TRANSLATIONS = array(
"The object type is not specified." => "Nav norÄdÄ«ts objekta tips.",
"Delete" => "Dzēst",
"Add" => "Pievienot",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "AtjauninÄÅ¡ana beidzÄs nesekmÄ«gi. LÅ«dzu, ziņojiet par Å¡o problÄ“mu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kopienai</a>.",
"The update was successful. Redirecting you to ownCloud now." => "AtjauninÄÅ¡ana beidzÄs sekmÄ«gi. Tagad pÄrsÅ«ta jÅ«s uz ownCloud.",
"%s password reset" => "%s paroles maiņa",
"Use the following link to reset your password: {link}" => "Izmantojiet šo saiti, lai mainītu paroli: {link}",
@@ -103,6 +101,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "VisticamÄk, jÅ«su datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "VairÄk informÄcijai kÄ konfigurÄ“t serveri, lÅ«dzu skatiet <a href=\"%s\" target=\"_blank\">dokumentÄciju</a>.",
"Create an <strong>admin account</strong>" => "Izveidot <strong>administratora kontu</strong>",
+"Password" => "Parole",
"Data folder" => "Datu mape",
"Configure the database" => "KonfigurÄ“t datubÄzi",
"will be used" => "tiks izmantots",
@@ -120,7 +119,6 @@ $TRANSLATIONS = array(
"Lost your password?" => "AizmirsÄt paroli?",
"remember" => "atcerēties",
"Log in" => "Ierakstīties",
-"Alternative Logins" => "AlternatÄ«vÄs pieteikÅ¡anÄs",
-"Updating ownCloud to version %s, this may take a while." => "Atjaunina ownCloud uz versiju %s. Tas var aizņemt kÄdu laiciņu."
+"Alternative Logins" => "AlternatÄ«vÄs pieteikÅ¡anÄs"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 64c6671abf8d07b3d96d4a3a10fa38c829f027e8..a32b4e792368ccd91e49e880ab3e5891cf7f8f4e 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -37,9 +37,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "минатата година",
"years ago" => "пред години",
-"Choose" => "Избери",
"Yes" => "Да",
"No" => "Ðе",
+"Choose" => "Избери",
"Ok" => "Во ред",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"One file conflict" => "Конфликт Ñо една датотека",
@@ -58,7 +58,6 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "Споделено Ñо Ð’Ð°Ñ Ð¾Ð´ {owner}",
"Share link" => "Сподели ја врÑката",
"Password protect" => "Заштити Ñо лозинка",
-"Password" => "Лозинка",
"Allow Public Upload" => "Дозволи јавен аплоуд",
"Email link to person" => "Прати врÑка по е-пошта на личноÑÑ‚",
"Send" => "Прати",
@@ -89,7 +88,6 @@ $TRANSLATIONS = array(
"Add" => "Додади",
"Edit tags" => "Уреди ги таговите",
"No tags selected for deletion." => "Ðе Ñе Ñелектирани тагови за бришење.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Ðадградбата беше неуÑпешна. Ве молиме пријавете го овој проблем на <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Ðадградбата беше уÑпешна. Веднаш ве префрлам на вашиот ownCloud.",
"%s password reset" => "%s реÑетирање на лозинката",
"Use the following link to reset your password: {link}" => "КориÑтете ја Ñледната врÑка да ја реÑетирате Вашата лозинка: {link}",
@@ -121,6 +119,7 @@ $TRANSLATIONS = array(
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без Ñигурен генератор на Ñлучајни броеви напаѓач може да ги предвиди жетоните за реÑетирање на лозинка и да преземе контрола врз Вашата Ñметка. ",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Вашиот директориум Ñо податоци и датотеки Ñе веројатно доÑтапни преку интенернт поради што .htaccess датотеката не функционира.",
"Create an <strong>admin account</strong>" => "Ðаправете <strong>админиÑтраторÑка Ñметка</strong>",
+"Password" => "Лозинка",
"Data folder" => "Фолдер Ñо податоци",
"Configure the database" => "Конфигурирај ја базата",
"will be used" => "ќе биде кориÑтено",
@@ -143,7 +142,6 @@ $TRANSLATIONS = array(
"Alternative Logins" => "Ðлтернативни најавувања",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Контактирајте го вашиот ÑиÑтем админиÑтратор до колку оваа порака продолжи да Ñе појавува или пак Ñе појавува ненадејно.",
"Thank you for your patience." => "Благодариме на вашето трпение.",
-"Updating ownCloud to version %s, this may take a while." => "Ðадградбата на ownCloud на верзијата %s, може да потрае.",
"This ownCloud instance is currently being updated, which may take a while." => "Оваа инÑтанца на ownCloud во моментов Ñе надградува, што може малку да потрае.",
"Please reload this page after a short time to continue using ownCloud." => "Повторно вчитајте ја оваа Ñтраница по кратко време за да продолжите да го кориÑтите ownCloud."
);
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 63355191b6c33980a6dd4abed275a057b07b305c..b32888238c1bec2397d4d8c68a25b834c1b83a12 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -32,7 +32,6 @@ $TRANSLATIONS = array(
"Cancel" => "Batal",
"Share" => "Kongsi",
"Error" => "Ralat",
-"Password" => "Kata laluan",
"Warning" => "Amaran",
"Delete" => "Padam",
"Add" => "Tambah",
@@ -52,6 +51,7 @@ $TRANSLATIONS = array(
"Cloud not found" => "Awan tidak dijumpai",
"Security Warning" => "Amaran keselamatan",
"Create an <strong>admin account</strong>" => "buat <strong>akaun admin</strong>",
+"Password" => "Kata laluan",
"Data folder" => "Fail data",
"Configure the database" => "Konfigurasi pangkalan data",
"will be used" => "akan digunakan",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index 4ccf19b186e20287e546b94b0fe7ceb03580705f..4d722a859fc842914255d5a4b9d27beea4b23a6b 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -22,13 +22,12 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array(""),
"last year" => "မနှစ်က",
"years ago" => "နှစ် အရင်က",
-"Choose" => "ရွေးá€á€»á€šá€º",
"Yes" => "ဟုá€á€º",
"No" => "မဟုá€á€ºá€˜á€°á€¸",
+"Choose" => "ရွေးá€á€»á€šá€º",
"Ok" => "အá€á€¯á€€á€±",
"_{count} file conflict_::_{count} file conflicts_" => array(""),
"Cancel" => "ပယ်ဖျက်မည်",
-"Password" => "စကားá€á€¾á€€á€º",
"Set expiration date" => "သက်á€á€™á€ºá€¸á€€á€¯á€”်ဆုံးမည့်ရက်သá€á€ºá€™á€¾á€á€ºá€™á€Šá€º",
"Expiration date" => "သက်á€á€™á€ºá€¸á€€á€¯á€”်ဆုံးမည့်ရက်",
"Share via email:" => "အီးမေးလ်ဖြင့်á€á€±á€™á€»á€¾á€™á€Šá€º -",
@@ -51,6 +50,7 @@ $TRANSLATIONS = array(
"Cloud not found" => "မá€á€½á€±á€·á€›á€¾á€á€™á€á€•á€«",
"Security Warning" => "လုံá€á€¼á€¯á€¶á€›á€±á€¸á€žá€á€á€•á€±á€¸á€á€»á€€á€º",
"Create an <strong>admin account</strong>" => "<strong>အက်ဒမင်အကောင့်</strong>á€á€…်á€á€¯á€–န်á€á€®á€¸á€™á€Šá€º",
+"Password" => "စကားá€á€¾á€€á€º",
"Data folder" => "အá€á€»á€€á€ºá€¡á€œá€€á€ºá€–á€á€¯á€œá€ºá€’ါလ်",
"Database user" => "Database သုံးစွဲသူ",
"Database password" => "Database စကားá€á€¾á€€á€º",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 2a9873f481587922c8a60558c4526fcf4b26d52d..3bed1b550a913197c902eb9d79c4d2fe2371f2dc 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -1,9 +1,11 @@
<?php
$TRANSLATIONS = array(
+"Expiration date is in the past." => "Utløpsdato er tilbake i tid.",
"Couldn't send mail to following users: %s " => "Klarte ikke å sende mail til følgende brukere: %s",
"Turned on maintenance mode" => "Slo på vedlikeholdsmodus",
"Turned off maintenance mode" => "Slo av vedlikeholdsmodus",
"Updated database" => "Oppdaterte databasen",
+"Disabled incompatible apps: %s" => "Deaktiverte ukompatible apper: %s",
"No image or file provided" => "Bilde eller fil ikke angitt",
"Unknown filetype" => "Ukjent filtype",
"Invalid image" => "Ugyldig bilde",
@@ -40,14 +42,16 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n dag siden","%n dager siden"),
"last year" => "i fjor",
"years ago" => "Ã¥r siden",
-"Choose" => "Velg",
-"Error loading file picker template: {error}" => "Feil ved lasting av filvelger-mal: {error}",
"Yes" => "Ja",
"No" => "Nei",
+"Choose" => "Velg",
+"Error loading file picker template: {error}" => "Feil ved lasting av filvelger-mal: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Feil ved lasting av meldingsmal: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
"One file conflict" => "En filkonflikt",
+"New Files" => "Nye filer",
+"Already existing files" => "Allerede eksisterende filer",
"Which files do you want to keep?" => "Hvilke filer vil du beholde?",
"If you select both versions, the copied file will have a number added to its name." => "Hvis du velger begge versjonene vil den kopierte filen få et nummer lagt til i navnet.",
"Cancel" => "Avbryt",
@@ -57,6 +61,7 @@ $TRANSLATIONS = array(
"Error loading file exists template" => "Feil ved lasting av \"filen eksisterer\"-mal",
"Very weak password" => "Veldig svakt passord",
"Weak password" => "Svakt passord",
+"So-so password" => "So-so-passord",
"Good password" => "Bra passord",
"Strong password" => "Sterkt passord",
"Shared" => "Delt",
@@ -69,8 +74,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "Delt med deg av {owner}",
"Share with user or group …" => "Del med bruker eller gruppe …",
"Share link" => "Del lenke",
+"The public link will expire no later than {days} days after it is created" => "Den offentlige lenken vil utløpe senest {days} dager etter at den lages",
+"By default the public link will expire after {days} days" => "Som standard vil den offentlige lenken utløpe etter {days} dager",
"Password protect" => "Passordbeskyttet",
-"Password" => "Passord",
+"Choose a password for the public link" => "Velg et passord for den offentlige lenken",
"Allow Public Upload" => "Tillat Offentlig Opplasting",
"Email link to person" => "Email lenke til person",
"Send" => "Send",
@@ -102,10 +109,12 @@ $TRANSLATIONS = array(
"Edit tags" => "Rediger merkelapper",
"Error loading dialog template: {error}" => "Feil ved lasting av dialogmal: {error}",
"No tags selected for deletion." => "Ingen merkelapper valgt for sletting.",
+"Updating {productName} to version {version}, this may take a while." => "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.",
"Please reload the page." => "Vennligst last siden på nytt.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringen mislyktes. Vennligst rapporter dette problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.",
+"The update was unsuccessful." => "Oppdateringen var vellykket.",
"The update was successful. Redirecting you to ownCloud now." => "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud.",
"%s password reset" => "%s nullstilling av passord",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Et problem oppstod ved sending av mailen. Kontakt administratoren.",
"Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Lenken for nullstilling av passordet ditt er sendt til din email.<br>Hvis du ikke mottar den innen rimelig tid, sjekk spam- og søppelmappene i epost-programmet.<br>Hvis den ikke er der, kontakt din lokale administrator .",
"Request failed!<br>Did you make sure your email/username was right?" => "Anmodning feilet!<br>Forsikret du deg om at din email/brukernavn var korrekt?",
@@ -118,6 +127,8 @@ $TRANSLATIONS = array(
"To login page" => "Til innlogginssiden",
"New password" => "Nytt passord",
"Reset password" => "Tilbakestill passord",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!",
+"For the best results, please consider using a GNU/Linux server instead." => "For beste resultat, vurder å bruke en GNU/Linux-server i stedet.",
"Personal" => "Personlig",
"Users" => "Brukere",
"Apps" => "Apper",
@@ -143,6 +154,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.",
"Create an <strong>admin account</strong>" => "opprett en <strong>administrator-konto</strong>",
+"Password" => "Passord",
"Storage & database" => "Lagring og database",
"Data folder" => "Datamappe",
"Configure the database" => "Konfigurer databasen",
@@ -166,11 +178,16 @@ $TRANSLATIONS = array(
"remember" => "husk",
"Log in" => "Logg inn",
"Alternative Logins" => "Alternative innlogginger",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hei der,<br><br>bare informerer om at %s delte <strong>%s</strong> med deg.<br><a href=\"%s\">Vis!</a><br><br>",
"This ownCloud instance is currently in single user mode." => "Denne ownCloud-instansen er for øyeblikket i enbrukermodus.",
"This means only administrators can use the instance." => "Dette betyr at kun administratorer kan bruke instansen.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakt systemadministratoren hvis denne meldingen var uventet eller ikke forsvinner.",
"Thank you for your patience." => "Takk for din tålmodighet.",
-"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til versjon %s, dette kan ta en stund.",
+"%s will be updated to version %s." => "%s vil bli oppdatert til versjon %s.",
+"The following apps will be disabled:" => "Følgende apps vil bli deaktivert:",
+"The theme %s has been disabled." => "Temaet %s har blitt deaktivert.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Forsikre deg om at databasen, config-mappen og datamappen er blitt sikkerhetskopiert før du fortsetter.",
+"Start update" => "Start oppdatering",
"This ownCloud instance is currently being updated, which may take a while." => "Denne ownCloud-instansen oppdateres for øyeblikket, noe som kan ta litt tid.",
"Please reload this page after a short time to continue using ownCloud." => "Vennligst last denne siden på nytt om en liten stund for å fortsette å bruke ownCloud."
);
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 43748352a7be2c6179060c03fc5a2ce08f226ee2..90b5a53817ac857a0aa713a1a11fdf62ee1d64f3 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"Turned on maintenance mode" => "Onderhoudsmodus ingeschakeld",
"Turned off maintenance mode" => "Onderhoudsmodus uitgeschakeld",
"Updated database" => "Database bijgewerkt",
+"Disabled incompatible apps: %s" => "Gedeactiveerde incompatibele apps: %s",
"No image or file provided" => "Geen afbeelding of bestand opgegeven",
"Unknown filetype" => "Onbekend bestandsformaat",
"Invalid image" => "Ongeldige afbeelding",
@@ -41,10 +42,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","%n maanden geleden"),
"last year" => "vorig jaar",
"years ago" => "jaar geleden",
-"Choose" => "Kies",
-"Error loading file picker template: {error}" => "Fout bij laden bestandenselecteur sjabloon: {error}",
"Yes" => "Ja",
"No" => "Nee",
+"Choose" => "Kies",
+"Error loading file picker template: {error}" => "Fout bij laden bestandenselecteur sjabloon: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Fout bij laden berichtensjabloon: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} bestandsconflict","{count} bestandsconflicten"),
@@ -73,8 +74,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "Gedeeld met u door {owner}",
"Share with user or group …" => "Delen met gebruiker of groep ...",
"Share link" => "Deel link",
+"The public link will expire no later than {days} days after it is created" => "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken",
+"By default the public link will expire after {days} days" => "Standaard vervalt een openbare link na {days} dagen",
"Password protect" => "Wachtwoord beveiligd",
-"Password" => "Wachtwoord",
+"Choose a password for the public link" => "Kies een wachtwoord voor de openbare link",
"Allow Public Upload" => "Sta publieke uploads toe",
"Email link to person" => "E-mail link naar persoon",
"Send" => "Versturen",
@@ -94,7 +97,7 @@ $TRANSLATIONS = array(
"delete" => "verwijderen",
"share" => "deel",
"Password protected" => "Wachtwoord beveiligd",
-"Error unsetting expiration date" => "Fout tijdens het verwijderen van de verval datum",
+"Error unsetting expiration date" => "Fout tijdens het verwijderen van de vervaldatum",
"Error setting expiration date" => "Fout tijdens het instellen van de vervaldatum",
"Sending ..." => "Versturen ...",
"Email sent" => "E-mail verzonden",
@@ -106,20 +109,21 @@ $TRANSLATIONS = array(
"Edit tags" => "Bewerken tags",
"Error loading dialog template: {error}" => "Fout bij laden dialoog sjabloon: {error}",
"No tags selected for deletion." => "Geen tags geselecteerd voor verwijdering.",
+"Updating {productName} to version {version}, this may take a while." => "Bijwerken {productName} naar versie {version}, dit kan even duren.",
"Please reload the page." => "Herlaad deze pagina.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
-"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud.",
+"The update was unsuccessful." => "De update is niet geslaagd.",
+"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
"%s password reset" => "%s wachtwoord reset",
"A problem has occurred whilst sending the email, please contact your administrator." => "Er ontstond een probleem bij het versturen van het e-mailbericht, neem contact op met uw beheerder.",
-"Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {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 ." => "De link voor het resetten van je wachtwoord is verzonden naar je e-mailadres.<br>Als je dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan je beheerder om te helpen.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoord goed waren?",
-"You will receive a link to reset your password via Email." => "Je ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail.",
+"Use the following link to reset your password: {link}" => "Gebruik de volgende link om uw wachtwoord te resetten: {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 ." => "De link voor het resetten van uw wachtwoord is verzonden naar uw e-mailadres.<br>Als u dat bericht niet snel ontvangen hebt, controleer dan uw spammap.<br>Als het daar ook niet is, vraag dan uw beheerder om hulp.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet u zeker dat uw gebruikersnaam en/of wachtwoord goed waren?",
+"You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
"Username" => "Gebruikersnaam",
-"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?" => "Je bestanden zijn versleuteld. Als je geen recoverykey hebt ingeschakeld is er geen manier om je data terug te krijgen indien je je wachtwoord reset!\nAls je niet weet wat te doen, neem dan alsjeblieft contact op met je administrator eer je doorgaat.\nWil je echt doorgaan?",
+"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?" => "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?",
"Yes, I really want to reset my password now" => "Ja, ik wil mijn wachtwoord nu echt resetten",
"Reset" => "Reset",
-"Your password was reset" => "Je wachtwoord is gewijzigd",
+"Your password was reset" => "Uw wachtwoord is gewijzigd",
"To login page" => "Naar de login-pagina",
"New password" => "Nieuw wachtwoord",
"Reset password" => "Reset wachtwoord",
@@ -139,17 +143,18 @@ $TRANSLATIONS = array(
"Error unfavoriting" => "Fout bij verwijderen favorietstatus",
"Access forbidden" => "Toegang verboden",
"Cloud not found" => "Cloud niet gevonden",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo daar,\n\neven een berichtje dat %s %s met u deelde.\nBekijk het: %s\n\n",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\n%s deelt %s met u.\nBekijk het: %s\n\n",
"The share will expire on %s." => "De share vervalt op %s.",
"Cheers!" => "Proficiat!",
"Security Warning" => "Beveiligingswaarschuwing",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uw PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
"Please update your PHP installation to use %s securely." => "Werk uw PHP installatie bij om %s veilig te kunnen gebruiken.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL-extentie aan.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Zonder random nummer generator is het mogelijk voor een aanvaller om de resettokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet werkt.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
"Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
+"Password" => "Wachtwoord",
"Storage & database" => "Opslag & database",
"Data folder" => "Gegevensmap",
"Configure the database" => "Configureer de database",
@@ -161,24 +166,28 @@ $TRANSLATIONS = array(
"Database host" => "Databaseserver",
"Finish setup" => "Installatie afronden",
"Finishing …" => "Afronden ...",
-"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Deze applicatie heeft een werkend JavaScript nodig. <a href=\"http://enable-javascript.com/\" target=\"_blank\">activeer JavaScript</a> en herlaad deze interface.",
+"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Deze applicatie heeft JavaScript nodig om correct te functioneren. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeer JavaScript</a> en herlaad deze interface.",
"%s is available. Get more information on how to update." => "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
"Log out" => "Afmelden",
"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.",
+"If you did not change your password recently, your account may be compromised!" => "Als u uw wachtwoord niet onlangs heeft aangepast, kan uw account overgenomen zijn!",
+"Please change your password to secure your account again." => "Wijzig uw wachtwoord zodat uw account weer beveiligd is.",
"Server side authentication failed!" => "Authenticatie bij de server mislukte!",
"Please contact your administrator." => "Neem contact op met uw systeembeheerder.",
"Lost your password?" => "Wachtwoord vergeten?",
"remember" => "onthoud gegevens",
-"Log in" => "Meld je aan",
+"Log in" => "Meld u aan",
"Alternative Logins" => "Alternatieve inlogs",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo daar,<br><br>we willen even laten weten dat %s <strong>%s</strong> met u heeft gedeeld.<br><a href=\"%s\">Bekijk het!</a><br><br>",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk het!</a><br><br>",
"This ownCloud instance is currently in single user mode." => "Deze ownCloud werkt momenteel in enkele gebruiker modus.",
"This means only administrators can use the instance." => "Dat betekent dat alleen beheerders deze installatie kunnen gebruiken.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Beem contact op met uw systeembeheerder als deze melding aanhoudt of plotseling verscheen.",
"Thank you for your patience." => "Bedankt voor uw geduld.",
-"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren...",
+"%s will be updated to version %s." => "%s wordt bijgewerkt naar versie %s.",
+"The following apps will be disabled:" => "De volgende apps worden gedeactiveerd:",
+"The theme %s has been disabled." => "Het thema %s is gedeactiveerd.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Let erop dat de database, de config map en de data map zijn gebackupped voordat u verder gaat.",
+"Start update" => "Begin de update",
"This ownCloud instance is currently being updated, which may take a while." => "Deze ownCloud dienst wordt nu bijgewerkt, dat kan even duren.",
"Please reload this page after a short time to continue using ownCloud." => "Laad deze pagina straks opnieuw om verder te gaan met ownCloud."
);
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 25d0f1da725a9d2d763b28fbafabe0746fc658c2..042c3cebd08d217c28cd6b144b65803ee2cf62cd 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n månad sidan","%n 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",
+"Choose" => "Vel",
+"Error loading file picker template: {error}" => "Klarte ikkje å lasta filplukkarmal: {error}",
"Ok" => "Greitt",
"Error loading message template: {error}" => "Klarte ikkje å lasta meldingsmal: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonfliktar"),
@@ -64,7 +64,6 @@ $TRANSLATIONS = array(
"Shared with you and the group {group} by {owner}" => "Delt med deg og gruppa {group} av {owner}",
"Shared with you by {owner}" => "Delt med deg av {owner}",
"Password protect" => "Passordvern",
-"Password" => "Passord",
"Allow Public Upload" => "Tillat offentleg opplasting",
"Email link to person" => "Send lenkja over e-post",
"Send" => "Send",
@@ -91,7 +90,6 @@ $TRANSLATIONS = array(
"The object type is not specified." => "Objekttypen er ikkje spesifisert.",
"Delete" => "Slett",
"Add" => "Legg til",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
"%s password reset" => "%s passordnullstilling",
"Use the following link to reset your password: {link}" => "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
@@ -120,6 +118,7 @@ $TRANSLATIONS = array(
"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>",
+"Password" => "Passord",
"Data folder" => "Datamappe",
"Configure the database" => "Set opp databasen",
"will be used" => "vil verta nytta",
@@ -137,7 +136,6 @@ $TRANSLATIONS = array(
"Lost your password?" => "Gløymt passordet?",
"remember" => "hugs",
"Log in" => "Logg inn",
-"Alternative Logins" => "Alternative innloggingar",
-"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til utgåve %s, dette kan ta ei stund."
+"Alternative Logins" => "Alternative innloggingar"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index b13275822bdf57da8a42c5e23a23c38356cca030..f4dc0a01263db47b4575743d8c2d8549b0586e96 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "an passat",
"years ago" => "ans a",
-"Choose" => "CausÃs",
"Yes" => "Ã’c",
"No" => "Non",
+"Choose" => "CausÃs",
"Ok" => "D'accòrdi",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Annula",
@@ -43,7 +43,6 @@ $TRANSLATIONS = array(
"Error while unsharing" => "Error al non partejar",
"Error while changing permissions" => "Error al cambiar permissions",
"Password protect" => "Parat per senhal",
-"Password" => "Senhal",
"Set expiration date" => "Met la data d'expiracion",
"Expiration date" => "Data d'expiracion",
"Share via email:" => "Parteja tras corrièl :",
@@ -78,6 +77,7 @@ $TRANSLATIONS = array(
"Cloud not found" => "NÃvol pas trobada",
"Security Warning" => "Avertiment de securitat",
"Create an <strong>admin account</strong>" => "Crea un <strong>compte admin</strong>",
+"Password" => "Senhal",
"Data folder" => "Dorsièr de donadas",
"Configure the database" => "Configura la basa de donadas",
"will be used" => "serà utilizat",
diff --git a/core/l10n/pa.php b/core/l10n/pa.php
index 021452d0b3191c0ac6f33325117ad9216a316980..5144e96788eb9480846d69e43169a957007ad348 100644
--- a/core/l10n/pa.php
+++ b/core/l10n/pa.php
@@ -31,19 +31,19 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "ਪਿਛਲੇ ਸਾਲ",
"years ago" => "ਸਾਲਾਂ ਪਹਿਲਾਂ",
-"Choose" => "ਚà©à¨£à©‹",
"Yes" => "ਹਾਂ",
"No" => "ਨਹੀਂ",
+"Choose" => "ਚà©à¨£à©‹",
"Ok" => "ਠੀਕ ਹੈ",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "ਰੱਦ ਕਰੋ",
"Share" => "ਸਾਂà¨à¨¾ ਕਰੋ",
"Error" => "ਗਲ",
-"Password" => "ਪਾਸਵਰ",
"Send" => "à¨à©‡à¨œà©‹",
"Warning" => "ਚੇਤਾਵਨੀ",
"Delete" => "ਹਟਾਓ",
"Username" => "ਯੂਜ਼ਰ-ਨਾਂ",
-"Security Warning" => "ਸà©à¨°à©±à¨–ਿਆ ਚੇਤਾਵਨੀ"
+"Security Warning" => "ਸà©à¨°à©±à¨–ਿਆ ਚੇਤਾਵਨੀ",
+"Password" => "ਪਾਸਵਰ"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 0e9860b4bf9ffc5c7489f4654c7ccbcc7ac705e8..fd67d8dc7c6b21b190d1dad8d0f7759f708a1fc5 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = 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",
-"Choose" => "Wybierz",
-"Error loading file picker template: {error}" => "BÅ‚Ä…d podczas Å‚adowania pliku wybranego szablonu: {error}",
"Yes" => "Tak",
"No" => "Nie",
+"Choose" => "Wybierz",
+"Error loading file picker template: {error}" => "BÅ‚Ä…d podczas Å‚adowania pliku wybranego szablonu: {error}",
"Ok" => "OK",
"Error loading message template: {error}" => "Błąd podczas ładowania szablonu wiadomości: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "Udostępnione tobie przez {owner}",
"Share with user or group …" => "Współdziel z użytkownikiem lub grupą ...",
"Share link" => "Udostępnij link",
+"The public link will expire no later than {days} days after it is created" => "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia",
+"By default the public link will expire after {days} days" => "Domyślnie link publiczny wygaśnie po {days} dniach",
"Password protect" => "Zabezpiecz hasłem",
-"Password" => "Hasło",
+"Choose a password for the public link" => "Wybierz hasło dla linku publicznego",
"Allow Public Upload" => "Pozwól na publiczne wczytywanie",
"Email link to person" => "Wyślij osobie odnośnik poprzez e-mail",
"Send" => "Wyślij",
@@ -107,7 +109,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "BÅ‚Ä…d podczas Å‚adowania szablonu dialogu: {error}",
"No tags selected for deletion." => "Nie zaznaczono tagów do usunięcia.",
"Please reload the page." => "Proszę przeładować stronę",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">spoleczności ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
"%s password reset" => "%s reset hasła",
"A problem has occurred whilst sending the email, please contact your administrator." => "Pojawił się problem podczas wysyłania wiadomości email, skontaktuj się z administratorem",
@@ -150,6 +151,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.",
"Create an <strong>admin account</strong>" => "Utwórz <strong>konta administratora</strong>",
+"Password" => "Hasło",
"Storage & database" => "Zasoby dysku & baza danych",
"Data folder" => "Katalog danych",
"Configure the database" => "Skonfiguruj bazÄ™ danych",
@@ -178,7 +180,6 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "To oznacza, że tylko administratorzy mogą w tej chwili używać aplikacji.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Skontaktuj się z administratorem, jeśli ten komunikat pojawił się nieoczekiwanie lub wyświetla się ciągle.",
"Thank you for your patience." => "Dziękuję za cierpliwość.",
-"Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s. Może to trochę potrwać.",
"This ownCloud instance is currently being updated, which may take a while." => "Ta instalacja ownCloud jest w tej chwili aktualizowana, co może chwilę potrwać",
"Please reload this page after a short time to continue using ownCloud." => "Proszę przeładować tę stronę za chwilę, aby kontynuować pracę w ownCloud"
);
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index a7b671b44088887f78d2c3545b11efe59a926753..2ef3ce47299a4b48a4ea442962a1eaace0bd258b 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"Turned on maintenance mode" => "Ativar modo de manutenção",
"Turned off maintenance mode" => "Desligar o modo de manutenção",
"Updated database" => "Atualizar o banco de dados",
+"Disabled incompatible apps: %s" => "Desabilitar aplicativos incompatÃveis : %s",
"No image or file provided" => "Nenhuma imagem ou arquivo fornecido",
"Unknown filetype" => "Tipo de arquivo desconhecido",
"Invalid image" => "Imagem inválida",
@@ -41,10 +42,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("ha %n mês","ha %n meses"),
"last year" => "último ano",
"years ago" => "anos atrás",
-"Choose" => "Escolha",
-"Error loading file picker template: {error}" => "Erro no seletor de carregamento modelo de arquivos: {error}",
"Yes" => "Sim",
"No" => "Não",
+"Choose" => "Escolha",
+"Error loading file picker template: {error}" => "Erro no seletor de carregamento modelo de arquivos: {error}",
"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"),
@@ -73,8 +74,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "Compartilhado com você por {owner}",
"Share with user or group …" => "Compartilhar com usuário ou grupo ...",
"Share link" => "Compartilher link",
+"The public link will expire no later than {days} days after it is created" => "O link público irá expirar não antes de {days} depois de ser criado",
+"By default the public link will expire after {days} days" => "Por padrão o link público irá expirar após {days} dias",
"Password protect" => "Proteger com senha",
-"Password" => "Senha",
+"Choose a password for the public link" => "Escolha uma senha para o link público",
"Allow Public Upload" => "Permitir upload público",
"Email link to person" => "Enviar link por e-mail",
"Send" => "Enviar",
@@ -106,8 +109,9 @@ $TRANSLATIONS = array(
"Edit tags" => "Editar etiqueta",
"Error loading dialog template: {error}" => "Erro carregando diálogo de formatação:{error}",
"No tags selected for deletion." => "Nenhuma etiqueta selecionada para deleção.",
+"Updating {productName} to version {version}, this may take a while." => "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.",
"Please reload the page." => "Por favor recarregue a página",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A atualização falhou. Por favor, relate este problema para a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade ownCloud</a>.",
+"The update was unsuccessful." => "A atualização não foi bem sucedida.",
"The update was successful. Redirecting you to ownCloud now." => "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
"%s password reset" => "%s redefinir senha",
"A problem has occurred whilst sending the email, please contact your administrator." => "Um problema ocorreu durante o envio do e-mail, por favor, contate o administrador.",
@@ -150,6 +154,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Seu diretório de dados e arquivos são provavelmente acessÃveis pela internet, porque o .htaccess não funciona.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.",
"Create an <strong>admin account</strong>" => "Criar uma <strong>conta de administrador</strong>",
+"Password" => "Senha",
"Storage & database" => "Armazenamento & banco de dados",
"Data folder" => "Pasta de dados",
"Configure the database" => "Configurar o banco de dados",
@@ -178,7 +183,11 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Isso significa que apenas os administradores podem usar o exemplo.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte o seu administrador do sistema se esta mensagem persistir ou aparecer inesperadamente.",
"Thank you for your patience." => "Obrigado pela sua paciência.",
-"Updating ownCloud to version %s, this may take a while." => "Atualizando ownCloud para a versão %s, isto pode levar algum tempo.",
+"%s will be updated to version %s." => "%s será atualizado para a versão %s.",
+"The following apps will be disabled:" => "Os seguintes aplicativos serão desativados:",
+"The theme %s has been disabled." => "O tema %s foi desativado.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Por favor, certifique-se de que o banco de dados, a pasta config e a pasta de dados foram copiados antes de prosseguir.",
+"Start update" => "Iniciar atualização",
"This ownCloud instance is currently being updated, which may take a while." => "Esta instância do ownCloud está sendo atualizada, o que pode demorar um pouco.",
"Please reload this page after a short time to continue using ownCloud." => "Por favor, atualize esta página depois de um curto perÃodo de tempo para continuar usando ownCloud."
);
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index fe289000dd8440521fe05ec0ad535086dc77ecf2..82b25620e17e1532d99c08fb89b7423fb1270d63 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Expiration date is in the past." => "A data de expiração é no passado.",
"Couldn't send mail to following users: %s " => "Não conseguiu enviar correio aos seguintes utilizadores: %s",
"Turned on maintenance mode" => "Activado o modo de manutenção",
"Turned off maintenance mode" => "Desactivado o modo de manutenção",
@@ -40,15 +41,16 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n mês atrás","%n meses atrás"),
"last year" => "ano passado",
"years ago" => "anos atrás",
-"Choose" => "Escolha",
-"Error loading file picker template: {error}" => "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
"Yes" => "Sim",
"No" => "Não",
+"Choose" => "Escolha",
+"Error loading file picker template: {error}" => "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Erro ao carregar o template: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de ficheiro","{count} conflitos de ficheiro"),
"One file conflict" => "Um conflito no ficheiro",
"New Files" => "Ficheiros Novos",
+"Already existing files" => "Ficheiro já existente",
"Which files do you want to keep?" => "Quais os ficheiros que pretende manter?",
"If you select both versions, the copied file will have a number added to its name." => "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.",
"Cancel" => "Cancelar",
@@ -71,8 +73,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "Partilhado consigo por {owner}",
"Share with user or group …" => "Partilhar com utilizador ou grupo...",
"Share link" => "Partilhar o link",
+"The public link will expire no later than {days} days after it is created" => "O link público expira, o mais tardar {days} dias após sua criação",
+"By default the public link will expire after {days} days" => "Por defeito, o link publico irá expirar depois de {days} dias",
"Password protect" => "Proteger com palavra-passe",
-"Password" => "Password",
+"Choose a password for the public link" => "Defina a palavra-passe para o link público",
"Allow Public Upload" => "Permitir Envios Públicos",
"Email link to person" => "Enviar o link por e-mail",
"Send" => "Enviar",
@@ -105,9 +109,9 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Erro ao carregar modelo de diálogo: {error}",
"No tags selected for deletion." => "Não foram escolhidas etiquetas para apagar.",
"Please reload the page." => "Por favor recarregue a página.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualização falhou. Por favor reporte este incidente seguindo este link <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "A actualização foi concluÃda com sucesso. Vai ser redireccionado para o ownCloud agora.",
"%s password reset" => "%s reposição da password",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador.",
"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?",
@@ -120,6 +124,8 @@ $TRANSLATIONS = array(
"To login page" => "Para a página de entrada",
"New password" => "Nova palavra-chave",
"Reset password" => "Repor password",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.",
+"For the best results, please consider using a GNU/Linux server instead." => "Para um melhor resultado, utilize antes o servidor GNU/Linux.",
"Personal" => "Pessoal",
"Users" => "Utilizadores",
"Apps" => "Aplicações",
@@ -145,6 +151,8 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessÃveis a partir da internet, pois o ficheiros .htaccess não funciona.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
"Create an <strong>admin account</strong>" => "Criar uma <strong>conta administrativa</strong>",
+"Password" => "Password",
+"Storage & database" => "Armazenamento e base de dados",
"Data folder" => "Pasta de dados",
"Configure the database" => "Configure a base de dados",
"will be used" => "vai ser usada",
@@ -167,11 +175,11 @@ $TRANSLATIONS = array(
"remember" => "lembrar",
"Log in" => "Entrar",
"Alternative Logins" => "Contas de acesso alternativas",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Olá,<br><br>apenas para informar que %s partilhou <strong>%s</strong> consigo.<br><a href=\"%s\">Consulte aqui!</a><br><br>",
"This ownCloud instance is currently in single user mode." => "Esta instância do ownCloud está actualmente configurada no modo de utilizador único.",
"This means only administrators can use the instance." => "Isto significa que apenas os administradores podem usar a instância.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte o seu administrador de sistema se esta mensagem continuar a aparecer ou apareceu inesperadamente.",
"Thank you for your patience." => "Obrigado pela sua paciência.",
-"Updating ownCloud to version %s, this may take a while." => "A actualizar o ownCloud para a versão %s, esta operação pode demorar.",
"This ownCloud instance is currently being updated, which may take a while." => "Esta instância do ownCloud está a ser actualizada, poderá demorar algum tempo.",
"Please reload this page after a short time to continue using ownCloud." => "Por favo recarregue esta página após algum tempo para continuar a usar ownCloud."
);
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 648e8ba3eafb39496d19e49006a7fe5a972a76c2..e8d6fac33381fc87f76011eeb1db9875e50acaac 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "ultimul an",
"years ago" => "ani în urmă",
-"Choose" => "Alege",
"Yes" => "Da",
"No" => "Nu",
+"Choose" => "Alege",
"Ok" => "Ok",
"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
"One file conflict" => "Un conflict de fișier",
@@ -55,7 +55,6 @@ $TRANSLATIONS = array(
"Shared with you and the group {group} by {owner}" => "Distribuie cu tine si grupul {group} de {owner}",
"Shared with you by {owner}" => "Distribuie cu tine de {owner}",
"Password protect" => "Protejare cu parolă",
-"Password" => "Parolă",
"Allow Public Upload" => "Permiteţi încărcarea publică.",
"Email link to person" => "Expediază legătura prin poșta electronică",
"Send" => "Expediază",
@@ -82,7 +81,6 @@ $TRANSLATIONS = array(
"The object type is not specified." => "Tipul obiectului nu este specificat.",
"Delete" => "Șterge",
"Add" => "Adaugă",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Actualizarea a eșuat! Raportați problema către <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunitatea ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Actualizare reușită. Ești redirecționat către ownCloud.",
"Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Linkul pentru resetarea parolei tale a fost trimis pe email. <br>Daca nu ai primit email-ul intr-un timp rezonabil, verifica folderul spam/junk. <br>Daca nu sunt acolo intreaba administratorul local.",
@@ -110,6 +108,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.",
"Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>",
+"Password" => "Parolă",
"Data folder" => "Director date",
"Configure the database" => "Configurează baza de date",
"will be used" => "vor fi folosite",
@@ -127,7 +126,6 @@ $TRANSLATIONS = array(
"Lost your password?" => "Ai uitat parola?",
"remember" => "amintește",
"Log in" => "Autentificare",
-"Alternative Logins" => "Conectări alternative",
-"Updating ownCloud to version %s, this may take a while." => "Actualizăm ownCloud la versiunea %s, aceasta poate dura câteva momente."
+"Alternative Logins" => "Conectări alternative"
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index a09178a6cd1bf2412d6845b1219dc23ea61ee4a0..83242d63841fbd1815f4eaf5c0c4a4dba51e4f8d 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -41,15 +41,16 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n меÑÑц назад","%n меÑÑца назад","%n меÑÑцев назад"),
"last year" => "в прошлом году",
"years ago" => "неÑколько лет назад",
-"Choose" => "Выбрать",
-"Error loading file picker template: {error}" => "Ошибка при загрузке шаблона выбора файлов: {error}",
"Yes" => "Да",
"No" => "Ðет",
+"Choose" => "Выбрать",
+"Error loading file picker template: {error}" => "Ошибка при загрузке шаблона выбора файлов: {error}",
"Ok" => "Ок",
"Error loading message template: {error}" => "Ошибка загрузки шаблона Ñообщений: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах"),
"One file conflict" => "Один конфликт в файлах",
"New Files" => "Ðовые файлы",
+"Already existing files" => "СущеÑтвующие файлы",
"Which files do you want to keep?" => "Какие файлы вы хотите Ñохранить?",
"If you select both versions, the copied file will have a number added to its name." => "При выборе обоих верÑий, к названию копируемого файла будет добавлена цифра",
"Cancel" => "Отменить",
@@ -72,9 +73,11 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "{owner} открыл доÑтуп Ð´Ð»Ñ Ð’Ð°Ñ",
"Share with user or group …" => "ПоделитьÑÑ Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¼ или группой...",
"Share link" => "ПоделитьÑÑ ÑÑылкой",
+"The public link will expire no later than {days} days after it is created" => "Срок дейÑÑ‚Ð²Ð¸Ñ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¾Ð¹ ÑÑылки иÑтекает не позже чем через {days} дней, поÑле её ÑозданиÑ",
+"By default the public link will expire after {days} days" => "По умолчанию Ñрок дейÑÑ‚Ð²Ð¸Ñ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¾Ð¹ ÑÑылки иÑтекает через {days} дней",
"Password protect" => "Защитить паролем",
-"Password" => "Пароль",
-"Allow Public Upload" => "Разрешить открытую загрузку",
+"Choose a password for the public link" => "Выберите пароль Ð´Ð»Ñ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¾Ð¹ ÑÑылки",
+"Allow Public Upload" => "Разрешить загрузку",
"Email link to person" => "ÐŸÐ¾Ñ‡Ñ‚Ð¾Ð²Ð°Ñ ÑÑылка на перÑону",
"Send" => "Отправить",
"Set expiration date" => "УÑтановить Ñрок доÑтупа",
@@ -106,7 +109,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Ошибка загрузки шаблона диалога: {error}",
"No tags selected for deletion." => "Ðе выбраны меток Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ.",
"Please reload the page." => "ПожалуйÑта, перезагрузите Ñтраницу.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "При обновлении произошла ошибка. ПожалуйÑта Ñообщите об Ñтом в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud ÑообщеÑтво</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Обновление прошло уÑпешно. ПеренаправлÑемÑÑ Ð² Ваш ownCloud...",
"%s password reset" => "%s ÑÐ±Ñ€Ð¾Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ",
"A problem has occurred whilst sending the email, please contact your administrator." => "Произошла ошибка при отправке ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñлектронной почты, пожалуйÑта, ÑвÑжитеÑÑŒ Ñ Ð’Ð°ÑˆÐ¸Ð¼ админиÑтратором.",
@@ -138,9 +140,9 @@ $TRANSLATIONS = array(
"Error unfavoriting" => "Ошибка ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¸Ð· любимых",
"Access forbidden" => "ДоÑтуп запрещён",
"Cloud not found" => "Облако не найдено",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "ЗдравÑтвуйте,\n\nпроÑто даём вам знать, что %s раÑшарил %s Ð´Ð»Ñ Ð²Ð°Ñ.\nПоÑмотреть: %s\n\n",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "ЗдравÑтвуйте,\n\n%s предоÑтавил Вам доÑтуп к %s.\nПоÑмотреть: %s\n\n",
"The share will expire on %s." => "ДоÑтуп пропадет в %s",
-"Cheers!" => "ПриветÑтвуем!",
+"Cheers!" => "Удачи!",
"Security Warning" => "Предупреждение безопаÑноÑти",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша верÑÐ¸Ñ PHP уÑзвима к атаке NULL Byte (CVE-2006-7243)",
"Please update your PHP installation to use %s securely." => "ПожалуйÑта обновите Вашу PHP конфигурацию Ð´Ð»Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñного иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ %s.",
@@ -149,6 +151,7 @@ $TRANSLATIONS = array(
"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 hrev=\"%s\"target=\"blank\">документацию</a>.",
"Create an <strong>admin account</strong>" => "Создать <strong>учётную запиÑÑŒ админиÑтратора</strong>",
+"Password" => "Пароль",
"Storage & database" => "СиÑтема Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… & база данных",
"Data folder" => "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸",
"Configure the database" => "ÐаÑтройка базы данных",
@@ -172,12 +175,11 @@ $TRANSLATIONS = array(
"remember" => "запомнить",
"Log in" => "Войти",
"Alternative Logins" => "Ðльтернативные имена пользователÑ",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "ЗдравÑтвуйте,<br><br>проÑто даём вам знать, что %s открыл доÑтуп к %s Ð´Ð»Ñ Ð²Ð°Ñ.<br><a href=\"%s\">ПоÑмотреть!</a><br><br>",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "ЗдравÑтвуйте,<br><br>%s предоÑтавил Вам доÑтуп к <strong>%s</strong>.<br><a href=\"%s\">ПоÑмотреть</a><br><br>",
"This ownCloud instance is currently in single user mode." => "Ðта уÑтановка ownCloud в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð² однопользовательÑком режиме.",
"This means only administrators can use the instance." => "Ðто значит, что только админиÑтраторы могут иÑпользовать Ñту уÑтановку.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "ОбратитеÑÑŒ к вашему ÑиÑтемному админиÑтратору еÑли Ñто Ñообщение не иÑчезает или поÑвлÑетÑÑ Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð¾.",
"Thank you for your patience." => "СпаÑибо за терпение.",
-"Updating ownCloud to version %s, this may take a while." => "Идёт обновление ownCloud до верÑии %s. Ðто может занÑÑ‚ÑŒ некоторое времÑ.",
"This ownCloud instance is currently being updated, which may take a while." => "ПроизводитÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ownCloud, Ñто может занÑÑ‚ÑŒ некоторое времÑ.",
"Please reload this page after a short time to continue using ownCloud." => "Перезагрузите Ñту Ñтраницу через некоторое Ð²Ñ€ÐµÐ¼Ñ Ñ‡Ñ‚Ð¾Ð±Ñ‹ продолжить иÑпользовать ownCloud."
);
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index bb125cc6af7fdb249b769da27aa2787212c740d3..1ce41214e91f8486af1247fc0a183e6c64efde50 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -31,16 +31,15 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "පෙර අවුරුද්දේ",
"years ago" => "අවුරුදු කීපයකට පෙර",
-"Choose" => "à¶à·à¶»à¶±à·Šà¶±",
"Yes" => "ඔව්",
"No" => "එපà·",
+"Choose" => "à¶à·à¶»à¶±à·Šà¶±",
"Ok" => "හරි",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "එපà·",
"Share" => "බෙද෠හද෠ගන්න",
"Error" => "දà·à·‚යක්",
"Password protect" => "මුර පදයකින් ආරක්à·à·à¶šà¶»à¶±à·Šà¶±",
-"Password" => "මුර පදය",
"Set expiration date" => "කල් ඉකුà¶à·Š විමේ දිනය දමන්න",
"Expiration date" => "කල් ඉකුà¶à·Š විමේ දිනය",
"Share via email:" => "විද්â€à¶ºà·”à¶à·Š à¶à·à¶´à·‘ල මඟින් බෙදà·à¶œà¶±à·Šà¶±: ",
@@ -73,6 +72,7 @@ $TRANSLATIONS = array(
"Cloud not found" => "සොය෠ගචනොහà·à¶š",
"Security Warning" => "ආරක්ෂක නිවේදනයක්",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ආරක්ෂිචඅහඹු සංඛ්â€à¶ºà· උà¶à·Šà¶´à·à¶¯à¶šà¶ºà¶šà·Š නොමà·à¶à·’ නම් ඔබගේ ගිණුමට පහරදෙන අයකුට එහි මුරපද යළි පිහිටුවීමට අවà·à·Šâ€à¶º ටà·à¶šà¶± පහසුවෙන් සොයà·à¶œà·™à¶± ඔබගේ ගිණුම පà·à·„à·à¶»à¶œà¶ à·„à·à¶š.",
+"Password" => "මුර පදය",
"Data folder" => "දà¶à·Šà¶ à·†à·à¶½à·Šà¶©à¶»à¶º",
"Configure the database" => "දà¶à·Šà¶ සමුදà·à¶º à·„à·à¶©à¶œà·à·ƒà·“ම",
"will be used" => "භà·à·€à·’à¶à· වනු ඇà¶",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 80d816a461d8df5e9b882ab5bfb43fa790fdaf14..9abcce3d3ae7d6b5d0740c932836225ac2779aed 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("pred %n mesiacom","pred %n mesiacmi","pred %n mesiacmi"),
"last year" => "minulý rok",
"years ago" => "pred rokmi",
-"Choose" => "Vybrať",
-"Error loading file picker template: {error}" => "Chyba pri nahrávanà šablóny výberu súborov: {error}",
"Yes" => "Ãno",
"No" => "Nie",
+"Choose" => "Vybrať",
+"Error loading file picker template: {error}" => "Chyba pri nahrávanà šablóny výberu súborov: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Chyba pri nahrávanà šablóny správy: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} konflikt súboru","{count} konflikty súboru","{count} konfliktov súboru"),
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
"Share with user or group …" => "ZdieľaÅ¥ s použÃvateľom alebo skupinou ...",
"Share link" => "Zdieľať linku",
"Password protect" => "Chrániť heslom",
-"Password" => "Heslo",
"Allow Public Upload" => "Povoliť verejné nahrávanie",
"Email link to person" => "Odoslať odkaz emailom",
"Send" => "Odoslať",
@@ -107,7 +106,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Chyba pri naÄÃtanà šablóny dialógu: {error}",
"No tags selected for deletion." => "Nie sú vybraté Å¡tÃtky na zmazanie.",
"Please reload the page." => "Obnovte prosÃm stránku.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizácia nebola úspešná. Problém nahláste <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud comunite</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku.",
"%s password reset" => "reset hesla %s",
"A problem has occurred whilst sending the email, please contact your administrator." => "Vyskytol sa problém pri odosielanà emailu, prosÃm obráťte sa na správcu.",
@@ -150,6 +148,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Váš prieÄinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.",
"Create an <strong>admin account</strong>" => "VytvoriÅ¥ <strong>administrátorský úÄet</strong>",
+"Password" => "Heslo",
"Storage & database" => "Úložislo & databáza",
"Data folder" => "PrieÄinok dát",
"Configure the database" => "Nastaviť databázu",
@@ -178,7 +177,6 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Len správca systému môže použÃvaÅ¥ túto inÅ¡tanciu.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktujte prosÃm správcu systému, ak sa táto správa objavuje opakovane alebo neoÄakávane.",
"Thank you for your patience." => "Ďakujeme za Vašu trpezlivosť.",
-"Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvÃľu trvaÅ¥.",
"This ownCloud instance is currently being updated, which may take a while." => "Táto inÅ¡tancia ownCloud sa práve aktualizuje, Äo môže nejaký Äas trvaÅ¥.",
"Please reload this page after a short time to continue using ownCloud." => "ProsÃm obnovte túto stránku a po krátkej dobe môžete pokraÄovaÅ¥ v použÃvanÃ."
);
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index c87a8d8d8f3e4c3299f64549e193e0b0a5234800..02ed13077a808fb88849270fb571d6c63829d971 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("pred %n mesecem","pred %n mesecema","pred %n meseci","pred %n meseci"),
"last year" => "lansko leto",
"years ago" => "let nazaj",
-"Choose" => "Izbor",
-"Error loading file picker template: {error}" => "Napaka nalaganja predloge izbirnika datotek: {error}",
"Yes" => "Da",
"No" => "Ne",
+"Choose" => "Izbor",
+"Error loading file picker template: {error}" => "Napaka nalaganja predloge izbirnika datotek: {error}",
"Ok" => "V redu",
"Error loading message template: {error}" => "Napaka nalaganja predloge sporoÄil: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} spor datotek","{count} spora datotek","{count} spori datotek","{count} sporov datotek"),
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
"Share with user or group …" => "Souporaba z uporabnikom ali skupino ...",
"Share link" => "Povezava za prejem",
"Password protect" => "ZaÅ¡Äiti z geslom",
-"Password" => "Geslo",
"Allow Public Upload" => "Dovoli javno pošiljanje na strežnik",
"Email link to person" => "Posreduj povezavo po elektronski pošti",
"Send" => "Pošlji",
@@ -107,7 +106,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Napaka nalaganja predloge pogovornega okna: {error}",
"No tags selected for deletion." => "Ni izbranih oznak za izbris.",
"Please reload the page." => "Stran je treba ponovno naložiti",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Posodobitev ni uspela. PoÅ¡ljite poroÄilo o napaki na sistemu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspeÅ¡no konÄana. Stran bo preusmerjena na oblak ownCloud.",
"%s password reset" => "Ponastavitev gesla %s",
"A problem has occurred whilst sending the email, please contact your administrator." => "PriÅ¡lo je do napake med poÅ¡iljanjem elektronskega sporoÄila. Stopite v stik s skrbnikom sistema.",
@@ -150,6 +148,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Za veÄ informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
"Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniÅ¡ki raÄun</strong>",
+"Password" => "Geslo",
"Storage & database" => "Shramba in podatkovna zbirka",
"Data folder" => "Podatkovna mapa",
"Configure the database" => "Nastavi podatkovno zbirko",
@@ -178,7 +177,6 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "To pomeni, da lahko oblak uporabljajo le osebe s skrbniškimi dovoljenji.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Stopite v stik s skrbnikom sistema, Äe se bo sporoÄilo Å¡e naprej nepriÄakovano prikazovalo.",
"Thank you for your patience." => "Hvala za potrpežljivost!",
-"Updating ownCloud to version %s, this may take a while." => "Posodabljanje sistema ownCloud na razliÄico %s je lahko dolgotrajno.",
"This ownCloud instance is currently being updated, which may take a while." => "Nastavitev oblaka ownCloud se trenutno posodablja. Opravilo je lahko dolgotrajno ...",
"Please reload this page after a short time to continue using ownCloud." => "Ponovno naložite to stran po krajÅ¡em preteku Äasa in nadaljujte z uporabo oblaka ownCloud."
);
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index b3221dc75f319107de6c854a6b16526afb2e3a7e..9891f36c7aa77100851d8ec803813dd4e00fd873 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n muaj më parë","%n muaj më parë"),
"last year" => "vitin e shkuar",
"years ago" => "vite më parë",
-"Choose" => "Zgjidh",
"Yes" => "Po",
"No" => "Jo",
+"Choose" => "Zgjidh",
"Ok" => "Në rregull",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "Anulo",
@@ -49,7 +49,6 @@ $TRANSLATIONS = array(
"Shared with you and the group {group} by {owner}" => "Ndarë me ju dhe me grupin {group} nga {owner}",
"Shared with you by {owner}" => "Ndarë me ju nga {owner}",
"Password protect" => "Mbro me kod",
-"Password" => "Kodi",
"Allow Public Upload" => "Lejo Ngarkimin Publik",
"Email link to person" => "Dërgo email me lidhjen",
"Send" => "Dërgo",
@@ -75,7 +74,6 @@ $TRANSLATIONS = array(
"The object type is not specified." => "Nuk është specifikuar tipi i objektit.",
"Delete" => "Elimino",
"Add" => "Shto",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitetin ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
"%s password reset" => "Kodi i %s -it u rivendos",
"Use the following link to reset your password: {link}" => "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
@@ -104,6 +102,7 @@ $TRANSLATIONS = array(
"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>",
+"Password" => "Kodi",
"Data folder" => "Emri i dosjes",
"Configure the database" => "Konfiguro database-in",
"will be used" => "do të përdoret",
@@ -121,7 +120,6 @@ $TRANSLATIONS = array(
"Lost your password?" => "Ke humbur kodin?",
"remember" => "kujto",
"Log in" => "Hyrje",
-"Alternative Logins" => "Hyrje alternative",
-"Updating ownCloud to version %s, this may take a while." => "Po azhurnoj ownCloud-in me versionin %s. Mund të zgjasi pak."
+"Alternative Logins" => "Hyrje alternative"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 388ebb0df925210800cead9a569fb73747eb7f15..0030be353aaccdc3695418abaf48a23aa5d185d7 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "прошле године",
"years ago" => "година раније",
-"Choose" => "Одабери",
"Yes" => "Да",
"No" => "Ðе",
+"Choose" => "Одабери",
"Ok" => "У реду",
"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
"Cancel" => "Откажи",
@@ -45,7 +45,6 @@ $TRANSLATIONS = array(
"Shared with you and the group {group} by {owner}" => "Дељено Ñа вама и Ñа групом {group}. Поделио {owner}.",
"Shared with you by {owner}" => "Поделио Ñа вама {owner}",
"Password protect" => "Заштићено лозинком",
-"Password" => "Лозинка",
"Send" => "Пошаљи",
"Set expiration date" => "ПоÑтави датум иÑтека",
"Expiration date" => "Датум иÑтека",
@@ -88,6 +87,7 @@ $TRANSLATIONS = array(
"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." => "Без поузданог генератора Ñлучајнох бројева нападач лако може предвидети лозинку за поништавање кључа шифровања и отети вам налог.",
"Create an <strong>admin account</strong>" => "Ðаправи <strong>админиÑтративни налог</strong>",
+"Password" => "Лозинка",
"Data folder" => "Фацикла података",
"Configure the database" => "Подешавање базе",
"will be used" => "ће бити коришћен",
@@ -103,7 +103,6 @@ $TRANSLATIONS = array(
"Please change your password to secure your account again." => "Промените лозинку да биÑте обезбедили налог.",
"Lost your password?" => "Изгубили Ñте лозинку?",
"remember" => "упамти",
-"Log in" => "Пријава",
-"Updating ownCloud to version %s, this may take a while." => "Ðадоградња ownCloud-а на верзију %s, Ñачекајте тренутак."
+"Log in" => "Пријава"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index e7783b3c023de5864db7b442c891376192f942ab..32e9479fb3f4733b30a7cc5efcfbc06cd6f25712 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -30,9 +30,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "prošle godine",
"years ago" => "pre nekoliko godina",
-"Choose" => "Izaberi",
"Yes" => "Da",
"No" => "Ne",
+"Choose" => "Izaberi",
"Ok" => "Ok",
"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
"Cancel" => "Otkaži",
@@ -45,7 +45,6 @@ $TRANSLATIONS = array(
"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}",
"Password protect" => "Zaštita lozinkom",
-"Password" => "Lozinka",
"Email link to person" => "Pošalji link e-mailom",
"Send" => "Pošalji",
"Set expiration date" => "Datum isteka",
@@ -69,7 +68,6 @@ $TRANSLATIONS = array(
"The object type is not specified." => "Tip objekta nije zadan.",
"Delete" => "Obriši",
"Add" => "Dodaj",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Ažuriranje nije uspelo. Molimo obavestite <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud zajednicu</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Ažuriranje je uspelo. Prosleđivanje na ownCloud.",
"Use the following link to reset your password: {link}" => "Koristite sledeći link za reset lozinke: {link}",
"You will receive a link to reset your password via Email." => "Dobićete vezu za resetovanje lozinke putem e-pošte.",
@@ -91,6 +89,7 @@ $TRANSLATIONS = array(
"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>",
+"Password" => "Lozinka",
"Data folder" => "Fascikla podataka",
"Configure the database" => "Podešavanje baze",
"will be used" => "će biti korišćen",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index f24398c662dcd89c347418cafeb0b95aada963ad..22348aeda3d1708c4ae221e438acac62f796050e 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"Turned on maintenance mode" => "Aktiverade underhållsläge",
"Turned off maintenance mode" => "Deaktiverade underhållsläge",
"Updated database" => "Uppdaterade databasen",
+"Disabled incompatible apps: %s" => "Inaktiverade inkompatibla appar: %s",
"No image or file provided" => "Ingen bild eller fil har tillhandahållits",
"Unknown filetype" => "Okänd filtyp",
"Invalid image" => "Ogiltig bild",
@@ -41,10 +42,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n månad sedan","%n månader sedan"),
"last year" => "förra året",
"years ago" => "Ã¥r sedan",
-"Choose" => "Välj",
-"Error loading file picker template: {error}" => "Fel uppstod för filväljarmall: {error}",
"Yes" => "Ja",
"No" => "Nej",
+"Choose" => "Välj",
+"Error loading file picker template: {error}" => "Fel uppstod för filväljarmall: {error}",
"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"),
@@ -73,8 +74,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "Delad med dig av {owner}",
"Share with user or group …" => "Dela med användare eller grupp...",
"Share link" => "Dela länk",
+"The public link will expire no later than {days} days after it is created" => "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades",
+"By default the public link will expire after {days} days" => "Som standard kommer den publika länken att sluta gälla efter {days} dagar",
"Password protect" => "Lösenordsskydda",
-"Password" => "Lösenord",
+"Choose a password for the public link" => "Välj ett lösenord för den publika länken",
"Allow Public Upload" => "Tillåt publik uppladdning",
"Email link to person" => "E-posta länk till person",
"Send" => "Skicka",
@@ -106,8 +109,9 @@ $TRANSLATIONS = array(
"Edit tags" => "Editera taggar",
"Error loading dialog template: {error}" => "Fel under laddning utav dialog mall: {fel}",
"No tags selected for deletion." => "Inga taggar valda för borttagning.",
+"Updating {productName} to version {version}, this may take a while." => "Uppdaterar {productName} till version {version}, detta kan ta en stund.",
"Please reload the page." => "Vänligen ladda om sidan.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
+"The update was unsuccessful." => "Uppdateringen misslyckades.",
"The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
"%s password reset" => "%s återställ lösenord",
"A problem has occurred whilst sending the email, please contact your administrator." => "Ett problem har uppstått under tiden e-post sändes, vänligen kontakta din administratör.",
@@ -150,6 +154,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
"Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
+"Password" => "Lösenord",
"Storage & database" => "Lagring & databas",
"Data folder" => "Datamapp",
"Configure the database" => "Konfigurera databasen",
@@ -178,7 +183,11 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Detta betyder att endast administartörer kan använda instansen.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Hör av dig till din system administratör ifall detta meddelande fortsätter eller visas oväntat.",
"Thank you for your patience." => "Tack för ditt tålamod.",
-"Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund.",
+"%s will be updated to version %s." => "%s kommer att uppdateras till version %s.",
+"The following apps will be disabled:" => "Följande appar kommer att inaktiveras:",
+"The theme %s has been disabled." => "Temat %s har blivit inaktiverat.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Vänligen säkerställ att en säkerhetskopia har gjorts av databasen, konfigurations- och datamappen innan du fortsätter.",
+"Start update" => "Starta uppdateringen",
"This ownCloud instance is currently being updated, which may take a while." => "Denna ownCloud instans håller på att uppdatera, vilket kan ta ett tag.",
"Please reload this page after a short time to continue using ownCloud." => "Var god och ladda om denna sida efter en kort stund för att fortsätta använda ownCloud."
);
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index c0b4dce7cf456d7b570eade08ec7f8d5f655e9c5..53c8cb1333375c93192504a774a0ce7f777053d7 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "கடநà¯à®¤ வரà¯à®Ÿà®®à¯",
"years ago" => "வரà¯à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯",
-"Choose" => "தெரிவà¯à®šà¯†à®¯à¯à®• ",
"Yes" => "ஆமà¯",
"No" => "இலà¯à®²à¯ˆ",
+"Choose" => "தெரிவà¯à®šà¯†à®¯à¯à®• ",
"Ok" => "சரி",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Cancel" => "இரதà¯à®¤à¯ செயà¯à®•",
@@ -45,7 +45,6 @@ $TRANSLATIONS = array(
"Shared with you and the group {group} by {owner}" => "உஙà¯à®•à®³à¯à®Ÿà®©à¯à®®à¯ கà¯à®´à¯à®µà¯à®•à¯à®•à®¿à®Ÿà¯ˆà®¯à®¿à®²à¯à®®à¯ {கà¯à®´à¯} பகிரபà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯ {உரிமையாளரà¯}",
"Shared with you by {owner}" => "உஙà¯à®•à®³à¯à®Ÿà®©à¯ பகிரபà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯ {உரிமையாளரà¯}",
"Password protect" => "கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ பாதà¯à®•à®¾à®¤à¯à®¤à®²à¯",
-"Password" => "கடவà¯à®šà¯à®šà¯Šà®²à¯",
"Set expiration date" => "காலாவதி தேதியை கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®•",
"Expiration date" => "காலவதியாகà¯à®®à¯ திகதி",
"Share via email:" => "மினà¯à®©à®žà¯à®šà®²à®¿à®©à¯‚டான பகிரà¯à®µà¯: ",
@@ -85,6 +84,7 @@ $TRANSLATIONS = array(
"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." => "பாதà¯à®•à®¾à®ªà¯à®ªà®¾à®© சீரறà¯à®± எணà¯à®£à®¿à®•à¯à®•à¯ˆà®¯à®¾à®© பà¯à®±à®ªà¯à®ªà®¾à®•à¯à®•à®¿ இலà¯à®²à¯ˆà®¯à¯†à®©à®¿à®©à¯, தாகà¯à®•à¯à®©à®°à®¾à®²à¯ கடவà¯à®šà¯à®šà¯Šà®²à¯ மீளமைபà¯à®ªà¯ அடையாளவிலà¯à®²à¯ˆà®•à®³à¯ à®®à¯à®©à¯à®®à¯Šà®´à®¿à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿà¯ உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கணகà¯à®•à¯ˆ கைபà¯à®ªà®±à¯à®±à®²à®¾à®®à¯.",
"Create an <strong>admin account</strong>" => "<strong> நிரà¯à®µà®¾à®• கணகà¯à®•à¯Šà®©à¯à®±à¯ˆ </strong> உரà¯à®µà®¾à®•à¯à®•à¯à®•",
+"Password" => "கடவà¯à®šà¯à®šà¯Šà®²à¯",
"Data folder" => "தரவ௠கோபà¯à®ªà¯à®±à¯ˆ",
"Configure the database" => "தரவà¯à®¤à¯à®¤à®³à®¤à¯à®¤à¯ˆ தகவமைகà¯à®•",
"will be used" => "பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®®à¯",
diff --git a/core/l10n/te.php b/core/l10n/te.php
index 7b76349b8525cc1e9a83460deb85d77fddb815ac..7016cde75f2918992f2e9e37ef959dfb821d4e3e 100644
--- a/core/l10n/te.php
+++ b/core/l10n/te.php
@@ -37,7 +37,6 @@ $TRANSLATIONS = array(
"Cancel" => "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿",
"Continue" => "కొనసాగించà±",
"Error" => "పొరపాటà±",
-"Password" => "సంకేతపదం",
"Send" => "పంపించà±",
"Expiration date" => "కాలం చెలà±à°²à± తేదీ",
"delete" => "తొలగించà±",
@@ -49,6 +48,7 @@ $TRANSLATIONS = array(
"Personal" => "à°µà±à°¯à°•à±à°¤à°¿à°—తం",
"Users" => "వాడà±à°•à°°à±à°²à±",
"Help" => "సహాయం",
+"Password" => "సంకేతపదం",
"Log out" => "నిషà±à°•à±à°°à°®à°¿à°‚à°šà±",
"Lost your password?" => "మీ సంకేతపదం పోయిందా?"
);
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 61a67f78026fb949f16bac9d9d8603187caa6143..21bc6a7067e6da0bb4b6474100d35328eee542b1 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array(""),
"last year" => "ปีที่à¹à¸¥à¹‰à¸§",
"years ago" => "ปี ที่ผ่านมา",
-"Choose" => "เลืà¸à¸",
"Yes" => "ตà¸à¸¥à¸‡",
"No" => "ไม่ตà¸à¸¥à¸‡",
+"Choose" => "เลืà¸à¸",
"Ok" => "ตà¸à¸¥à¸‡",
"_{count} file conflict_::_{count} file conflicts_" => array(""),
"New Files" => "ไฟล์ใหม่",
@@ -47,7 +47,6 @@ $TRANSLATIONS = array(
"Shared with you and the group {group} by {owner}" => "ได้à¹à¸Šà¸£à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸šà¸„ุณ à¹à¸¥à¸°à¸à¸¥à¸¸à¹ˆà¸¡ {group} โดย {owner}",
"Shared with you by {owner}" => "ถูà¸à¹à¸Šà¸£à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸šà¸„ุณโดย {owner}",
"Password protect" => "ใส่รหัสผ่านไว้",
-"Password" => "รหัสผ่าน",
"Email link to person" => "ส่งลิงà¸à¹Œà¹ƒà¸«à¹‰à¸—างà¸à¸µà¹€à¸¡à¸¥",
"Send" => "ส่ง",
"Set expiration date" => "à¸à¸³à¸«à¸™à¸”วันที่หมดà¸à¸²à¸¢à¸¸",
@@ -73,7 +72,6 @@ $TRANSLATIONS = array(
"The object type is not specified." => "ชนิดขà¸à¸‡à¸§à¸±à¸•à¸–ุยังไม่ได้รับà¸à¸²à¸£à¸£à¸°à¸šà¸¸",
"Delete" => "ลบ",
"Add" => "เพิ่ม",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "à¸à¸²à¸£à¸à¸±à¸žà¹€à¸”ทไม่เป็นผลสำเร็จ à¸à¸£à¸¸à¸“าà¹à¸ˆà¹‰à¸‡à¸›à¸±à¸à¸«à¸²à¸—ี่เà¸à¸´à¸”ขึ้นไปยัง <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">คà¸à¸¡à¸¡à¸¹à¸™à¸´à¸•à¸µà¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ ownCloud</a>",
"The update was successful. Redirecting you to ownCloud now." => "à¸à¸²à¸£à¸à¸±à¸žà¹€à¸”ทเสร็จเรียบร้à¸à¸¢à¹à¸¥à¹‰à¸§ à¸à¸³à¸¥à¸±à¸‡à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹€à¸ªà¹‰à¸™à¸—างไปที่ ownCloud à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸‚ณะนี้",
"Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่à¸à¹„ปนี้เพื่à¸à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸„ุณใหม่: {link}",
"You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่à¸à¸à¸³à¸«à¸™à¸”รหัสผ่านใหม่ทางà¸à¸µà¹€à¸¡à¸¥à¹Œ",
@@ -93,6 +91,7 @@ $TRANSLATIONS = array(
"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." => "หาà¸à¸›à¸£à¸²à¸¨à¸ˆà¸²à¸à¸•à¸±à¸§à¸ªà¸£à¹‰à¸²à¸‡à¸«à¸¡à¸²à¸¢à¹€à¸¥à¸‚à¹à¸šà¸šà¸ªà¸¸à¹ˆà¸¡à¸—ี่ช่วยป้à¸à¸‡à¸à¸±à¸™à¸„วามปลà¸à¸”ภัย ผู้บุà¸à¸£à¸¸à¸à¸à¸²à¸ˆà¸ªà¸²à¸¡à¸²à¸£à¸–ที่จะคาดคะเนรหัสยืนยันà¸à¸²à¸£à¹€à¸‚้าถึงเพื่à¸à¸£à¸µà¹€à¸‹à¹‡à¸•à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™ à¹à¸¥à¸°à¹€à¸à¸²à¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡à¸„ุณไปเป็นขà¸à¸‡à¸•à¸™à¹€à¸à¸‡à¹„ด้",
"Create an <strong>admin account</strong>" => "สร้าง <strong>บัà¸à¸Šà¸µà¸œà¸¹à¹‰à¸”ูà¹à¸¥à¸£à¸°à¸šà¸š</strong>",
+"Password" => "รหัสผ่าน",
"Data folder" => "โฟลเดà¸à¸£à¹Œà¹€à¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥",
"Configure the database" => "à¸à¸³à¸«à¸™à¸”ค่าà¸à¸²à¸™à¸‚้à¸à¸¡à¸¹à¸¥",
"will be used" => "จะถูà¸à¹ƒà¸Šà¹‰",
@@ -108,7 +107,6 @@ $TRANSLATIONS = array(
"Please change your password to secure your account again." => "à¸à¸£à¸¸à¸“าเปลี่ยนรหัสผ่านขà¸à¸‡à¸„ุณà¸à¸µà¸à¸„รั้ง เพื่à¸à¸›à¹‰à¸à¸‡à¸à¸±à¸™à¸šà¸±à¸à¸Šà¸µà¸‚à¸à¸‡à¸„ุณให้ปลà¸à¸”ภัย",
"Lost your password?" => "ลืมรหัสผ่าน?",
"remember" => "จำรหัสผ่าน",
-"Log in" => "เข้าสู่ระบบ",
-"Updating ownCloud to version %s, this may take a while." => "à¸à¸³à¸¥à¸±à¸‡à¸à¸±à¸žà¹€à¸”ท ownCloud ไปเป็นรุ่น %s, à¸à¸£à¸¸à¸“ารà¸à¸ªà¸±à¸à¸„รู่"
+"Log in" => "เข้าสู่ระบบ"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index d5880d8a09d76ab43dd0290440525515038ee31d..0ccc009ef71bbd805224d9883aa2f351c88f3383 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"Turned on maintenance mode" => "Bakım kipi etkinleştirildi",
"Turned off maintenance mode" => "Bakım kipi kapatıldı",
"Updated database" => "Veritabanı güncellendi",
+"Disabled incompatible apps: %s" => "Uyumsuz uygulamalar devre dışı bırakıldı: %s",
"No image or file provided" => "Resim veya dosya belirtilmedi",
"Unknown filetype" => "Bilinmeyen dosya türü",
"Invalid image" => "Geçersiz resim",
@@ -41,10 +42,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n ay önce","%n ay önce"),
"last year" => "geçen yıl",
"years ago" => "yıllar önce",
-"Choose" => "Seç",
-"Error loading file picker template: {error}" => "Dosya seçici şablonu yüklenirken hata: {error}",
"Yes" => "Evet",
"No" => "Hayır",
+"Choose" => "Seç",
+"Error loading file picker template: {error}" => "Dosya seçici şablonu yüklenirken hata: {error}",
"Ok" => "Tamam",
"Error loading message template: {error}" => "İleti şablonu yüklenirken hata: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} dosya çakışması","{count} dosya çakışması"),
@@ -73,8 +74,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "{owner} tarafından sizinle paylaşıldı",
"Share with user or group …" => "Kullanıcı veya grup ile paylaş...",
"Share link" => "Paylaşma bağlantısı",
+"The public link will expire no later than {days} days after it is created" => "Herkese açık bağlantı, oluşturulduktan en geç {days} gün sonra sona erecek",
+"By default the public link will expire after {days} days" => "Öntanımlı olarak herkese açık bağlantı {days} gün sonra sona erecek",
"Password protect" => "Parola koruması",
-"Password" => "Parola",
+"Choose a password for the public link" => "Herkese açık bağlantı için bir parola seçin",
"Allow Public Upload" => "Herkes Tarafından Gönderime İzin Ver",
"Email link to person" => "Bağlantıyı e-posta ile gönder",
"Send" => "Gönder",
@@ -85,7 +88,7 @@ $TRANSLATIONS = array(
"group" => "grup",
"Resharing is not allowed" => "Tekrar paylaÅŸmaya izin verilmiyor",
"Shared in {item} with {user}" => "{item} içinde {user} ile paylaşılanlar",
-"Unshare" => "Paylaşılmayan",
+"Unshare" => "Paylaşmayı Kaldır",
"notify by email" => "e-posta ile bildir",
"can edit" => "düzenleyebilir",
"access control" => "erişim kontrolü",
@@ -106,8 +109,9 @@ $TRANSLATIONS = array(
"Edit tags" => "Etiketleri düzenle",
"Error loading dialog template: {error}" => "İletişim şablonu yüklenirken hata: {error}",
"No tags selected for deletion." => "Silmek için bir etiket seçilmedi.",
+"Updating {productName} to version {version}, this may take a while." => "{productName}, {version} sürümüne güncelleniyor, bu biraz zaman alabilir.",
"Please reload the page." => "Lütfen sayfayı yeniden yükleyin.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Güncelleme başarısız oldu. Lütfen bu hatayı <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud topluluğu</a>na bildirin.",
+"The update was unsuccessful." => "Güncelleme başarısız oldu.",
"The update was successful. Redirecting you to ownCloud now." => "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz.",
"%s password reset" => "%s parola sıfırlama",
"A problem has occurred whilst sending the email, please contact your administrator." => "E-posta gönderilirken bir hata oluştu. Lütfen yöneticinizle iletişime geçin.",
@@ -144,12 +148,13 @@ $TRANSLATIONS = array(
"Cheers!" => "Hoşça kalın!",
"Security Warning" => "Güvenlik Uyarısı",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP sürümünüz NULL Byte saldırısına açık (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "%s güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin.",
+"Please update your PHP installation to use %s securely." => "%s yazılımını güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Güvenli rastgele sayı üreticisi bulunamadı. Lütfen PHP OpenSSL eklentisini etkinleştirin.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Güvenli rastgele sayı üreticisi olmadan saldırganlar parola sıfırlama simgelerini tahmin edip hesabınızı ele geçirebilir.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.",
"Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun",
+"Password" => "Parola",
"Storage & database" => "Depolama ve veritabanı",
"Data folder" => "Veri klasörü",
"Configure the database" => "Veritabanını yapılandır",
@@ -162,7 +167,7 @@ $TRANSLATIONS = array(
"Finish setup" => "Kurulumu tamamla",
"Finishing …" => "Tamamlanıyor ...",
"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Uygulama, doğru çalışabilmesi için JavaScript'in etkinleştirilmesini gerektiriyor. Lütfen <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript'i etkinleştirin</a> ve bu arayüzü yeniden yükleyin.",
-"%s is available. Get more information on how to update." => "%s mevcut. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın.",
+"%s is available. Get more information on how to update." => "%s kullanılabilir. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın.",
"Log out" => "Çıkış yap",
"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ştirmediyseniz hesabınız tehlikede olabilir!",
@@ -178,7 +183,11 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Bu, örneği sadece yöneticiler kullanabilir demektir.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Eğer bu ileti görünmeye devam ederse veya beklenmedik şekilde ortaya çıkmışsa sistem yöneticinizle iletişime geçin.",
"Thank you for your patience." => "Sabrınız için teşekkür ederiz.",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud %s sürümüne güncelleniyor. Biraz zaman alabilir.",
+"%s will be updated to version %s." => "%s, %s sürümüne güncellenecek.",
+"The following apps will be disabled:" => "Aşağıdaki uygulamalar devre dışı bırakılacak:",
+"The theme %s has been disabled." => "%s teması devre dışı bırakıldı.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Devam etmeden önce lütfen veritabanının, config ve data klasörlerinin yedeklenmiş olduğundan emin olun.",
+"Start update" => "Güncellemeyi başlat",
"This ownCloud instance is currently being updated, which may take a while." => "Bu ownCloud örneği şu anda güncelleniyor, bu biraz zaman alabilir.",
"Please reload this page after a short time to continue using ownCloud." => "ownCloud kullanmaya devam etmek için kısa bir süre sonra lütfen sayfayı yenileyin."
);
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
index 9b923070356d0cceb604b847fc7d288081d046a6..a21c47fc76c30dd4db8a8dddf16853c1c5f7cfb6 100644
--- a/core/l10n/ug.php
+++ b/core/l10n/ug.php
@@ -34,7 +34,6 @@ $TRANSLATIONS = array(
"Cancel" => "ۋاز كەچ",
"Share" => "ھەمبەھىر",
"Error" => "خاتالىق",
-"Password" => "ئىم",
"Send" => "يوللا",
"group" => "گۇرۇپپا",
"Unshare" => "ھەمبەھىرلىمە",
@@ -50,6 +49,7 @@ $TRANSLATIONS = array(
"Apps" => "ئەپلەر",
"Help" => "ياردەم",
"Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش",
+"Password" => "ئىم",
"Finish setup" => "تەÚØ´Û•Ùƒ تامام",
"Log out" => "تىزىمدىن چىق"
);
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 015183e6470397c1d4cbfcee2321614175f7f426..490140940cf272ea7b35d929aa6b2108a048bc55 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n міÑÑць тому","%n міÑÑці тому","%n міÑÑців тому"),
"last year" => "минулого року",
"years ago" => "роки тому",
-"Choose" => "Обрати",
-"Error loading file picker template: {error}" => "Помилка при завантаженні шаблону вибору: {error}",
"Yes" => "Так",
"No" => "ÐÑ–",
+"Choose" => "Обрати",
+"Error loading file picker template: {error}" => "Помилка при завантаженні шаблону вибору: {error}",
"Ok" => "Ok",
"Error loading message template: {error}" => "Помилка при завантаженні шаблону повідомленнÑ: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} файловий конфлікт","{count} файлових конфліктів","{count} файлових конфліктів"),
@@ -72,7 +72,6 @@ $TRANSLATIONS = array(
"Share with user or group …" => "ПоділитиÑÑ Ð· кориÑтувачем або групою ...",
"Share link" => "Опублікувати поÑиланнÑ",
"Password protect" => "ЗахиÑтити паролем",
-"Password" => "Пароль",
"Allow Public Upload" => "Дозволити Публічне ЗавантаженнÑ",
"Email link to person" => "Ел. пошта належить Пану",
"Send" => "ÐадіÑлати",
@@ -105,7 +104,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Помилка при завантаженні шаблону діалогу: {error}",
"No tags selected for deletion." => "Жодних тегів не обрано Ð´Ð»Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ.",
"Please reload the page." => "Будь лаÑка, перезавантажте Ñторінку.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð»Ð¾ÑÑŒ неуÑпішно. Будь лаÑка, повідомте про цю проблему в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Ñпільноті ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð»Ð¾ÑÑŒ уÑпішно. ПеренаправлÑємо Ð²Ð°Ñ Ð½Ð° ownCloud.",
"%s password reset" => "%s пароль Ñкинуто",
"Use the following link to reset your password: {link}" => "ВикориÑтовуйте наÑтупне поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ: {link}",
@@ -146,6 +144,7 @@ $TRANSLATIONS = array(
"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>",
+"Password" => "Пароль",
"Data folder" => "Каталог даних",
"Configure the database" => "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð±Ð°Ð·Ð¸ даних",
"will be used" => "буде викориÑтано",
@@ -172,7 +171,6 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Це означає, що лише адмініÑтратори можуть викориÑтовувати цей екземплÑÑ€.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "ЗвернітьÑÑ Ð´Ð¾ ÑиÑтемного адмініÑтратора, Ñкщо це Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ñ”Ñ‚ÑŒÑÑ Ð°Ð±Ð¾ з'ÑвлÑÑ”Ñ‚ÑŒÑ Ð½ÐµÑподівано.",
"Thank you for your patience." => "ДÑкуємо за ваше терпіннÑ.",
-"Updating ownCloud to version %s, this may take a while." => "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ownCloud до верÑÑ–Ñ— %s, це може зайнÑти деÑкий чаÑ.",
"This ownCloud instance is currently being updated, which may take a while." => "Цей ownCloud зараз оновлюєтьÑÑ, це може тривати певний чаÑ.",
"Please reload this page after a short time to continue using ownCloud." => "Будь лаÑка, перезавантажте незабаром цю Ñторінку, щоб продовжити кориÑтуватиÑÑ OwnCloud."
);
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index 3012eb869c96f82b1306c699fe1b538a6120f59f..cdec1ace28868d6b569e1c3837cfb70a0aada101 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -1,5 +1,20 @@
<?php
$TRANSLATIONS = array(
+"Expiration date is in the past." => "ختم Ûونے Ú©ÛŒ تاریخ ماضی میں ÛÛ’.",
+"Turned on maintenance mode" => "بØالی موڈ چالو ÛÛ’",
+"Turned off maintenance mode" => "بØالی موڈ بند ÛÛ’",
+"Updated database" => "اپ ڈیٹ Ûوئ ڈیٹا بیس",
+"No image or file provided" => "کوئی تصویر یا Ùائل ÙراÛÙ… Ù†Ûیں",
+"Unknown filetype" => "غیر معررو٠قسم Ú©ÛŒ Ùائل",
+"Invalid image" => "غلط تصویر",
+"No crop data provided" => "کوئی کروپ ڈیٹا ميسر Ù†Ûیں ",
+"Sunday" => "اتوار",
+"Monday" => "سوموار",
+"Tuesday" => "منگل",
+"Wednesday" => "بدھ",
+"Thursday" => "جمعرات",
+"Friday" => "جمعÛ",
+"Saturday" => "ÛÙتÛ",
"January" => "جنوری",
"February" => "Ùرورئ",
"March" => "مارچ",
@@ -12,51 +27,109 @@ $TRANSLATIONS = array(
"October" => "اکتوبر",
"November" => "نومبر",
"December" => "دسمبر",
-"Settings" => "سیٹینگز",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
+"Settings" => "ترتیبات",
+"Saving..." => "Ù…ØÙوظ Ú¾Ùˆ رÛا ÛÛ’ ...",
+"seconds ago" => "سیکنڈز Ù¾ÛÙ„Û’",
+"_%n minute ago_::_%n minutes ago_" => array("%n منٹس Ù¾ÛÙ„Û’","%n منٹس Ù¾ÛÙ„Û’"),
"_%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("",""),
-"Choose" => "منتخب کریں",
+"last year" => "پچھلے سال",
+"years ago" => "سالوں Ù¾ÛÙ„Û’",
"Yes" => "Ûاں",
"No" => "Ù†Ûیں",
+"Choose" => "منتخب کریں",
"Ok" => "اوکے",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("{گنتی} Ùائل متصادم ","{گنتی} Ùائل متصادم "),
+"One file conflict" => "اایک Ùائل متصادم ÛÛ’",
+"New Files" => "جدید Ùائلیں",
+"Already existing files" => "Ù¾ÛÙ„Û’ سے موجودجدید Ùائلیں",
+"Which files do you want to keep?" => "آپ کون سی Ùائلیں رکھنا چاÛتے Ûیں ØŸ",
"Cancel" => "منسوخ کریں",
-"Error" => "ایرر",
-"Error while sharing" => "شئیرنگ کے دوران ایرر",
-"Error while unsharing" => "شئیرنگ ختم کرنے کے دوران ایرر",
-"Error while changing permissions" => "اختیارات کو تبدیل کرنے کے دوران ایرر",
-"Password protect" => "پاسورڈ سے Ù…ØÙوظ کریں",
-"Password" => "پاسورڈ",
+"Continue" => "جاری",
+"(all selected)" => "(سب منتخب شدÛ)",
+"({count} selected)" => "({گنتی} منتخب شدÛ)",
+"Very weak password" => "بÛت کمزور پاسورڈ",
+"Weak password" => "کمزور پاسورڈ",
+"So-so password" => "نص نص پاسورڈ",
+"Good password" => "اچھا پاسورڈ",
+"Strong password" => "مضبوط پاسورڈ",
+"Shared" => "اشتراک شدÛ",
+"Share" => "اشتراک",
+"Error" => "خرابی",
+"Error while sharing" => "اشتراک کے دوران خرابی ",
+"Error while unsharing" => "اشترک ختم کرنے کے دوران خرابی",
+"Error while changing permissions" => "اختیارات کو تبدیل کرنے کے دوران خرابی ",
+"Shared with you and the group {group} by {owner}" => "آپ اور Ú¯Ø±ÙˆÛ Ø³Û’ مشترق Ø´Ø¯Û {Ú¯Ø±ÙˆÛ } سے {مالک}",
+"Shared with you by {owner}" => "اشتراک Ø´Ø¯Û Ø¢Ù¾ سے{مالک}",
+"Share with user or group …" => "صار٠یا Ù…Ø¬Ù…ÙˆØ¹Û Ú©Û’ ساتھ اشتراک کریں ...",
+"Share link" => "اشتراک لنک",
+"By default the public link will expire after {days} days" => "ÚˆÛŒÙالٹ میں عوامی لنک ختم ÛÙˆ جائے گا {دن} دن",
+"Password protect" => "Ù…ØÙوظ پاسورڈ",
+"Choose a password for the public link" => "عوامی لنک کے لئےپاس ورڈ منتخب کریں",
+"Allow Public Upload" => "پبلک اپ لوڈ کرنے کی اجازت دیں",
+"Email link to person" => "Ø´Øص Ú©Û’ لیے ای میل لنک",
+"Send" => "بھجیں",
"Set expiration date" => "تاریخ معیاد سیٹ کریں",
"Expiration date" => "تاریخ معیاد",
-"No people found" => "کوئی لوگ Ù†Ûیں ملے۔",
-"Resharing is not allowed" => "Ø¯ÙˆØ¨Ø§Ø±Û Ø´Ø¦ÛŒØ± کرنے Ú©ÛŒ اجازت Ù†Ûیں",
+"Share via email:" => "ای میل کے زریعے ارسال کریں",
+"No people found" => "کوئ شخص موجود Ù†Ûیں ",
+"group" => "مجموعÛ",
+"Resharing is not allowed" => "Ø¯ÙˆØ¨Ø§Ø±Û Ø§Ø´ØªØ±Ø§Ú© Ú©ÛŒ اجازت Ù†Ûیں",
+"Shared in {item} with {user}" => "شراکت میں {آئٹم}اور {مستخدم}",
"Unshare" => "شئیرنگ ختم کریں",
-"can edit" => "ایڈٹ کر سکے",
+"notify by email" => "ای میل کے ذریعے مطلع کریں",
+"can edit" => "تبدیل کر سکے ھیں",
"access control" => "اسیس کنٹرول",
"create" => "نیا بنائیں",
"update" => "اپ ڈیٹ",
"delete" => "ختم کریں",
"share" => "شئیر کریں",
"Password protected" => "پاسورڈ سے Ù…ØÙوظ کیا گیا ÛÛ’",
+"Error unsetting expiration date" => "خرابی غیر تصØÛŒØ ØªØ§Ø±ÛŒØ® معیاد",
+"Error setting expiration date" => "خرابی تصØÛŒØ ØªØ§Ø±ÛŒØ® معیاد",
+"Sending ..." => "ارسال ÛÙˆ رÛا Ú¾Û’",
+"Email sent" => "ارسال Ø´Ø¯Û Ø§ÛŒ میل ",
+"Warning" => "انتباÛ",
+"The object type is not specified." => "اس چیز Ú©ÛŒ قسم Ú©ÛŒ وضاØت Ù†Ûیں",
+"Enter new" => "جدید درج کریں",
+"Delete" => "Øذ٠کریں",
"Add" => "شامل کریں",
+"Edit tags" => "ترمیم ٹیگز",
+"Please reload the page." => "Ø¨Ø±Ø§Û Ù…Ûربانی صÙØÛ Ø¯ÙˆØ¨Ø§Ø±Û Ù„ÙˆÚˆ کریں.",
+"The update was successful. Redirecting you to ownCloud now." => "اپ ڈیٹ کامیاب تھی۔ اپ Ú©Ùˆ اون کلوڈ سے منسلک کیا جا رÛا ÛÛ’",
+"A problem has occurred whilst sending the email, please contact your administrator." => "ای میل بھیجنے Ú©Û’ دوران ایک Ù…Ø³Ø¦Ù„Û Ù¾ÛŒØ´ آیا ÛÛ’ , Ø¨Ø±Ø§Û Ù…Ûربانی اپنےایڈمنسٹریٹر سے Ø±Ø§Ø¨Ø·Û Ú©Ø±ÛŒÚº.",
"Use the following link to reset your password: {link}" => "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔ {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "آپ کا پاس ورڈ ری سیٹ کرنےکا لنک آپ Ú©ÛŒ ای میل ميں Ø¨Ú¾ÛŒØ¬Ø Ø¯ÛŒØ§ گیا ÛÛ’ .<br> اگر آپ اسکو معقول وقت Ú©Û’ اندر وصول Ù†Ûیں کرتے ØŒ آپ سپیم/جنک Ú©Û’ Ùولڈرز دیکھیں .<br> اگر ÙˆÛ ÙˆÛاں Ù†Ûیں ÛÛ’ تو اپنے مقامی منتظم سے Ú©Ûیں Û”",
+"Request failed!<br>Did you make sure your email/username was right?" => "گذارش ناکام!<br>کيا Ù¾ Ù†Û’ يقينی بنايا Ú©Û Ø¢Ù¾ Ú©ÛŒ ای میل / صار٠کا نام درست تھا؟",
"You will receive a link to reset your password via Email." => "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے",
"Username" => "یوزر نیم",
+"Yes, I really want to reset my password now" => "جی Ûاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاÛتا ÛÙˆÚº",
+"Reset" => "ری سیٹ",
"Your password was reset" => "آپ کا پاسورڈ ری سیٹ کر دیا گیا ÛÛ’",
"To login page" => "لاگ ان صÙØÛ’ Ú©ÛŒ طرÙ",
"New password" => "نیا پاسورڈ",
"Reset password" => "ری سیٹ پاسورڈ",
-"Personal" => "ذاتی",
-"Users" => "یوزرز",
+"Personal" => "شخصی",
+"Users" => "صارÙین",
"Apps" => "ایپز",
"Admin" => "ایڈمن",
"Help" => "مدد",
-"Access forbidden" => "Ù¾ÛÙ†Ú† Ú©ÛŒ اجازت Ù†Ûیں",
-"Cloud not found" => "Ù†Ûیں مل سکا",
+"Access forbidden" => "رسائ منقطع ÛÛ’",
+"Cloud not found" => "کلوڈ موجود Ù†ÛÛÚº",
+"Cheers!" => "واÛ!",
+"Security Warning" => "ØÙاظتی انتباÛ",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "آپ کا Ù¾ÛŒ ایچ Ù¾ÛŒ ورین نل بائٹ Ú©Û’ Øملے Ú©Û’ خطرے سے دوچار ÛÛ’ (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => " Ø¨Ø±Ø§Û Ù…Ûربانی %s Ú©Ùˆ بØÙاظت استعمال کرنے Ú©Û’ Ù¾ÛŒ ایچ Ù¾ÛŒ Ú©ÛŒ تنصیب اپڈیٹ کریں",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "کوئ Ù…ØÙوظ بے ترتیب نمبر جنریٹر موجود Ù†Ûیں Ù…Ûربانی کر Ú©Û’ Ù¾ÛŒ ایچ Ù¾ÛŒ اوپن ایس ایس ایل ایکسٹنشن چالو کریں.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ایک Ù…ØÙوظ بے ترتیب نمبر جنریٹر Ú©Û’ بغیر ایک ØÙ…Ù„Û Ø¢ÙˆØ± پاس ورڈ ری سیٹ ٹوکن Ú©ÛŒ پیشن گوئی کرنے Ú©Û’ قابل اور اپ Ú©Û’ Øساب پر Ù‚Ø¨Ø¶Û Ú©Ø± سکتا ÛÛ’",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "آپ Ú©ÛŒ ڈیٹا ڈائریکٹری اور Ùائلیں امکان Ûےانٹرنیٹ سے قابل رسائی Ûیں Ú©ÛŒÙˆÙ†Ú©Û htaccess. Ùائل کام Ù†Ûیں کرتا ÛÛ’",
"Create an <strong>admin account</strong>" => "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
+"Password" => "پاسورڈ",
+"Storage & database" => "Ø°Ø®ÛŒØ±Û Ø§ÙˆØ± ڈیٹا بیس",
"Data folder" => "ڈیٹا Ùولڈر",
"Configure the database" => "ڈیٹا بیس کونÙگر کریں",
"will be used" => "استعمال ÛÙˆ گا",
@@ -66,9 +139,16 @@ $TRANSLATIONS = array(
"Database tablespace" => "ڈیٹابیس ٹیبل سپیس",
"Database host" => "ڈیٹابیس Ûوسٹ",
"Finish setup" => "سیٹ اپ ختم کریں",
+"Finishing …" => "تکمیل ...",
+"%s is available. Get more information on how to update." => "%s دستیاب ÛÛ’. اپ ڈیٹ کرنے Ú©Û’ بارے میں مزید معلومات Øاصل کریں.",
"Log out" => "لاگ آؤٹ",
+"Automatic logon rejected!" => "آٹومیٹک لاگ ان مسترد",
+"If you did not change your password recently, your account may be compromised!" => "آپ Ù†Û’ Øال ÛÛŒ میں اپنا پاس ورڈ تبدیل Ù†Ûیں کیا تو، آپ Ú©Û’ اکاؤنٹ سے Ø³Ù…Ø¬Ú¾ÙˆØªÛ ÛÙˆ سکتا ÛÛ’",
+"Please change your password to secure your account again." => "Ø¨Ø±Ø§Û Ù…Ûربانی پھر سے اکاونٹ Ù…ØÙوظ کرنے Ú©Û’ لیے اپنا پاس ورڈ تبدیل کریں.",
"Lost your password?" => "کیا آپ پاسورڈ بھول گئے Ûیں؟",
"remember" => "یاد رکھیں",
-"Log in" => "لاگ ان"
+"Log in" => "لاگ ان",
+"Alternative Logins" => "متبادل لاگ ان ",
+"Thank you for your patience." => "آپ Ú©Û’ صبر کا شکریÛ"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index fe24cb385e5038e90c8b19f8b69ab642c0ca4dd5..fc00a5573e43413ba8b08809483d63006189d4b9 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n tháng trước"),
"last year" => "năm trước",
"years ago" => "năm trước",
-"Choose" => "Chá»n",
-"Error loading file picker template: {error}" => "Lá»—i khi tải mẫu táºp tin picker: {error}",
"Yes" => "Có",
"No" => "Không",
+"Choose" => "Chá»n",
+"Error loading file picker template: {error}" => "Lá»—i khi tải mẫu táºp tin picker: {error}",
"Ok" => "Äồng ý",
"Error loading message template: {error}" => "Lỗi khi tải mẫu thông điệp: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} táºp tin xung Ä‘á»™t"),
@@ -67,7 +67,6 @@ $TRANSLATIONS = array(
"Share with user or group …" => "Chia sẻ vá»›i ngÆ°á»i dùng hoặc nhóm",
"Share link" => "Chia sẻ liên kết",
"Password protect" => "Máºt khẩu bảo vệ",
-"Password" => "Máºt khẩu",
"Allow Public Upload" => "Cho phép công khai táºp tin tải lên",
"Email link to person" => "Liên kết email tới cá nhân",
"Send" => "Gởi",
@@ -100,7 +99,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Lỗi khi tải mẫu hội thoại: {error}",
"No tags selected for deletion." => "Không có thẻ nà o được chá»n để xóa",
"Please reload the page." => "Vui lòng tải lại trang.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Cáºp nháºt không thà nh công . Vui lòng thông báo đến <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\"> Cá»™ng đồng ownCloud </a>.",
"The update was successful. Redirecting you to ownCloud now." => "Cáºp nháºt thà nh công .Hệ thống sẽ Ä‘Æ°a bạn tá»›i ownCloud.",
"%s password reset" => "%s thiết láºp lại máºt khẩu",
"Use the following link to reset your password: {link}" => "Dùng Ä‘Æ°á»ng dẫn sau để khôi phục lại máºt khẩu : {link}",
@@ -138,6 +136,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "ThÆ° mục và file dữ liệu của bạn có thể được truy cáºp từ internet bởi vì file .htaccess không hoạt Ä‘á»™ng",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Äể biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tà i l</a>.",
"Create an <strong>admin account</strong>" => "Tạo một <strong>tà i khoản quản trị</strong>",
+"Password" => "Máºt khẩu",
"Data folder" => "Thư mục dữ liệu",
"Configure the database" => "Cấu hình cơ sở dữ liệu",
"will be used" => "được sỠdụng",
@@ -164,7 +163,6 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "Äiá»u nà y có nghÄ©a chỉ có ngÆ°á»i quản trị có thể sá» dụng trong trÆ°á»ng hợp nà y.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Liên hệ vá»›i ngÆ°á»i quản trị nếu lá»—i nà y vẫn tồn tại hoặc xuất hiện bất ngá».",
"Thank you for your patience." => "Cảm ơn sự kiên nhẫn của bạn.",
-"Updating ownCloud to version %s, this may take a while." => "Cáºp nháºt ownCloud lên phiên bản %s, có thể sẽ mất thá»i gian",
"This ownCloud instance is currently being updated, which may take a while." => "Phiên bản ownCloud nà y hiện Ä‘ang được cáºp nháºt, có thể sẽ mất má»™t Ãt thá»i gian.",
"Please reload this page after a short time to continue using ownCloud." => "Xin vui lòng tải lại trang nà y để tiếp tục sỠdụng ownCloud."
);
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 4d3c55b07f4a790a3594f3b498f53c21bdc98f93..f7ea54359cff4bb08a6d3c980de813e9909ee3bc 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n 月å‰"),
"last year" => "去年",
"years ago" => "å¹´å‰",
-"Choose" => "选择(&C)...",
-"Error loading file picker template: {error}" => "åŠ è½½æ–‡ä»¶åˆ†æ‹£æ¨¡æ¿å‡ºé”™: {error}",
"Yes" => "是",
"No" => "å¦",
+"Choose" => "选择(&C)...",
+"Error loading file picker template: {error}" => "åŠ è½½æ–‡ä»¶åˆ†æ‹£æ¨¡æ¿å‡ºé”™: {error}",
"Ok" => "好",
"Error loading message template: {error}" => "åŠ è½½æ¶ˆæ¯æ¨¡æ¿å‡ºé”™: {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} 个文件冲çª"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "{owner} 与您共享",
"Share with user or group …" => "分享给其他用户或组 ...",
"Share link" => "分享链接",
+"The public link will expire no later than {days} days after it is created" => "è¿™ä¸ªå…±äº«é“¾æŽ¥å°†åœ¨åˆ›å»ºåŽ {days} 天失效",
+"By default the public link will expire after {days} days" => "默认共享链接失效天数为 {days} ",
"Password protect" => "密ç ä¿æŠ¤",
-"Password" => "密ç ",
+"Choose a password for the public link" => "为共享链接设置密ç ",
"Allow Public Upload" => "å…è®¸å…¬å¼€ä¸Šä¼ ",
"Email link to person" => "å‘é€é“¾æŽ¥åˆ°ä¸ªäºº",
"Send" => "å‘é€",
@@ -107,7 +109,6 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "åŠ è½½å¯¹è¯æ¡†æ¨¡æ¿å‡ºé”™: {error}",
"No tags selected for deletion." => "请选择è¦åˆ é™¤çš„æ ‡ç¾ã€‚",
"Please reload the page." => "请é‡æ–°åŠ 载页é¢ã€‚",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "æ›´æ–°ä¸æˆåŠŸã€‚请汇报将æ¤é—®é¢˜æ±‡æŠ¥ç»™ <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社区</a>。",
"The update was successful. Redirecting you to ownCloud now." => "æ›´æ–°æˆåŠŸã€‚æ£åœ¨é‡å®šå‘至 ownCloud。",
"%s password reset" => "é‡ç½® %s 的密ç ",
"A problem has occurred whilst sending the email, please contact your administrator." => "å‘é€ç”µå邮件时å‘生问题，请和管ç†å‘˜è”系。",
@@ -150,6 +151,7 @@ $TRANSLATIONS = array(
"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>",
+"Password" => "密ç ",
"Storage & database" => "å˜å‚¨ & æ•°æ®åº“",
"Data folder" => "æ•°æ®ç›®å½•",
"Configure the database" => "é…置数æ®åº“",
@@ -178,7 +180,6 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "è¿™æ„味ç€åªæœ‰ç®¡ç†å‘˜æ‰èƒ½åœ¨å®žä¾‹ä¸Šæ“作。",
"Contact your system administrator if this message persists or appeared unexpectedly." => "如果这个消æ¯ä¸€ç›´å˜åœ¨æˆ–ä¸åœå‡ºçŽ°ï¼Œè¯·è”ç³»ä½ çš„ç³»ç»Ÿç®¡ç†å‘˜ã€‚",
"Thank you for your patience." => "æ„Ÿè°¢è®©ä½ ä¹…ç‰äº†ã€‚",
-"Updating ownCloud to version %s, this may take a while." => "æ›´æ–° ownCloud 到版本 %s，这å¯èƒ½éœ€è¦ä¸€äº›æ—¶é—´ã€‚",
"This ownCloud instance is currently being updated, which may take a while." => "当å‰ownCloud实例æ£åœ¨æ›´æ–°ï¼Œå¯èƒ½éœ€è¦ä¸€æ®µæ—¶é—´ã€‚",
"Please reload this page after a short time to continue using ownCloud." => "请ç¨åŽé‡æ–°åŠ 载这个页é¢ï¼Œä»¥ç»§ç»ä½¿ç”¨ownCloud。"
);
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index 294fa7d6fe69cf690379dd080df49ed42006e98c..e47d3a8d4008c6ca0b2ffc332c8c857eefa5ee55 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
"Shared with you and the group {group} by {owner}" => "{owner}èˆ‡ä½ åŠç¾¤çµ„的分享",
"Shared with you by {owner}" => "{owner}èˆ‡ä½ çš„åˆ†äº«",
"Password protect" => "密碼ä¿è·",
-"Password" => "密碼",
"Send" => "傳é€",
"Set expiration date" => "è¨å®šåˆ†äº«æœŸé™",
"Expiration date" => "分享期é™",
@@ -72,6 +71,7 @@ $TRANSLATIONS = array(
"Help" => "幫助",
"Cloud not found" => "未找到Cloud",
"Create an <strong>admin account</strong>" => "建立管ç†å“¡å¸³æˆ¶",
+"Password" => "密碼",
"Configure the database" => "è¨å®šè³‡æ–™åº«",
"will be used" => "將被使用",
"Database user" => "資料庫帳戶",
@@ -83,7 +83,6 @@ $TRANSLATIONS = array(
"Please change your password to secure your account again." => "è«‹æ›´æ”¹ä½ çš„å¯†ç¢¼ä»¥ä¿è·ä½ 的帳戶",
"Lost your password?" => "忘記密碼",
"remember" => "記ä½",
-"Log in" => "登入",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud (ver. %s)æ›´æ–°ä¸, è«‹è€å¿ƒç‰ä¾¯"
+"Log in" => "登入"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 465ae0c70085950eb7b2a99d4267f76fe9161579..833c295679aece37e6ab0bc7e71f1fe62362b2d0 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n 個月å‰"),
"last year" => "去年",
"years ago" => "幾年å‰",
-"Choose" => "é¸æ“‡",
-"Error loading file picker template: {error}" => "載入檔案é¸æ“‡å™¨æ¨£æ¿å‡ºéŒ¯ï¼š {error}",
"Yes" => "是",
"No" => "å¦",
+"Choose" => "é¸æ“‡",
+"Error loading file picker template: {error}" => "載入檔案é¸æ“‡å™¨æ¨£æ¿å‡ºéŒ¯ï¼š {error}",
"Ok" => "好",
"Error loading message template: {error}" => "載入訊æ¯æ¨£æ¿å‡ºéŒ¯ï¼š {error}",
"_{count} file conflict_::_{count} file conflicts_" => array("{count} 個檔案è¡çª"),
@@ -72,7 +72,6 @@ $TRANSLATIONS = array(
"Share with user or group …" => "與用戶或群組分享",
"Share link" => "分享連çµ",
"Password protect" => "密碼ä¿è·",
-"Password" => "密碼",
"Allow Public Upload" => "å…許任何人上傳",
"Email link to person" => "å°‡é€£çµ email 給別人",
"Send" => "寄出",
@@ -104,7 +103,6 @@ $TRANSLATIONS = array(
"Edit tags" => "編輯標籤",
"Error loading dialog template: {error}" => "載入å°è©±æ¨£æ¿å‡ºéŒ¯ï¼š{error}",
"No tags selected for deletion." => "沒有é¸æ“‡è¦åˆªé™¤çš„標籤",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "å‡ç´šå¤±æ•—，請將æ¤å•é¡Œå›žå ± <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社群</a>。",
"The update was successful. Redirecting you to ownCloud now." => "å‡ç´šæˆåŠŸï¼Œæ£å°‡æ‚¨é‡æ–°å°Žå‘至 ownCloud 。",
"%s password reset" => "%s 密碼é‡è¨",
"Use the following link to reset your password: {link}" => "請至以下連çµé‡è¨æ‚¨çš„密碼： {link}",
@@ -142,6 +140,7 @@ $TRANSLATIONS = array(
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的資料目錄看起來å¯ä»¥è¢« Internet 公開å˜å–ï¼Œå› ç‚º .htaccess è¨å®šä¸¦æœªç”Ÿæ•ˆã€‚",
"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "è«‹åƒè€ƒ<a href=\"%s\" target=\"_blank\">說明文件</a>以çžè§£å¦‚何æ£ç¢ºè¨å®šæ‚¨çš„伺æœå™¨ã€‚",
"Create an <strong>admin account</strong>" => "建立一個<strong>管ç†è€…帳號</strong>",
+"Password" => "密碼",
"Data folder" => "資料儲å˜ä½ç½®",
"Configure the database" => "è¨å®šè³‡æ–™åº«",
"will be used" => "將會使用",
@@ -165,7 +164,6 @@ $TRANSLATIONS = array(
"Alternative Logins" => "其他登入方法",
"Contact your system administrator if this message persists or appeared unexpectedly." => "若這個訊æ¯æŒçºŒå‡ºç¾ï¼Œè«‹è¯çµ¡ç³»çµ±ç®¡ç†å“¡",
"Thank you for your patience." => "æ„Ÿè¬æ‚¨çš„è€å¿ƒ",
-"Updating ownCloud to version %s, this may take a while." => "æ£åœ¨å°‡ ownCloud å‡ç´šè‡³ç‰ˆæœ¬ %s ，這å¯èƒ½éœ€è¦ä¸€é»žæ™‚間。",
"This ownCloud instance is currently being updated, which may take a while." => "ownCloud æ£åœ¨å‡ç´šï¼Œè«‹ç¨å¾…一會。",
"Please reload this page after a short time to continue using ownCloud." => "è«‹ç¨å¾Œé‡æ–°è¼‰å…¥é€™å€‹é é¢å°±å¯ä»¥ç¹¼çºŒä½¿ç”¨ ownCloud"
);
diff --git a/core/lostpassword/css/lostpassword.css b/core/lostpassword/css/lostpassword.css
index 85cce9f940790e1b4209a30e20bee763251bafe0..b7f7023648ddffcb7f66b1eab25d2f9540aa92d3 100644
--- a/core/lostpassword/css/lostpassword.css
+++ b/core/lostpassword/css/lostpassword.css
@@ -1,11 +1,6 @@
#body-login
-input[type="text"],
-input[type="submit"] {
- margin: 5px 0;
-}
-
input[type="text"]#user{
- padding-right: 12px;
+ padding-right: 20px;
padding-left: 41px;
}
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index 83a23f7b23931dd5bf5a277eb59c2918422a6add..d0fed38ee27de672207f5fb9623615f642d30510 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -21,10 +21,10 @@ OCP\Util::addStyle('lostpassword', 'lostpassword');
<label for="user" class="infield"><?php print_unescaped($l->t( 'Username' )); ?></label>
<img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
<?php if ($_['isEncrypted']): ?>
- <br /><br />
- <?php print_unescaped($l->t("Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?")); ?><br />
+ <br />
+ <p class="warning"><?php print_unescaped($l->t("Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?")); ?><br />
<input type="checkbox" name="continue" value="Yes" />
- <?php print_unescaped($l->t('Yes, I really want to reset my password now')); ?><br/><br/>
+ <?php print_unescaped($l->t('Yes, I really want to reset my password now')); ?></p>
<?php endif; ?>
</p>
<input type="submit" id="submit" value="<?php print_unescaped($l->t('Reset')); ?>" />
diff --git a/core/register_command.php b/core/register_command.php
index 2efa838e9ee9b8c69c1e8b3e195862d6be086a0d..9ced377bee3983422149674d7e9a2855b90adbbc 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -9,10 +9,14 @@
/** @var $application Symfony\Component\Console\Application */
$application->add(new OC\Core\Command\Status);
$application->add(new OC\Core\Command\Db\GenerateChangeScript());
+$application->add(new OC\Core\Command\Db\ConvertType(OC_Config::getObject(), new \OC\DB\ConnectionFactory()));
$application->add(new OC\Core\Command\Upgrade());
$application->add(new OC\Core\Command\Maintenance\SingleUser());
+$application->add(new OC\Core\Command\Maintenance\Mode(OC_Config::getObject()));
$application->add(new OC\Core\Command\App\Disable());
$application->add(new OC\Core\Command\App\Enable());
$application->add(new OC\Core\Command\App\ListApps());
$application->add(new OC\Core\Command\Maintenance\Repair(new \OC\Repair()));
$application->add(new OC\Core\Command\User\Report());
+$application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
+$application->add(new OC\Core\Command\User\LastSeen());
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 1f89e3f04037726b2bee8a1386a0a4fdbc8c7a8a..d38dc24d9ce034c53f4a6a784a8e4106b16ad186 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -35,14 +35,15 @@
<?php flush(); ?>
<body id="body-login">
<div class="wrapper"><!-- for sticky footer -->
- <header><div id="header">
- <div class="logo svg"></div>
- <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
- </div></header>
-
- <?php print_unescaped($_['content']); ?>
+ <div class="v-align"><!-- vertically centred box -->
+ <header><div id="header">
+ <div class="logo svg"></div>
+ <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
+ </div></header>
+ <?php print_unescaped($_['content']); ?>
<div class="push"></div><!-- for sticky footer -->
+ </div>
</div>
<footer>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index a217446ca73b70ca58d9ccbfdd8b3bf03f3d00fa..b0ae8637accaa97df3d66b4634bceb3fdcffb56b 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -123,7 +123,7 @@
</div></nav>
<div id="content-wrapper">
- <div id="content">
+ <div id="content" class="app-<?php p($_['appid']) ?>">
<?php print_unescaped($_['content']); ?>
</div>
</div>
diff --git a/core/templates/login.php b/core/templates/login.php
index 65f760c1ee84e4f56667cceb24e045cb8c4d5e0f..669d20b32e415fc16bfc613bc618a6189f172cde 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -51,7 +51,7 @@
<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')); ?>"/>
+ <input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>" disabled="disabled"/>
</fieldset>
</form>
<?php if (!empty($_['alt_login'])) { ?>
diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php
index a652d5f195a4830651c291f20a8fbad036d5048d..a09e2d07bf473475b75b59e7ca2bb754de195fc2 100644
--- a/core/templates/update.admin.php
+++ b/core/templates/update.admin.php
@@ -1,6 +1,27 @@
-<ul>
- <li class='update'>
- <?php p($l->t('Updating ownCloud to version %s, this may take a while.',
- array($_['version']))); ?><br /><br />
- </li>
-</ul>
+<div class="update">
+ <div class="updateOverview">
+ <h2 class="title bold"><?php p($l->t('%s will be updated to version %s.',
+ array($_['productName'], $_['version']))); ?></h2>
+ <?php if (!empty($_['appList'])) { ?>
+ <div class="infogroup">
+ <span class="bold"><?php p($l->t('The following apps will be disabled:')) ?></span>
+ <ul class="content appList">
+ <?php foreach ($_['appList'] as $appInfo) { ?>
+ <li><?php p($appInfo['name']) ?> (<?php p($appInfo['id']) ?>)</li>
+ <?php } ?>
+ </ul>
+ </div>
+ <?php } ?>
+ <?php if (!empty($_['oldTheme'])) { ?>
+ <div class="infogroup bold">
+ <?php p($l->t('The theme %s has been disabled.', array($_['oldTheme']))) ?>
+ </div>
+ <?php } ?>
+ <div class="infogroup bold">
+ <?php p($l->t('Please make sure that the database, the config folder and the data folder have been backed up before proceeding.')) ?>
+ </div>
+ <input class="updateButton" type="button" value="<?php p($l->t('Start update')) ?>">
+ </div>
+
+ <div class="updateProgress hidden"></div>
+</div>
diff --git a/db_structure.xml b/db_structure.xml
index 3cb2af287afe5175faa5498f36a83a2d4334e3fe..21ac47a781b6908e37573efe024de2d333b070ea 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -257,7 +257,7 @@
<type>text</type>
<default></default>
<notnull>false</notnull>
- <length>512</length>
+ <length>4000</length>
</field>
<field>
diff --git a/l10n/ach/core.po b/l10n/ach/core.po
index 508df40e1df4be9e33d2d663d7d2246978410231..858568034631bb10331e429590ae316d461cd442 100644
--- a/l10n/ach/core.po
+++ b/l10n/ach/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ach\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/ach/files.po b/l10n/ach/files.po
index 60c7fc2ed312e3d846f2bbe27230bec8298550da..50707fcc6f04e6922f9fb1fc4a6d2145a89daf55 100644
--- a/l10n/ach/files.po
+++ b/l10n/ach/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/ach/files_encryption.po b/l10n/ach/files_encryption.po
index 79790b6544ac1fc04e1a11ff239530abb7d9795b..f2c83b06608f0da65c27e29e96f0428e15256afb 100644
--- a/l10n/ach/files_encryption.po
+++ b/l10n/ach/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ach/files_external.po b/l10n/ach/files_external.po
index 45a6a8b7218f8705536b02afd77b5a8c2c5c761f..6dd6eaa3e51af862847872e38f830941d61f501d 100644
--- a/l10n/ach/files_external.po
+++ b/l10n/ach/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ach/files_sharing.po b/l10n/ach/files_sharing.po
index db8560cb3d18b7b17e0872917c865860609bc94f..7ad614d3969581fbabc47c219bfb353f48f6a4ed 100644
--- a/l10n/ach/files_sharing.po
+++ b/l10n/ach/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: ach\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/ach/files_trashbin.po b/l10n/ach/files_trashbin.po
index 96c38828dd8a8395682861e891908b00a110e0b6..b676ed2f556a33e34d94e59350b42be85015f46b 100644
--- a/l10n/ach/files_trashbin.po
+++ b/l10n/ach/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/ach/lib.po b/l10n/ach/lib.po
index b89f4ef25774dc0cf0e5735f6de55c5f7aba2918..301ca4fd0b74d57b13965ad140da90af0f0be391 100644
--- a/l10n/ach/lib.po
+++ b/l10n/ach/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ach\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/ach/settings.po b/l10n/ach/settings.po
index df5507bffcfb37092c164b61b953ddac026ee085..42e1d644a094a302740e2c8c5860f80cb471e4bf 100644
--- a/l10n/ach/settings.po
+++ b/l10n/ach/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/ach/user_ldap.po b/l10n/ach/user_ldap.po
index 5b84c3724ba0e107da662bdc6dbc1114ae2bd6e9..88f1c53f6c67eb236518053ab47058da00f9e6fa 100644
--- a/l10n/ach/user_ldap.po
+++ b/l10n/ach/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ady/core.po b/l10n/ady/core.po
index 2641da3bfc39d4cd844edb042205d6913c7a92dd..85d643c972fdd96d1a95498e6af8c1b0db616bc8 100644
--- a/l10n/ady/core.po
+++ b/l10n/ady/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ady\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/ady/files.po b/l10n/ady/files.po
index 2b9f857d433012418a8d08efc97ca8c51fb233a6..73207895bfe68717f445c794d1ec573b437b5dbf 100644
--- a/l10n/ady/files.po
+++ b/l10n/ady/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/ady/files_encryption.po b/l10n/ady/files_encryption.po
index 2ae790c338bb6a5d7c5397b88ad10586726a878b..f18f6e9722345aade61737b8a52d69f20b518641 100644
--- a/l10n/ady/files_encryption.po
+++ b/l10n/ady/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ady/files_external.po b/l10n/ady/files_external.po
index 0a35e3404942a89363fed4c9373d2fd64f4248d6..1c5cdcdc02bde06dd646c77029aa4b1a884bde66 100644
--- a/l10n/ady/files_external.po
+++ b/l10n/ady/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ady/files_sharing.po b/l10n/ady/files_sharing.po
index e27f7d01c6a7ef99c2a1c97d70fe5b5bbfd37ab2..c6c4525ce35b09ff301e7974e94c56236fd8f73d 100644
--- a/l10n/ady/files_sharing.po
+++ b/l10n/ady/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: ady\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/ady/files_trashbin.po b/l10n/ady/files_trashbin.po
index 65927975a23b8d877274528366f8da0f1123fb22..753c7b8e199c15ab02e7df73735a98fa1fc0f353 100644
--- a/l10n/ady/files_trashbin.po
+++ b/l10n/ady/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/ady/lib.po b/l10n/ady/lib.po
index 4a60f3d2ed117f97c5effca78364f88cd41ac0cd..4321f947260e11e82eb0092547fa9fdf85ec7aa3 100644
--- a/l10n/ady/lib.po
+++ b/l10n/ady/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ady\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/ady/settings.po b/l10n/ady/settings.po
index 4117495a19a64a2166742ae3952a993327825d19..515c0ac7eef52090c3a74a757cadc8f3abbf515e 100644
--- a/l10n/ady/settings.po
+++ b/l10n/ady/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/ady/user_ldap.po b/l10n/ady/user_ldap.po
index d4f2a71490e7986edcdee67589b8096c47f83110..638371aa3aca3b67e49880f004175b13e36239d3 100644
--- a/l10n/ady/user_ldap.po
+++ b/l10n/ady/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index 888f2caf321538f89ac7507c7ffba11bbe938d98..d23ece057f4487ab178113b7fc32ff81ae141b4a 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:10+0000\n"
-"Last-Translator: kalliet <kst@fam-tank.net>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "Verval datum is in die verlede."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -40,6 +40,11 @@ msgstr "Instandhouding uitgeskakel"
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Geen prent of lêer voorsien"
@@ -60,207 +65,207 @@ msgstr "Geen tydelike profiel foto beskikbaar nie, probeer weer"
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sondag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Mandag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Dinsdag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Woensdag"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Donderdag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Vrydag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Saterdag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januarie"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februarie"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Maart"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mei"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Junie"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Julie"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Augustus"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Desember"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Instellings"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Stoor..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "sekondes gelede"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minute gelede"
msgstr[1] "%n minute gelede"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n ure gelde"
msgstr[1] "%n ure gelede"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "vandag"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "gister"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dae gelede"
msgstr[1] "%n dae gelede"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "verlede maand"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n maande gelede"
msgstr[1] "%n maande gelede"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "verlede jaar"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "jare gelede"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Kies"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nee"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Kies"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nuwe leêrs"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Bestaande leêrs"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Kanseleer"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Gaan voort"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -292,142 +297,151 @@ msgstr "Gedeel"
msgid "Share"
msgstr "Deel"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Fout"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Deel veroorsaak fout"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Deel terugneem veroorsaak fout"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Fout met verandering van regte"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Met jou en die groep {group} gedeel deur {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Met jou gedeel deur {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Beskerm met Wagwoord"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Wagwoord"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Laat Publieke Oplaai toe"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "E-pos aan persoon"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Stuur"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Stel verval datum"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Verval datum"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Deel oor epos:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Geen persoon gevind"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "groep"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Hernieu deel is nie toegelaat nie "
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Gedeel in {item} met {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Deel terug neem"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "kan wysig"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "toegang beheer"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "skep"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "opdateer"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "uitvee"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "deel"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Beskerm met wagwoord"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Fout met skrapping van verval datum"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Fout met opstel van verval datum"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Stuur ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "E-pos gestuur"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
-msgstr ""
+msgstr "Waarskuwing"
#: js/tags.js:4
msgid "The object type is not specified."
@@ -457,18 +471,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "Die opdatering was nie suksesvol nie. Rapporteer die probleem by <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei."
@@ -669,6 +684,10 @@ msgstr "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien assebli
msgid "Create an <strong>admin account</strong>"
msgstr "Skep `n <strong>admin-rekening</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Wagwoord"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -794,8 +813,27 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Opdatering a ownCloud versie %s - dit kan 'n tydjie vat."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index e3cc65a6c314d73caed59930c2549a204215bcac..c6841c9bfeedd40cdc633c7f3983de807c9d1440 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:10+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Deel"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/af_ZA/files_encryption.po b/l10n/af_ZA/files_encryption.po
index ccf69021eb67910ecdad5e2ba8f9d549a063025f..f3d2edf496d142845f314de8eb6abf397a18937c 100644
--- a/l10n/af_ZA/files_encryption.po
+++ b/l10n/af_ZA/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/af_ZA/files_external.po b/l10n/af_ZA/files_external.po
index 3f4e2806dbef30d1f2d16503fd710b938bb4b11c..c674876b5687b5e94a6f6f5c6de91a0e04dccb73 100644
--- a/l10n/af_ZA/files_external.po
+++ b/l10n/af_ZA/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:10+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po
index 09700e06a1f185004524cbaba5827a07f4641b19..2c007e7cf9f76c4be129c6916dddbf9668b44a60 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "Wagwoord"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/af_ZA/files_trashbin.po b/l10n/af_ZA/files_trashbin.po
index 8fb4f5b930bceabd21ab15a144dc9fe622bab25e..82eab21d031795e718555ad552e1e93a0f166a22 100644
--- a/l10n/af_ZA/files_trashbin.po
+++ b/l10n/af_ZA/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index 74e508fd6537e49f69ced27b4a3a148dad68ce25..236f5edac8e07dbe4a9ed3e73f438497f392dd50 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr "webdienste onder jou beheer"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index 2718964e661aea0e3d3be31588111b209f712f58..06e3983e29ae4feae3e882ca506f9cb74dcfb1ef 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "So-so wagwoord"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index 8348fbfab8bc08f8d72fbf480fe1ad049e6c084a..b927f3267bdb1c4737f66c3f6b6df21c329750a0 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr ""
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr "Gaan voort"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Gevorderd"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ak/core.po b/l10n/ak/core.po
index 2314857d23a5882c97a0c067893cba38e304ff13..872a71cb8c7f4d84d09afb68d890eaac0f98599d 100644
--- a/l10n/ak/core.po
+++ b/l10n/ak/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ak\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/ak/files.po b/l10n/ak/files.po
index b4b5ad63f530bdeb8642532c015e99ddef84e7c6..10af2926ba00240b7d0f3b9b59af1d4f52636899 100644
--- a/l10n/ak/files.po
+++ b/l10n/ak/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/ak/files_encryption.po b/l10n/ak/files_encryption.po
index 92710e5b5d375f7f5956899d4a0041139ee3325b..53c6e0dd0bfb312b638f5f9b430393042f2d99ca 100644
--- a/l10n/ak/files_encryption.po
+++ b/l10n/ak/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ak/files_external.po b/l10n/ak/files_external.po
index fb9291581cfba92d1145532b2b3d3d053b5a7211..c57c4d36734c63ed902403606d5dcd8c97ff3334 100644
--- a/l10n/ak/files_external.po
+++ b/l10n/ak/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ak/files_sharing.po b/l10n/ak/files_sharing.po
index b647d7fb85155392692b1928fef5c3b7ff3b8b2f..ef6b03c9db8f5605327bebeec04cc5688c12eabc 100644
--- a/l10n/ak/files_sharing.po
+++ b/l10n/ak/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: ak\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/ak/files_trashbin.po b/l10n/ak/files_trashbin.po
index 56c75b3a357829c85328f1695239589ca0106fef..dd86037938a4b044c11e38a6fa303ca96767a45a 100644
--- a/l10n/ak/files_trashbin.po
+++ b/l10n/ak/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/ak/lib.po b/l10n/ak/lib.po
index a790ad651a527eb45b41542ac2eb425cca9c0731..6a7c8a20f5c8b69dc615cabb987db0e01cc20274 100644
--- a/l10n/ak/lib.po
+++ b/l10n/ak/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ak\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/ak/settings.po b/l10n/ak/settings.po
index 300b60d574ada3b805e7612a2e65b6f50179576d..24814a32136ff5abfc94b3bc1be85fe1d0ad177d 100644
--- a/l10n/ak/settings.po
+++ b/l10n/ak/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/ak/user_ldap.po b/l10n/ak/user_ldap.po
index 8e625a32174b396549c9600ff02b13c5f5b025c6..c66b234bae12bae3ba7fbbbef7a11e0de1ae44e5 100644
--- a/l10n/ak/user_ldap.po
+++ b/l10n/ak/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/am_ET/core.po b/l10n/am_ET/core.po
index 3d756941bf5a314dc4aeed7899f6df1cebd75299..a64528921b1a35a56da1e0ab8959a291545366df 100644
--- a/l10n/am_ET/core.po
+++ b/l10n/am_ET/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: am_ET\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/am_ET/files.po b/l10n/am_ET/files.po
index de433ada46a44e458929defd89a7da69dc0bcf11..5797da282efb2ba57efabeb3a9f51d90962c459d 100644
--- a/l10n/am_ET/files.po
+++ b/l10n/am_ET/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/am_ET/files_encryption.po b/l10n/am_ET/files_encryption.po
index ee25cebfde98d0aecf8a93726ec567e683cbd706..572adbe0ea1cd5d3359c19529e2f749f33c8b5a0 100644
--- a/l10n/am_ET/files_encryption.po
+++ b/l10n/am_ET/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-26 01:55-0400\n"
-"PO-Revision-Date: 2014-03-25 09:38+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/am_ET/files_external.po b/l10n/am_ET/files_external.po
index f46ef69182f98e11df9f571606745a931ce80992..30cc3f96e29e709c2c2216b0fb3069b5c0db10d1 100644
--- a/l10n/am_ET/files_external.po
+++ b/l10n/am_ET/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/am_ET/files_sharing.po b/l10n/am_ET/files_sharing.po
index 476d68ce1687b5a3946ec577a861ad32c96f691c..1540cf20a49391af4fa2ed55a0b8d2bea38c59f4 100644
--- a/l10n/am_ET/files_sharing.po
+++ b/l10n/am_ET/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: am_ET\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/am_ET/files_trashbin.po b/l10n/am_ET/files_trashbin.po
index 5c0bf63448b70d21734a5fbef5cf37b7affb5f44..368b38b55ec090bc5706f304402b66cf77a296e6 100644
--- a/l10n/am_ET/files_trashbin.po
+++ b/l10n/am_ET/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-26 01:55-0400\n"
-"PO-Revision-Date: 2014-03-25 09:38+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/am_ET/lib.po b/l10n/am_ET/lib.po
index 585bb83de69d415a086d3660272aadb89f81f120..234d147334501d7fed282d8579264d782b5572b8 100644
--- a/l10n/am_ET/lib.po
+++ b/l10n/am_ET/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: am_ET\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/am_ET/settings.po b/l10n/am_ET/settings.po
index 955500147168b9170dee6cff12197609e7cef5cb..9c2c92016c6b810fee5c5e24c8f275a262da46f2 100644
--- a/l10n/am_ET/settings.po
+++ b/l10n/am_ET/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/am_ET/user_ldap.po b/l10n/am_ET/user_ldap.po
index ba789c234bcd1eadc630dd813ea92ab493f10557..badc4907740c0417f6467fb6dfdcc1dea46d1c17 100644
--- a/l10n/am_ET/user_ldap.po
+++ b/l10n/am_ET/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 3c4eeae9ff86deea0a59ff26924543ae1f4dc827..356a35ba5b83c660600985056211429778559600 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 13:26+0000\n"
-"Last-Translator: m3tz.gh <moataz-net@hotmail.com>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -20,11 +20,11 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -41,6 +41,11 @@ msgstr ""
msgid "Updated database"
msgstr "قاعدة بيانات المرÙوعات"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -61,95 +66,95 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "الأØد"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "الأثنين"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "الثلاثاء"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "الاربعاء"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "الخميس"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "الجمعه"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "السبت"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "كانون الثاني"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "شباط"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "آذار"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "نيسان"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "أيار"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Øزيران"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "تموز"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "آب"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "أيلول"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "تشرين الاول"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "تشرين الثاني"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "كانون الاول"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "إعدادات"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "جاري الØÙظ..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "منذ ثواني"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -159,7 +164,7 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -169,15 +174,15 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "اليوم"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "يوم أمس"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -187,11 +192,11 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "الشهر الماضي"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -201,39 +206,39 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "السنةالماضية"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "سنة مضت"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "اختيار"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "نعم"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "لا"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "اختيار"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "مواÙÙ‚"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
@@ -243,45 +248,45 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "الغاء"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -313,140 +318,149 @@ msgstr "مشارك"
msgid "Share"
msgstr "شارك"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "خطأ"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Øصل خطأ عند عملية المشاركة"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Øصل خطأ عند عملية إزالة المشاركة"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Øصل خطأ عند عملية إعادة تعيين Ø§Ù„ØªØµØ±ÙŠØ Ø¨Ø§Ù„ØªÙˆØµÙ„"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "شورك معك ومع المجموعة {group} من قبل {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "شورك معك من قبل {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "شارك الرابط"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Øماية كلمة السر"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "كلمة المرور"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Ø§Ø³Ù…Ø Ø¨Ø§Ù„Ø±Ùع للعامة"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "ارسل الرابط بالبريد الى صديق"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "أرسل"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "تعيين تاريخ إنتهاء الصلاØية"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "تاريخ إنتهاء الصلاØية"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "مشاركة عبر البريد الإلكتروني:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "لم يتم العثور على أي شخص"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "مجموعة"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "لا ÙŠØ³Ù…Ø Ø¨Ø¹Ù…Ù„ÙŠØ© إعادة المشاركة"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "شورك ÙÙŠ {item} مع {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "إلغاء مشاركة"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "التØرير مسموØ"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "ضبط الوصول"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "إنشاء"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "تØديث"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "ØØ°Ù"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "مشاركة"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Ù…Øمي بكلمة السر"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Øصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاØية"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Øصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاØية"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "جاري الارسال ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "تم ارسال البريد الالكتروني"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "تØذير"
@@ -478,18 +492,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "Øصل خطأ ÙÙŠ عملية التØديث, يرجى ارسال تقرير بهذه المشكلة الى <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "تم التØديث Ø¨Ù†Ø¬Ø§Ø , يتم اعادة توجيهك الان الى Owncloud"
@@ -690,6 +705,10 @@ msgstr "لمزيد من المعلومات عن كيÙية إعداد خادمك
msgid "Create an <strong>admin account</strong>"
msgstr "أض٠</strong>مستخدم رئيسي <strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "كلمة المرور"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -815,8 +834,27 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "جاري تØديث Owncloud الى اصدار %s , قد يستغرق هذا بعض الوقت."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 7ce60c4f4bbe2c1d466c839494c7d03de18d26bc..d7ac06e6b30060553e54dcafb2ca63b9836e6d5c 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr "Ùشل ÙÙŠ نقل المل٠%s - يوجد مل٠بنÙس هذا ال
msgid "Could not move %s"
msgstr "Ùشل ÙÙŠ نقل %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "اسم المل٠لا يجوز أن يكون Ùارغا"
@@ -38,18 +38,18 @@ msgstr "اسم المل٠لا يجوز أن يكون Ùارغا"
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "اسم غير صØÙŠØ , الرموز '\\', '/', '<', '>', ':', '\"', '|', '?' Ùˆ \"*\" غير Ù…Ø³Ù…ÙˆØ Ø§Ø³ØªØ®Ø¯Ø§Ù…Ù‡Ø§"
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -125,44 +125,48 @@ msgstr "المجلد المؤقت غير موجود"
msgid "Failed to write to disk"
msgstr "خطأ ÙÙŠ الكتابة على القرص الصلب"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "لا يوجد مساØØ© تخزينية كاÙية"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "*Ùشلت علمية الرÙع. تعذر إيجاد المل٠الذي تم رÙعه.\n*Ùشلت علمية التØميل. تعذر إيجاد المل٠الذي تم تØميله."
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Ùشلت عملية الرÙع. تعذر الØصول على معلومات الملÙ."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "مسار غير صØÙŠØ."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "الملÙات"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "تعذر رÙع المل٠{filename} إما لأنه مجلد أو لان Øجم المل٠0 بايت"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "تم إلغاء عملية رÙع الملÙات ."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "تعذر الØصول على نتيجة من الخادم"
@@ -175,77 +179,77 @@ msgstr "عملية رÙع الملÙات قيد التنÙيذ. اغلاق ال
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} موجود مسبقا"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "شارك"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Øذ٠بشكل دائم"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "إعادة تسميه"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "جاري تجهيز عملية التØميل. قد تستغرق بعض الوقت اذا كان Øجم الملÙات كبير."
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "قيد الانتظار"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Øدث خطأ أثناء نقل الملÙ"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "خطأ"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "اسم"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Øجم"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "معدل"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "لا يوجد مجلدات %n"
@@ -255,7 +259,7 @@ msgstr[3] "عدد قليل من مجلدات %n"
msgstr[4] "عدد كبير من مجلدات %n"
msgstr[5] "مجلدات %n"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "لا يوجد ملÙات %n"
@@ -265,7 +269,7 @@ msgstr[3] "قليل من ملÙات %n"
msgstr[4] "الكثير من ملÙات %n"
msgstr[5] " ملÙات %n"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "لا يوجد ملÙات %n لتØميلها"
@@ -275,32 +279,32 @@ msgstr[3] "يتم تØميل عدد قليل من ملÙات %n"
msgstr[4] "يتم تØميل عدد كبير من ملÙات %n"
msgstr[5] "يتم تØميل ملÙات %n"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "مساØتك التخزينية ممتلئة, لا يمكم تØديث ملÙاتك أو مزامنتها بعد الآن !"
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "مساØتك التخزينية امتلأت تقريبا "
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "تم تمكين تشÙير البرامج لكن لم يتم تهيئة المÙØ§ØªÙŠØ Ù„Ø°Ø§ يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى."
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "المÙØªØ§Ø Ø§Ù„Ø®Ø§Øµ بتشÙير التطبيقات غير صالØ. يرجى تØديث كلمة السر الخاصة بالمÙØªØ§Ø Ø§Ù„Ø®Ø§Øµ من الإعدادت الشخصية Øتى تتمكن من الوصول للملÙات المشÙرة."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -310,12 +314,12 @@ msgstr "تم تعطيل التشÙير لكن ملÙاتك لا تزال مشÙ
msgid "{dirs} and {files}"
msgstr "{dirs} Ùˆ {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s لا يمكن إعادة تسميته. "
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -352,68 +356,75 @@ msgstr "الØد الأقصى Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¨Ù‡ لملÙات ZIP"
msgid "Save"
msgstr "ØÙظ"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "استخدم هذا العنوان لـ <a href=\"%s\" target=\"_blank\">الدخول الى ملÙاتك عن طريق WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "جديد"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "ملÙ"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "مجلد جديد"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "مجلد"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "من رابط"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Øذ٠الملÙات"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "إلغاء رÙع الملÙات"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "لا يوجد شيء هنا. إرÙع بعض الملÙات!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "تØميل"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "إلغاء"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Øجم الترÙيع أعلى من المسموØ"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Øجم الملÙات التي تريد ترÙيعها أعلى من Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¹Ù„Ù‰ الخادم."
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "يرجى الانتظار , جاري ÙØص الملÙات ."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "الÙØص الØالي"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
index 570282efb9a6fe93e3b48b39968d463963059e31..f33ff9554d15824d2d75e8c4ab05d70356718d41 100644
--- a/l10n/ar/files_encryption.po
+++ b/l10n/ar/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-20 01:55-0400\n"
-"PO-Revision-Date: 2014-03-19 06:00+0000\n"
-"Last-Translator: m.shehab <shehab.mahmood@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -78,9 +78,9 @@ msgstr "لا يمكن ÙÙƒ التشÙير من هذا الملÙ, من المم
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "خطا غير معرو٠يرجى التاكد من اعدادات نظامك او تواصل مع المدير."
+msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -93,7 +93,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "يرجى التاكد من ان اصدار PHP 5.3.3 او اØدث , مثبت Ùˆ التاكد من ان OpenSSL Ù…Ùعل Ùˆ مهيئ بشكل صØÙŠØ. Øتى الان برنامج التتشÙير تم تعطيلة."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "المستخدمين التاليين لم يتم تعيين لهم التشÙيير:"
@@ -113,91 +113,91 @@ msgstr "انتقل مباشرة الى "
msgid "personal settings"
msgstr "اعدادات شخصية"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "التشÙير"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "تÙعيل استعادة المÙØªØ§Ø (سو٠يمكنك من استعادة ملÙات المستخدمين ÙÙŠ Øال Ùقدان كلمة المرور):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "استعادة كلمة مرور المÙتاØ"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "كرر كلمة المرور لـ استعادة المÙتاØ"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Ù…Ùعلة"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "معطلة"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "تعديل كلمة المرور استعادة المÙتاØ:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "كلمة المرور القديمة لـ استعامة المÙتاØ"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "تعيين كلمة مرور جديدة لـ استعادة المÙتاØ"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "كرر كلمة المرور لـ استعادة المÙØªØ§Ø Ù…Ù† جديد"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "عدل كلمة السر"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "كلمة مرور Ù…ÙتاØÙƒ الخاص لا تتطابق مع كلمة المرور الخاصة الدخول:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "تعيين كلمة المرور القديمة لـ المÙØªØ§Ø Ø§Ù„Ø®Ø§Øµ الى كلمة المرور الخاصة بالدخول الØالية."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "اذا كنت لاتتذكر كلمة السر تستطيع ان تطلب من المدير ان يستعيد ملÙاتك."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "كلمة المرور القديمة الخاصة بالدخول"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "كلمة المرور الØالية الخاصة بالدخول"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "تØديث كلمة المرور لـ المÙØªØ§Ø Ø§Ù„Ø®Ø§Øµ"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "تÙعيل استعادة كلمة المرور:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "تÙعيل هذا الخيار يمكنك من اعادة الوصول الى ملÙاتك المشÙرة عند Ùقدان كلمة المرور"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "اعدادات مل٠الاستعادة تم تØديثه"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "تعذر تØديث مل٠الاستعادة"
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index f37fb88d7fb6d974da1b808f51e3328c22931e57..98a7a913d76399be035a8a0bfc088eac53b3fd82 100644
--- a/l10n/ar/files_external.po
+++ b/l10n/ar/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "عنوان الموقع"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "المضيÙ"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,6 +166,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "عنوان الموقع"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -198,29 +202,29 @@ msgstr ""
msgid "Saved"
msgstr "ØÙظ"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index df94e842cb925d17b0f5e80ef875008405edf900..1b8a026172731b703f2153c48178072332ce7a89 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "مشاركة من طر٠{owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "هذه المشاركة Ù…Øمية بكلمة مرور"
@@ -34,6 +58,14 @@ msgstr "كلمة المرور خاطئة. Øاول مرة أخرى"
msgid "Password"
msgstr "كلمة المرور"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "عذرا، يبدو أن هذا الرابط لم يعد يعمل."
@@ -62,11 +94,11 @@ msgstr "لمزيد من المعلومات، يرجى سؤال الشخص الذ
msgid "Download"
msgstr "تØميل"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "تØميل %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "رابط مباشر"
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index 7576d350df4744be6b363bd6f1582c33739ef088..193bc9338bddef7a5cab1072b8d8f62fddcba92f 100644
--- a/l10n/ar/files_trashbin.po
+++ b/l10n/ar/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: Abderraouf Mehdi Bouhali <armbouhali@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -28,38 +28,34 @@ msgstr "تعذّر ØØ°Ù%s بشكل دائم"
msgid "Couldn't restore %s"
msgstr "تعذّر استرجاع %s "
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Øذ٠الملÙات"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "استعيد"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "خطأ"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "الملÙات المØذوÙÙ‡"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "تمت الاستعادة"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "لا يوجد شيء هنا. سلة المهملات خاليه."
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "اسم"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "استعيد"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "تم الØØ°Ù"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "إلغاء"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 47184ab8dc49517ee63bb5d71d7a0cb84ab2c6e3..5f15b25a8dce9a5ddaff527ea5d61f18d776f202 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -78,23 +78,23 @@ msgstr "الصورة غير صالØØ©"
msgid "web services under your control"
msgstr "خدمات الشبكة تØت سيطرتك"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "تØميل ملÙات ZIP متوقÙ"
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "الملÙات بØاجة الى ان يتم تØميلها واØد تلو الاخر"
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "العودة الى الملÙات"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "الملÙات المØددة كبيرة جدا ليتم ضغطها ÙÙŠ مل٠zip"
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -280,127 +280,138 @@ msgstr "اعداد اسم مستخدم للمدير"
msgid "Set an admin password."
msgstr "اعداد كلمة مرور للمدير"
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "اعدادات خادمك غير صØÙŠØØ© بشكل ØªØ³Ù…Ø Ù„Ùƒ بمزامنة ملÙاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة"
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "الرجاء التØقق من <a href='%s'>دليل التنصيب</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s شارك »%s« معك"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "تعذر العثور على المجلد \"%s\""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 60a5c421f71683fa66d4d2d85d289b32ec35953c..c04f23e51a8f35c14137c0bebdb57a5738be808d 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -50,15 +50,15 @@ msgstr "تم ارسال البريد الالكتروني"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "وضعية الإرسال"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "التشÙير"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "أسلوب التطابق"
@@ -101,6 +101,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "تم ØÙظ البريد الإلكتروني"
@@ -117,6 +127,16 @@ msgstr "Ùشل إزالة المجموعة"
msgid "Unable to delete user"
msgstr "Ùشل إزالة المستخدم"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "تم تغيير اللغة"
@@ -172,7 +192,7 @@ msgstr "Back-end لا يدعم تغيير كلمة المرور, لاكن Ù…Ùت
msgid "Unable to change password"
msgstr "لا يمكن تغيير كلمة المرور"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "جاري الارسال ..."
@@ -228,34 +248,42 @@ msgstr "Øدث"
msgid "Updated"
msgstr "تم التØديث بنجاØ"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "اختر صورة المل٠الشخصي "
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "كلمة السر ضعيÙØ© جدا"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "كلمة السر ضعيÙØ©"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "كلمة السر جيدة"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "كلمة السر قوية"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "ÙÙƒ تشÙير الملÙات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "تم الØØ°Ù"
@@ -268,8 +296,8 @@ msgstr "تراجع"
msgid "Unable to remove user"
msgstr "تعذر Øذ٠المستخدم"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "مجموعات"
@@ -301,7 +329,7 @@ msgstr "يجب ادخال كلمة مرور صØÙŠØØ©"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "تØذير: المجلد الرئيسي لـ المستخدم \"{user}\" موجود مسبقا"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__language_name__"
@@ -369,7 +397,7 @@ msgid ""
"root."
msgstr "مجلد data Ùˆ ملÙاتك يمكن الوصول لها عن طريق الانترنت. مل٠.htaccess لا يمكن تشغيلة. Ù†ØÙ† Ù†Ù‚ØªØ±Ø Ø¨Ø§ØµØ±Ø§Ø± ان تعيد اعداد خادمك لمنع الدخول الى بياناتك عن طريق الانترنت او بالامكان ان تنقل مجلد data خارج document root بشكل مؤقت. "
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "تØذير ÙÙŠ التنصيب"
@@ -384,53 +412,65 @@ msgstr "اعدادات خادمك غير صØÙŠØØ© بشكل ØªØ³Ù…Ø Ù„Ùƒ بم
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "يرجى التØقق <a href=\"%s\">دليل التثبيت</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "الموديل 'fileinfo' Ù…Ùقود"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "موديل 'fileinfo' الخاص بالـPHP Ù…Ùقود . نوصي بتÙعيل هذا الموديل للØصول على Ø£Ùضل النتائج مع خاصية التØقق "
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "اصدار PHP الخاص بك قديم"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "اصدار PHP الخاص بك قديم. Ù†ØÙ† Ù†Ù‚ØªØ±Ø Ù„Ùƒ باصرار ان يتم ترقية الاصدار الى 5.3.8 او اØدث بسبب ان الاصدارات القديمة معروÙØ© انها مهمشة. من الممكن ان التنزيل قد لا يتم بصورة صØÙŠØØ©."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "اللغه لا تعمل"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "لا يمكن تعيين لغة النظام الى اØد اللغات التي تدعم UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "هذا يعني انه من الممكن ان يكون هناك مشكلة ÙÙŠ بعض الاØر٠ÙÙŠ اسم الملÙ."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Ù†ØÙ† باصرار Ù†Ù‚ØªØ±Ø Ø§Ù† تثبت الØزم المطلوبة ÙÙŠ نظامك لدعم اØد هذة اللغات: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "الاتصال بالانترنت لا يعمل"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -439,198 +479,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "هذا الخادم لا يوجد لدية اتصال انترنت. هذا يعني ان بعض الميزات مثل mounting التخزين الخارجي , تنبيهات عن التØديثات او تنزيلات برامج الطر٠الثالث3 لا تعمل. الدخول للملÙات البعيدة Ùˆ ارسال تنبيهات البريد الالكتروني ممكن ان لا تعمل ايضا. Ù†ØÙ† Ù†Ù‚ØªØ±Ø Ø¨ØªÙعيل اتصال الانترنت لهذا الخادم لتتمكن من الاستÙادة من كل الميزات"
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "مجدول"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "قم بتنÙيذ مهمة واØدة مع كل صÙØØ© تم تØميلها"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "المل٠cron.php تم تسجيله ÙÙ‰ خدمه webcron لاستدعاء المل٠cron.php كل 15 دقيقه"
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "استخدم نظام خدمة cron لـ استدعاء مل٠cron.php كل 15 دقيقة "
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "مشاركة"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ø¨Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ© عن طريق الAPI "
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„ØªØ·Ø¨ÙŠÙ‚Ø§Øª بالمشاركة عن طريق الAPI"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ø¨Ø§Ù„Ø¹Ù†Ø§ÙˆÙŠÙ†"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ¹Ù…Ù„ÙŠÙ† بمشاركة البنود للعموم عن طريق الروابط "
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ø¨Ø§Ù„Ø±Ùع للعامة "
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† بتÙعيل الرÙع للاخرين من خلال مجلد المشاركة العام "
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ¹Ù…Ù„ÙŠÙ† بمشاركة البنود للعموم عن طريق الروابط "
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ø¨Ø¥Ø¹Ø§Ø¯Ø© المشاركة "
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† باعادة مشاركة الملÙات التي تم مشاركتها معهم"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ¹Ù…Ù„ÙŠÙ† بإعادة المشاركة مع أي Ø£Øد "
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ¹Ù…ÙŠÙ†Ù Ù„Ø¥Ø¹Ø§Ø¯Ø© المشاركة Ùقط مع المستعملين ÙÙŠ مجموعاتهم"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ø¨ØªÙ†Ø¨ÙŠÙ‡Ø§Øª البريد الالكتروني."
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Øماية"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Ùرض HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "اجبار العميل للاتصال بـ %s عن طريق اتصال مشÙر"
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "يرجى الاتصال بـ %s عن طريق HTTPS لتÙعيل او تعطيل SSL enforcement."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "خادم البريد الالكتروني"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "عنوان الخادم"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "المنÙØ°"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "سجل"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "مستوى السجل"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "المزيد"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "أقل"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "إصدار"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -783,29 +831,33 @@ msgstr "اللغة"
msgid "Help translate"
msgstr "ساعد ÙÙŠ الترجمه"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "استخدم هذا العنوان لـ <a href=\"%s\" target=\"_blank\">الدخول الى ملÙاتك عن طريق WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "البرنامج المشÙر لم يعد Ù…Ùعل, يرجى ÙÙƒ التشÙير عن كل ملÙاتك"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "كلمه سر الدخول"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "ÙÙƒ تشÙير جميع الملÙات "
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "اسم الدخول"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index e80c82e269f19afc7bca876d4e34bbf99e399efd..a8a31e2e1b5c932c054b96b908f5a3d40ad0c91c 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -87,6 +91,18 @@ msgstr "نجاØ"
msgid "Error"
msgstr "خطأ"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -127,7 +143,7 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -138,7 +154,7 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -149,14 +165,30 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "ØÙظ"
@@ -229,10 +261,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "المضيÙ"
@@ -296,6 +341,14 @@ msgstr "رجوع"
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "تعديلات متقدمه"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ast/core.po b/l10n/ast/core.po
index ed5c3b53966a8e0b1bf8857a64f10fa58c10d13d..60852127ed0be0d271cebb7cc519428038282d97 100644
--- a/l10n/ast/core.po
+++ b/l10n/ast/core.po
@@ -3,14 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# dixebra <davidlopezcastanon@gmail.com>, 2014
+# Iñigo Varela <ivarela@softastur.org>, 2014
+# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
-"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,34 +21,39 @@ msgstr ""
"Language: ast\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
-msgstr ""
+msgstr "Nun pudo dunviase'l corréu a los usuarios siguientes: %s"
#: ajax/update.php:10
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Activáu el mou de mantenimientu"
#: ajax/update.php:13
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Apagáu el mou de mantenimientu"
#: ajax/update.php:16
msgid "Updated database"
msgstr "Base de datos anovada"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "Nun s'especificó nenguna imaxe o ficheru"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "Triba de ficheru desconocida"
#: avatar/controller.php:85
msgid "Invalid image"
@@ -53,213 +61,213 @@ msgstr "Imaxe inválida"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "Nengún perfil d'imaxe temporal disponible, intentalo de nueves"
#: avatar/controller.php:135
msgid "No crop data provided"
-msgstr ""
+msgstr "Nun s'apurrió'l retayu de datos"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Domingu"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Llunes"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Martes"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Miércoles"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Xueves"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Vienres"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sábadu"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Xineru"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Febreru"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marzu"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mayu"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Xunu"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Xunetu"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Agostu"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Setiembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Ochobre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Payares"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Avientu"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Axustes"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Guardando..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "fai segundos"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "fai %n minutu"
msgstr[1] "fai %n minutos"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "fai %n hora"
msgstr[1] "fai %n hores"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "güei"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "ayeri"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "fai %n dÃa"
msgstr[1] "fai %n dÃes"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "mes caberu"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "fai %n mes"
msgstr[1] "fai %n meses"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "añu caberu"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "fai años"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Esbillar"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "SÃ"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Esbillar"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Fallu cargando'l ficheru de plantÃa d'escoyeta: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
-msgstr ""
+msgstr "Aceutar"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
-msgstr ""
+msgstr "Fallu cargando'l mensaxe de la plantÃa: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{count} conflictu de ficheru"
+msgstr[1] "{count} conflictos de ficheru "
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
-msgstr ""
+msgstr "Conflictu nun ficheru"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
-msgstr ""
+msgstr "Ficheros nuevos"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
-msgstr ""
+msgstr "Ficheros qu'esisten yá"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "¿Qué ficheros quies caltener?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
-msgstr ""
+msgstr "Si seleiciones dames versiones, el ficheru copiáu tendrá un númberu amestáu al so nome"
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Encaboxar"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
-msgstr ""
+msgstr "(esbillao too)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
-msgstr ""
+msgstr "(esbillaos {count})"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -291,146 +299,155 @@ msgstr "CompartÃu"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Fallu"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
-msgstr ""
+msgstr "Fallu mientres la compartición"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
-msgstr ""
+msgstr "Fallu mientres se dexaba de compartir"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
-msgstr ""
+msgstr "Fallu mientres camudaben los permisos"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "CompartÃu contigo y col grupu {group} por {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "CompartÃu contigo por {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Compartir enllaz"
-#: js/share.js:223
-msgid "Password protect"
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Contraseña"
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:248
+msgid "Password protect"
+msgstr "Protexer con contraseña"
+
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr "Escueyi una contraseña pal enllaz públicu"
+
+#: js/share.js:256
msgid "Allow Public Upload"
-msgstr ""
+msgstr "Permitir xuba pública"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
-msgstr ""
+msgstr "Enlláz de corréu electrónicu a la persona"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Unviar"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
-msgstr ""
+msgstr "Afitar la data de caducidá"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
-msgstr ""
+msgstr "Data de caducidá"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
-msgstr ""
+msgstr "Compartir vÃa corréu electrónicu:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
-msgstr ""
+msgstr "Nun s'atoparon persones"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "grupu"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Recompartir nun ta permitÃu"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "CompartÃu en {item} con {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Dexar de compartir"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "notificar per corréu"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "pue editar"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "control d'accesu"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "crear"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "xubir"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "desaniciar"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "compartir"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Contraseña protexida"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Fallu desafitando la data de caducidá"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
-msgstr ""
+msgstr "Fallu afitando la fecha de caducidá"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
-msgstr ""
+msgstr "Unviando ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Corréu unviáu"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Avisu"
#: js/tags.js:4
msgid "The object type is not specified."
-msgstr ""
+msgstr "El tipu d'oxetu nun ta especificáu."
#: js/tags.js:13
msgid "Enter new"
@@ -456,25 +473,26 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
-msgid "Please reload the page."
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
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>."
+#: js/update.js:43
+msgid "Please reload the page."
+msgstr "Por favor, recarga la páxina"
+
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "L'anovamientu fÃzose con ésitu. Redirixiendo agora al to ownCloud."
#: lostpassword/controller.php:70
#, php-format
msgid "%s password reset"
-msgstr ""
+msgstr "%s restablecer contraseña"
#: lostpassword/controller.php:72
msgid ""
@@ -484,22 +502,22 @@ msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}"
#: lostpassword/templates/lostpassword.php: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 ""
+msgstr "Dunviósete al to corréu l'enllaz pa reaniciar la to contraseña.<br>Si nun lu recibes dientro de dellos minutos, comprueba les tos carpetes de corréu puxarra.<br>Sinón, pues entrugar al to alministrador llocal."
#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "¡Petición fallida!<br>¿Asegurástite qué'l to nome d'usuariu/corréu tean bien?"
#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
-msgstr ""
+msgstr "Vas recibir un enllaz vÃa Corréu-e pa restablecer la to contraseña"
#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
#: templates/login.php:32
@@ -512,11 +530,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 "Los tos ficheros tan cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru que facer, por favor contauta col to alministrador enantes de siguir. ¿De xuru quies continuar?"
#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "SÃ, quiero reaniciar daveres la mio contraseña agora"
#: lostpassword/templates/lostpassword.php:30
msgid "Reset"
@@ -524,11 +542,11 @@ msgstr "Reaniciar"
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
-msgstr ""
+msgstr "Restablecióse la contraseña"
#: lostpassword/templates/resetpassword.php:5
msgid "To login page"
-msgstr ""
+msgstr "Aniciar sesión na páxina"
#: lostpassword/templates/resetpassword.php:8
msgid "New password"
@@ -536,14 +554,14 @@ msgstr "Contraseña nueva"
#: lostpassword/templates/resetpassword.php:11
msgid "Reset password"
-msgstr ""
+msgstr "Restablecer contraseña"
#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
-msgstr ""
+msgstr "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!"
#: setup/controller.php:144
msgid ""
@@ -560,15 +578,15 @@ msgstr "Usuarios"
#: strings.php:7 templates/layout.user.php:116
msgid "Apps"
-msgstr ""
+msgstr "Aplicaciones"
#: strings.php:8
msgid "Admin"
-msgstr ""
+msgstr "Alministrador"
#: strings.php:9
msgid "Help"
-msgstr ""
+msgstr "Ayuda"
#: tags/controller.php:22
msgid "Error loading tags"
@@ -600,11 +618,11 @@ msgstr ""
#: templates/403.php:12
msgid "Access forbidden"
-msgstr ""
+msgstr "Accesu denegáu"
#: templates/404.php:15
msgid "Cloud not found"
-msgstr ""
+msgstr "Ñube non atopada"
#: templates/altmail.php:2
#, php-format
@@ -614,7 +632,7 @@ msgid ""
"just letting you know that %s shared %s with you.\n"
"View it: %s\n"
"\n"
-msgstr ""
+msgstr "Hola, ¿qué hai?\n\nnamái déxanos dicite que %s compartió %s contigo.\nVelu: %s\n\n"
#: templates/altmail.php:4 templates/mail.php:17
#, php-format
@@ -632,41 +650,45 @@ msgstr "Avisu de seguridá"
#: templates/installation.php:26
msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "La to versión de PHP ye vulnerable al ataque NULL Byte (CVE-2006-7243)"
#: templates/installation.php:27
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Por favor, anova la to instalación de PHP pa usar %s de mou seguru."
#: templates/installation.php:33
msgid ""
"No secure random number generator is available, please enable the PHP "
"OpenSSL extension."
-msgstr ""
+msgstr "Nun ta disponible'l xenerador de númberos al debalu, por favor activa la estensión PHP OpenSSL."
#: templates/installation.php:34
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
-msgstr ""
+msgstr "Ensin un xenerador de númberos al debalu, un atacante podrÃa aldovinar los tokens pa restablecer la contraseña y tomar el control de la cuenta."
#: templates/installation.php:40
msgid ""
"Your data directory and files are probably accessible from the internet "
"because the .htaccess file does not work."
-msgstr ""
+msgstr "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula."
#: templates/installation.php:42
#, php-format
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Pa informase de cómo configurar el so sirvidor, por favor güeya la <a href=\"%s\" target=\"_blank\">documentación</a>."
#: templates/installation.php:48
msgid "Create an <strong>admin account</strong>"
-msgstr ""
+msgstr "Crea una <strong>cuenta d'alministrador</strong>"
+
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Contraseña"
#: templates/installation.php:70
msgid "Storage & database"
@@ -674,11 +696,11 @@ msgstr ""
#: templates/installation.php:77
msgid "Data folder"
-msgstr ""
+msgstr "Carpeta de datos"
#: templates/installation.php:90
msgid "Configure the database"
-msgstr ""
+msgstr "Configura la base de datos"
#: templates/installation.php:94
msgid "will be used"
@@ -686,27 +708,27 @@ msgstr "usaráse"
#: templates/installation.php:109
msgid "Database user"
-msgstr ""
+msgstr "Usuariu de la base de datos"
#: templates/installation.php:118
msgid "Database password"
-msgstr ""
+msgstr "Contraseña de la base de datos"
#: templates/installation.php:123
msgid "Database name"
-msgstr ""
+msgstr "Nome de la base de datos"
#: templates/installation.php:132
msgid "Database tablespace"
-msgstr ""
+msgstr "Espaciu de tables de la base de datos"
#: templates/installation.php:140
msgid "Database host"
-msgstr ""
+msgstr "Agospiador de la base de datos"
#: templates/installation.php:150
msgid "Finish setup"
-msgstr ""
+msgstr "Finar la configuración "
#: templates/installation.php:150
msgid "Finishing …"
@@ -722,7 +744,7 @@ msgstr ""
#: templates/layout.user.php:44
#, php-format
msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "Ta disponible %s. Consigui más información en como anovar·"
#: templates/layout.user.php:74 templates/singleuser.user.php:8
msgid "Log out"
@@ -730,17 +752,17 @@ msgstr "Zarrar sesión"
#: templates/login.php:9
msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "¡Aniciu de sesión automáticu refugáu!"
#: templates/login.php:10
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
-msgstr ""
+msgstr "¡Si nun camudó la so contraseña últimamente, la so cuenta pue tar comprometida!"
#: templates/login.php:12
msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "Por favor, camude la so contraseña p'asegurar la so cuenta de nueves"
#: templates/login.php:17
msgid "Server side authentication failed!"
@@ -748,7 +770,7 @@ msgstr ""
#: templates/login.php:18
msgid "Please contact your administrator."
-msgstr ""
+msgstr "Por favor, contauta col to alministrador"
#: templates/login.php:46
msgid "Lost your password?"
@@ -756,7 +778,7 @@ msgstr "¿Escaeciesti la to contraseña?"
#: templates/login.php:51
msgid "remember"
-msgstr ""
+msgstr "recordar"
#: templates/login.php:54
msgid "Log in"
@@ -793,7 +815,26 @@ msgstr "Gracies pola to paciencia."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/ast/files.po b/l10n/ast/files.po
index 6c5b2620c0af1ad8069fd342962af4c3a5efe48f..7fa70f0d12fbbc139c30b77535bb7f58bb570928 100644
--- a/l10n/ast/files.po
+++ b/l10n/ast/files.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
+# tebanpb <peruyero@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-27 07:21+0000\n"
+"Last-Translator: Tornes Llume <l.lumex03.tornes@gmail.com>\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,73 +22,73 @@ msgstr ""
#: ajax/move.php:15
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Nun pudo movese %s - Yá existe un ficheru con esi nome."
#: ajax/move.php:25 ajax/move.php:28
#, php-format
msgid "Could not move %s"
-msgstr ""
+msgstr "Nun pudo movese %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "El nome de ficheru nun pue quedar baleru."
#: ajax/newfile.php:63
#, php-format
msgid "\"%s\" is an invalid file name."
-msgstr ""
+msgstr "\"%s\" ye un nome de ficheru inválidu."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nome inválidu, los caráuteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" nun tán permitÃos."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "La carpeta oxetivu movióse o desanicióse."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
"name."
-msgstr ""
+msgstr "El nome %s yá ta n'usu na carpeta %s. Por favor, escueyi un nome diferente."
#: ajax/newfile.php:97
msgid "Not a valid source"
-msgstr ""
+msgstr "Nun ye una fonte válida"
#: ajax/newfile.php:102
msgid ""
"Server is not allowed to open URLs, please check the server configuration"
-msgstr ""
+msgstr "Nun se-y permite al sirvidor abrir URLs, por favor comprueba la configuración del sirvidor"
#: ajax/newfile.php:118
#, php-format
msgid "Error while downloading %s to %s"
-msgstr ""
+msgstr "Fallu cuando se descargaba %s a %s"
#: ajax/newfile.php:146
msgid "Error when creating the file"
-msgstr ""
+msgstr "Fallu cuando se creaba'l ficheru"
#: ajax/newfolder.php:22
msgid "Folder name cannot be empty."
-msgstr ""
+msgstr "El nome la carpeta nun pue tar baleru."
#: ajax/newfolder.php:66
msgid "Error when creating the folder"
-msgstr ""
+msgstr "Fallu cuando se creaba la carpeta"
#: ajax/upload.php:19 ajax/upload.php:57
msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Nun pue afitase la carpeta de xubida."
#: ajax/upload.php:33
msgid "Invalid Token"
-msgstr ""
+msgstr "Token inválidu"
#: ajax/upload.php:75
msgid "No file was uploaded. Unknown error"
@@ -99,7 +101,7 @@ msgstr "Nun hai dengún fallu, el ficheru xubióse ensin problemes"
#: ajax/upload.php:83
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "El ficheru xubÃu perpasa la direutiva \"upload_max_filesize\" del ficheru php.ini"
#: ajax/upload.php:85
msgid ""
@@ -123,283 +125,294 @@ msgstr "Falta una carpeta temporal"
msgid "Failed to write to disk"
msgstr "Fallu al escribir al discu"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Nun hai abondu espaciu disponible"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
-msgstr ""
+msgstr "Xubida fallÃa. Nun se pudo atopar el ficheru xubÃu."
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
-msgstr ""
+msgstr "Falló la xubida. Nun se pudo obtener la información del ficheru."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
-msgstr ""
+msgstr "Direutoriu non válidu."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Ficheros"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Tolos ficheros"
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Nun se pudo xubir {filename}, paez que ye un directoriu o tien 0 bytes"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "El tamañu de ficheru total {size1} perpasa'l llÃmite de xuba {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "Nun hai abondu espaciu llibre, tas xubiendo {size1} pero namái falta {size2}"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
-msgstr ""
+msgstr "Xuba encaboxada."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
-msgstr ""
+msgstr "Nun se pudo obtener el resultáu del servidor."
#: js/file-upload.js:490
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "La xuba del ficheru ta en progresu. Si dexes agora la páxina, la xuba nun s'encaboxará."
#: js/file-upload.js:555
msgid "URL cannot be empty"
-msgstr ""
+msgstr "La URL nun pue tar balera"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1170
msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} yá existe"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
-msgstr ""
+msgstr "Nun pudo crease'l ficheru"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
-msgstr ""
+msgstr "Nun pudo crease la carpeta"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Compartir"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
-msgstr ""
+msgstr "Desaniciar dafechu"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Renomar"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
-msgstr ""
+msgstr "Ta preparándose la to descarga. Esto podrÃa llevar dalgún tiempu si los ficheros son grandes."
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:596 js/filelist.js:1665
msgid "Pending"
-msgstr ""
+msgstr "Pendiente"
-#: js/filelist.js:916
+#: js/filelist.js:1121
msgid "Error moving file."
-msgstr ""
+msgstr "Fallu moviendo'l ficheru."
-#: js/filelist.js:924
+#: js/filelist.js:1129
msgid "Error moving file"
-msgstr ""
+msgstr "Fallu moviendo'l ficheru"
-#: js/filelist.js:924
+#: js/filelist.js:1129
msgid "Error"
msgstr "Fallu"
-#: js/filelist.js:988
+#: js/filelist.js:1207
msgid "Could not rename file"
-msgstr ""
+msgstr "Nun pudo renomase'l ficheru"
-#: js/filelist.js:1122
+#: js/filelist.js:1328
msgid "Error deleting file."
-msgstr ""
+msgstr "Fallu desaniciando'l ficheru."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1431 templates/list.php:62
msgid "Name"
msgstr "Nome"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1432 templates/list.php:75
msgid "Size"
msgstr "Tamañu"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1433 templates/list.php:78
msgid "Modified"
-msgstr ""
+msgstr "Modificáu"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1443 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n carpeta"
+msgstr[1] "%n carpetes"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1449 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n ficheru"
+msgstr[1] "%n ficheros"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1573 js/filelist.js:1612
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Xubiendo %n ficheru"
+msgstr[1] "Xubiendo %n ficheros"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
-msgstr ""
+msgstr "\"{name}\" ye un nome de ficheru inválidu."
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "L'almacenamientu ta completu, ¡yá nun se pueden anovar o sincronizar ficheros!"
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "L'almacenamientu ta casi completu ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
-msgstr ""
+msgstr "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y anÃciala de nueves"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
-msgstr ""
+msgstr "Clave privada non válida pa Encryption. Por favor, anova la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
-msgstr ""
+msgstr "Deshabilitose'l cifráu pero los tos ficheros tovÃa tan cifraos. Por favor, vete a los axustes personales pa descrifrar los tos ficheros."
#: js/filesummary.js:182
msgid "{dirs} and {files}"
-msgstr ""
+msgstr "{dirs} y {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
-msgstr ""
+msgstr "Nun se puede renomar %s "
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
-msgstr ""
+msgstr "Xuba (máx. %s)"
#: templates/admin.php:4
msgid "File handling"
-msgstr ""
+msgstr "Alministración de ficheros"
#: templates/admin.php:6
msgid "Maximum upload size"
-msgstr ""
+msgstr "Tamañu máximu de xubida"
#: templates/admin.php:9
msgid "max. possible: "
-msgstr ""
+msgstr "máx. posible:"
#: templates/admin.php:14
msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Ye necesariu pa descargues multificheru y de carpetes"
#: templates/admin.php:16
msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Activar descarga ZIP"
#: templates/admin.php:19
msgid "0 is unlimited"
-msgstr ""
+msgstr "0 ye illimitao"
#: templates/admin.php:21
msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Tamañu máximu d'entrada pa ficheros ZIP"
#: templates/admin.php:25
msgid "Save"
msgstr "Guardar"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Usa esta direición pa <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a los ficheros a traviés de WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
-msgstr ""
+msgstr "Nuevu"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
-msgstr ""
+msgstr "Ficheru de testu nuevu"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
-msgstr ""
+msgstr "Ficheru de testu"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Nueva carpeta"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Carpeta"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
-msgstr ""
+msgstr "Dende enllaz"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Encaboxar xuba"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
-msgstr ""
+msgstr "Nun tienes permisu pa xubir o crear ficheros equÃ"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
-msgstr ""
+msgstr "Nun hai nada equÃ. ¡Xubi daqué!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Descargar"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Desaniciar"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
-msgstr ""
+msgstr "La xuba ye abondo grande"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
-msgstr ""
+msgstr "Los ficheros que tas intentando xubir perpasen el tamañu máximu pa les xubÃes de ficheros nesti servidor."
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Tan escaniándose los ficheros, espera por favor."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr ""
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr "Anguaño escaneando"
diff --git a/l10n/ast/files_encryption.po b/l10n/ast/files_encryption.po
index d15eae833fcd371c267a3c3f6500e3adaedd83d9..288f37e00d6aaa2a221048dfa726008de65e4c6c 100644
--- a/l10n/ast/files_encryption.po
+++ b/l10n/ast/files_encryption.po
@@ -4,13 +4,14 @@
#
# Translators:
# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
+# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-27 10:52+0000\n"
-"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,46 +21,46 @@ msgstr ""
#: ajax/adminrecovery.php:29
msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Habilitóse la recuperación de ficheros"
#: ajax/adminrecovery.php:34
msgid ""
"Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña."
#: ajax/adminrecovery.php:48
msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Clave de recuperación deshabilitada"
#: ajax/adminrecovery.php:53
msgid ""
"Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!"
#: ajax/changeRecoveryPassword.php:49
msgid "Password successfully changed."
-msgstr "Contraseña camudada esitosamente."
+msgstr "Camudóse la contraseña"
#: ajax/changeRecoveryPassword.php:51
msgid "Could not change the password. Maybe the old password was not correct."
-msgstr "Nun pue camudase la contraseña. Quiciabes la contraseña vieya nun fore correuta."
+msgstr "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta."
#: ajax/updatePrivateKeyPassword.php:52
msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Contraseña de clave privada anovada correchamente."
#: ajax/updatePrivateKeyPassword.php:54
msgid ""
"Could not update the private key password. Maybe the old password was not "
"correct."
-msgstr ""
+msgstr "Nun pudo camudase la contraseña. Pue que la contraseña antigua nun seya correuta."
#: files/error.php:12
msgid ""
"Encryption app not initialized! Maybe the encryption app was re-enabled "
"during your session. Please try to log out and log back in to initialize the"
" encryption app."
-msgstr ""
+msgstr "¡L'aplicación de cifráu nun s'anició! Seique se restableciera mentanto la sesión. Por favor intenta zarrar la sesión y volver a aniciala p'aniciar l'aplicación de cifráu."
#: files/error.php:16
#, php-format
@@ -67,50 +68,50 @@ msgid ""
"Your private key is not valid! Likely your password was changed outside of "
"%s (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 "¡La clave privada nun ye válida! Seique la contraseña se camudase dende fuera de %s (Ex:El to direutoriu corporativu). Pues anovar la contraseña de la clave privada nes tos opciones personales pa recuperar l'accesu a los ficheros."
#: files/error.php:19
msgid ""
"Can not decrypt this file, probably this is a shared file. Please ask the "
"file owner to reshare the file with you."
-msgstr ""
+msgstr "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartÃu. Solicita al propietariu del mesmu que vuelva a compartilu contigo."
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
-msgstr ""
+msgstr "Requisitos incompletos."
#: hooks/hooks.php:65
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úrate de que PHP 5.3.3 o postreru ta instaláu y que la estensión OpenSSL de PHP ta habilitada y configurada correutamente. Pel momentu, l'aplicación de cifráu deshabilitóse."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Los siguientes usuarios nun se configuraron pal cifráu:"
#: js/detect-migration.js:21
msgid "Initial encryption started... This can take some time. Please wait."
-msgstr ""
+msgstr "Cifráu aniciáu..... Esto pue llevar un tiempu. Por favor espera."
#: js/detect-migration.js:25
msgid "Initial encryption running... Please try again later."
-msgstr ""
+msgstr "Cifráu inicial en cursu... Inténtalo dempués."
#: templates/invalid_private_key.php:8
msgid "Go directly to your "
-msgstr ""
+msgstr "Dir direutamente a"
#: templates/invalid_private_key.php:8
msgid "personal settings"
-msgstr "axustes personales"
+msgstr "opciones personales"
#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
@@ -119,19 +120,19 @@ msgstr "Cifráu"
#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
-msgstr ""
+msgstr "Habilitar la clave de recuperación (permite recuperar los ficheros del usuariu en casu de perda de la contraseña);"
#: templates/settings-admin.php:9
msgid "Recovery key password"
-msgstr ""
+msgstr "Contraseña de clave de recuperación"
#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Repeti la contraseña de clave de recuperación"
#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
-msgstr "Habilitáu"
+msgstr "Habilitar"
#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
@@ -139,64 +140,64 @@ msgstr "Deshabilitáu"
#: templates/settings-admin.php:32
msgid "Change recovery key password:"
-msgstr ""
+msgstr "Camudar la contraseña de la clave de recuperación"
#: templates/settings-admin.php:38
msgid "Old Recovery key password"
-msgstr ""
+msgstr "Clave de recuperación vieya"
#: templates/settings-admin.php:45
msgid "New Recovery key password"
-msgstr ""
+msgstr "Clave de recuperación nueva"
#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Repetir la clave de recuperación nueva"
#: templates/settings-admin.php:56
msgid "Change Password"
-msgstr "Camudar conseña"
+msgstr "Camudar contraseña"
#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "La to contraseña de clave privada yá nun concasa cola contraseña d'accesu:"
#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Afitar la contraseña de la to clave privada vieya a la to contraseña actual d'accesu."
#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
-msgstr "Si nun recuerdes la to contraseña vieya pues entrugar al to alministrador pa recuperar los tos ficheros."
+msgstr "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros."
#: templates/settings-personal.php:21
msgid "Old log-in password"
-msgstr ""
+msgstr "Contraseña d'accesu vieya"
#: templates/settings-personal.php:27
msgid "Current log-in password"
-msgstr ""
+msgstr "Contraseña d'accesu actual"
#: templates/settings-personal.php:32
msgid "Update Private Key Password"
-msgstr ""
+msgstr "Anovar Contraseña de Clave Privada"
#: templates/settings-personal.php:41
msgid "Enable password recovery:"
-msgstr ""
+msgstr "Habilitar la recuperación de contraseña:"
#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
-msgstr ""
+msgstr "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña"
#: templates/settings-personal.php:59
msgid "File recovery settings updated"
-msgstr ""
+msgstr "Opciones de recuperación de ficheros anovada"
#: templates/settings-personal.php:60
msgid "Could not update file recovery"
-msgstr "Nun pue anovase'l ficheru de recuperación"
+msgstr "Nun pudo anovase la recuperación de ficheros"
diff --git a/l10n/ast/files_external.po b/l10n/ast/files_external.po
index ef3f54478c39b8fa2db986b1b3fbbf11a912d981..00622dcf238d351feb8abeb6389f5b67691b818e 100644
--- a/l10n/ast/files_external.po
+++ b/l10n/ast/files_external.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"PO-Revision-Date: 2014-05-18 10:23+0000\n"
+"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,64 +27,64 @@ msgstr "Llocalización"
#: appinfo/app.php:39
msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
#: appinfo/app.php:41
msgid "Key"
-msgstr ""
+msgstr "Clave"
#: appinfo/app.php:42
msgid "Secret"
-msgstr ""
+msgstr "Secretu"
#: appinfo/app.php:43 appinfo/app.php:51
msgid "Bucket"
-msgstr ""
+msgstr "Depósitu"
#: appinfo/app.php:47
msgid "Amazon S3 and compliant"
-msgstr ""
+msgstr "Amazon S3 y compatibilidá"
#: appinfo/app.php:49
msgid "Access Key"
-msgstr ""
+msgstr "Clave d'accesu"
#: appinfo/app.php:50
msgid "Secret Key"
-msgstr ""
+msgstr "Clave Secreta"
#: appinfo/app.php:52
msgid "Hostname (optional)"
-msgstr ""
+msgstr "Nome d'equipu (opcional)"
#: appinfo/app.php:53
msgid "Port (optional)"
-msgstr ""
+msgstr "Puertu (opcional)"
#: appinfo/app.php:54
msgid "Region (optional)"
-msgstr ""
+msgstr "Rexón (opcional)"
#: appinfo/app.php:55
msgid "Enable SSL"
-msgstr ""
+msgstr "Habilitar SSL"
#: appinfo/app.php:56
msgid "Enable Path Style"
-msgstr ""
+msgstr "Habilitar Estilu de ruta"
#: appinfo/app.php:63
msgid "App key"
-msgstr ""
+msgstr "App principal"
#: appinfo/app.php:64
msgid "App secret"
-msgstr ""
+msgstr "App secreta"
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Sirvidor"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -99,59 +99,59 @@ msgstr "Contraseña"
#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
#: appinfo/app.php:134 appinfo/app.php:154
msgid "Root"
-msgstr ""
+msgstr "RaÃz"
#: appinfo/app.php:77
msgid "Secure ftps://"
-msgstr ""
+msgstr "Secure ftps://"
#: appinfo/app.php:84
msgid "Client ID"
-msgstr ""
+msgstr "ID de veceru"
#: appinfo/app.php:85
msgid "Client secret"
-msgstr ""
+msgstr "Veceru secretu"
#: appinfo/app.php:92
msgid "OpenStack Object Storage"
-msgstr ""
+msgstr "OpenStack Object Storage"
#: appinfo/app.php:94
msgid "Username (required)"
-msgstr ""
+msgstr "Nome d'usuariu (necesariu)"
#: appinfo/app.php:95
msgid "Bucket (required)"
-msgstr ""
+msgstr "Depósitu (necesariu)"
#: appinfo/app.php:96
msgid "Region (optional for OpenStack Object Storage)"
-msgstr ""
+msgstr "Rexón (opcional pa OpenStack Object Storage)"
#: appinfo/app.php:97
msgid "API Key (required for Rackspace Cloud Files)"
-msgstr ""
+msgstr "Clave API (necesaria pa Rackspace Cloud Files)"
#: appinfo/app.php:98
msgid "Tenantname (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Nome d'inquilÃn (necesariu pa OpenStack Object Storage)"
#: appinfo/app.php:99
msgid "Password (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Contraseña (necesaria pa OpenStack Object Storage)"
#: appinfo/app.php:100
msgid "Service Name (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Nome de Serviciu (necesariu pa OpenStack Object Storage)"
#: appinfo/app.php:101
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)"
#: appinfo/app.php:102
msgid "Timeout of HTTP requests in seconds (optional)"
-msgstr ""
+msgstr "Tiempu d'espera de peticiones HTTP en segundos (opcional)"
#: appinfo/app.php:114 appinfo/app.php:123
msgid "Share"
@@ -159,76 +159,80 @@ msgstr "Compartir"
#: appinfo/app.php:119
msgid "SMB / CIFS using OC login"
-msgstr ""
+msgstr "SMB / CIFS usando accesu OC"
#: appinfo/app.php:122
msgid "Username as share"
-msgstr ""
+msgstr "Nome d'usuariu como Compartición"
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
-msgstr ""
+msgstr "Secure https://"
#: appinfo/app.php:144
msgid "Remote subfolder"
-msgstr ""
+msgstr "Subcarpeta remota"
#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
msgid "Access granted"
-msgstr ""
+msgstr "Accesu concedÃu"
#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
msgid "Error configuring Dropbox storage"
-msgstr ""
+msgstr "Fallu configurando l'almacenamientu de Dropbox"
#: js/dropbox.js:68 js/google.js:89
msgid "Grant access"
-msgstr ""
+msgstr "Conceder accesu"
#: js/dropbox.js:102
msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "Por favor, proporciona una clave válida de l'app Dropbox y una clave secreta."
#: js/google.js:45 js/google.js:122
msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "Fallu configurando l'almacenamientu de Google Drive"
#: js/settings.js:318 js/settings.js:325
msgid "Saved"
msgstr "Guardáu"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>Nota:</b> "
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
-msgstr ""
+msgstr "y"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Nota:</b> El soporte de cURL en PHP nun ta activáu o instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale."
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Nota:</b> El soporte de FTP en PHP nun ta activáu o instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale."
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
" ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Nota:</b> \"%s\" nun ta instaláu. Nun pue montase %s. PÃdi-y al alministrador de sistema que lu instale."
#: templates/settings.php:2
msgid "External Storage"
-msgstr ""
+msgstr "Almacenamientu esternu"
#: templates/settings.php:8 templates/settings.php:27
msgid "Folder name"
@@ -236,7 +240,7 @@ msgstr "Nome de la carpeta"
#: templates/settings.php:9
msgid "External storage"
-msgstr ""
+msgstr "Almacenamientu esternu"
#: templates/settings.php:10
msgid "Configuration"
@@ -248,19 +252,19 @@ msgstr "Opciones"
#: templates/settings.php:12
msgid "Available for"
-msgstr ""
+msgstr "Disponible pa"
#: templates/settings.php:32
msgid "Add storage"
-msgstr ""
+msgstr "Amestar almacenamientu"
#: templates/settings.php:92
msgid "No user or group"
-msgstr ""
+msgstr "Nengún usuariu o grupu"
#: templates/settings.php:95
msgid "All Users"
-msgstr ""
+msgstr "Tolos usuarios"
#: templates/settings.php:97
msgid "Groups"
@@ -277,16 +281,16 @@ msgstr "Desaniciar"
#: templates/settings.php:132
msgid "Enable User External Storage"
-msgstr ""
+msgstr "Habilitar almacenamientu esterno d'usuariu"
#: templates/settings.php:135
msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "Permitir a los usuarios montar el siguiente almacenamientu esternu"
#: templates/settings.php:150
msgid "SSL root certificates"
-msgstr ""
+msgstr "Certificaos raÃz SSL"
#: templates/settings.php:168
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Importar certificáu raÃz"
diff --git a/l10n/ast/files_sharing.po b/l10n/ast/files_sharing.po
index 5b0ecf3d6262351f20dc6762edb03078f7c58262..1d631037e48170dfe78a64559b3f1d49b1224cc9 100644
--- a/l10n/ast/files_sharing.po
+++ b/l10n/ast/files_sharing.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# dixebra <davidlopezcastanon@gmail.com>, 2014
+# Iñigo Varela <ivarela@softastur.org>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
@@ -17,55 +19,87 @@ msgstr ""
"Language: ast\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "CompartÃu por {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
-msgstr ""
+msgstr "Esta compartición tien contraseña protexida"
#: templates/authenticate.php:7
msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "La contraseña ye incorreuta. Inténtalo otra vegada."
#: templates/authenticate.php:10
msgid "Password"
msgstr "Contraseña"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "SentÃmoslo, esti enllaz paez que yá nun furrula."
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "Les razones pueden ser: "
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "desanicióse l'elementu"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "l'enllaz caducó"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "compartir ta desactiváu"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "Pa más información, entrúga-y a la persona qu'unvió esti enllaz"
#: templates/public.php:21
msgid "Download"
msgstr "Baxar"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
-msgstr ""
+msgstr "Descargar %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
-msgstr ""
+msgstr "Enllaz direutu"
diff --git a/l10n/ast/files_trashbin.po b/l10n/ast/files_trashbin.po
index 5e51f4759a024c1a1b3878970590c6ab5e6b9fe3..4d8d8436ff6b73c60db3d5f551a1370db832d2b5 100644
--- a/l10n/ast/files_trashbin.po
+++ b/l10n/ast/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-22 01:54-0400\n"
-"PO-Revision-Date: 2014-04-21 16:38+0000\n"
-"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,38 +28,34 @@ msgstr "Nun pudo desaniciase %s dafechu"
msgid "Couldn't restore %s"
msgstr "Nun pudo restaurase %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
-msgstr ""
+msgstr "Ficheros desaniciaos"
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Restaurar"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Fallu"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Ficheros desaniciaos"
-
#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
-msgstr ""
+msgstr "recuperóse"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Nun hai un res equÃ. La papelera ta balera!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nome"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Restaurar"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Desaniciáu"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Desaniciar"
diff --git a/l10n/ast/lib.po b/l10n/ast/lib.po
index 1ccb0bb404a2533646a20fb113297a852e6b22c5..c84f3fe91f083fb3fe32d5f123bcdd24e1cadd33 100644
--- a/l10n/ast/lib.po
+++ b/l10n/ast/lib.po
@@ -4,13 +4,14 @@
#
# Translators:
# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
+# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-27 07:41+0000\n"
+"Last-Translator: Tornes Llume <l.lumex03.tornes@gmail.com>\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,11 +19,11 @@ msgstr ""
"Language: ast\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
-msgstr ""
+msgstr "Tas accediendo al sirvidor dende un dominiu non confiáu."
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -34,7 +35,7 @@ msgstr ""
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr ""
+msgstr "Nun pue instalase l'aplicación \"%s\" porque nun ye compatible con esta versión d'ownCloud."
#: private/app.php:248
msgid "No app name specified"
@@ -42,7 +43,7 @@ msgstr ""
#: private/app.php:353
msgid "Help"
-msgstr ""
+msgstr "Ayuda"
#: private/app.php:366
msgid "Personal"
@@ -58,7 +59,7 @@ msgstr "Usuarios"
#: private/app.php:402
msgid "Admin"
-msgstr ""
+msgstr "Almin"
#: private/app.php:880
#, php-format
@@ -67,7 +68,7 @@ msgstr "Fallu al anovar \"%s\"."
#: private/avatar.php:66
msgid "Unknown filetype"
-msgstr ""
+msgstr "Triba de ficheru desconocida"
#: private/avatar.php:71
msgid "Invalid image"
@@ -75,25 +76,25 @@ msgstr "Imaxe inválida"
#: private/defaults.php:35
msgid "web services under your control"
-msgstr ""
+msgstr "servicios web baxo'l to control"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Tan deshabilitaes les descargues de ZIP."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Los ficheros necesiten descargase ún a ún"
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Los ficheros esbillaos son milenta grandes pa xenerar un ficheru zip."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -122,38 +123,38 @@ msgstr ""
#: private/installer.php:126
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "L'aplicación nun apurre un ficheru info.xml"
#: private/installer.php:132
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: private/installer.php:141
+#: private/installer.php:138
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "Nun pue instalase l'aplicación porque nun ye compatible con esta versión d'ownCloud."
-#: private/installer.php:147
+#: private/installer.php:144
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: private/installer.php:160
+#: private/installer.php:157
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 ""
-#: private/installer.php:170
+#: private/installer.php:167
msgid "App directory already exists"
msgstr ""
-#: private/installer.php:183
+#: private/installer.php:180
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Nun pue crease la carpeta de l'aplicación. Por favor, igua los permisos. %s"
#: private/json.php:29
msgid "Application is not enabled"
@@ -169,7 +170,7 @@ msgstr ""
#: private/json.php:74
msgid "Unknown user"
-msgstr ""
+msgstr "Usuariu desconocÃu"
#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
@@ -248,7 +249,7 @@ msgstr ""
#: private/setup/mysql.php:91
#, php-format
msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "Yá esiste l'usuariu de MySQL/MariaDB '%s'@'%%'"
#: private/setup/mysql.php:92
msgid "Drop this user from MySQL/MariaDB."
@@ -256,7 +257,7 @@ msgstr ""
#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "Nun pudo afitase la conexón d'Oracle"
#: private/setup/oci.php:41 private/setup/oci.php:113
msgid "Oracle username and/or password not valid"
@@ -279,127 +280,138 @@ msgstr "Afitar nome d'usuariu p'almin"
msgid "Set an admin password."
msgstr "Afitar contraseña p'almin"
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
-msgstr "El sirvidor web entá nun ta configurado pa permitir la sincronización de ficheros yá que la interface WebDAV paez nun tar funcionando."
+msgstr "El to sirvidor web entá nun ta configuráu afayadizamente pa permitir la sincronización de ficheros porque la interfaz WebDAV paez tar rota."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s compartió »%s« contigo"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Necesites apurrir una contraseña pa crear un enllaz públicu, namái tan permitÃos los enllaces protexÃos"
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
-msgstr ""
+msgstr "La triba de compartición %s nun ye válida pa %s"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
-msgstr ""
+msgstr "Nun s'alcontró'l botón de compartición %s"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
-msgstr ""
+msgstr "Nun s'alcontró'l botón de partición pa %s"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Nun pudo alcontrase la estaya \"%s.\""
@@ -456,7 +468,7 @@ msgstr "fai años"
msgid ""
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
"\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "Namái tan permitÃos los siguientes caráuteres nun nome d'usuariu: \"a-z\", \"A-Z\", \"0-9\", y \"_.@-\""
#: private/user/manager.php:237
msgid "A valid username must be provided"
@@ -468,4 +480,4 @@ msgstr "Tien d'apurrise una contraseña válida"
#: private/user/manager.php:246
msgid "The username is already being used"
-msgstr ""
+msgstr "El nome d'usuariu yá ta usándose"
diff --git a/l10n/ast/settings.po b/l10n/ast/settings.po
index 06874ae745e925b719e0dc021d8982ff1566ac37..12a1914fc5b7b664c342cfc0b3928a5578bb7117 100644
--- a/l10n/ast/settings.po
+++ b/l10n/ast/settings.po
@@ -4,13 +4,14 @@
#
# Translators:
# Iñigo Varela <ivarela@softastur.org>, 2014
+# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -48,15 +49,15 @@ msgstr "Corréu-e unviáu"
msgid "You need to set your user email before being able to send test emails."
msgstr "Tienes de configurar la direición de corréu-e enantes de poder unviar mensaxes de prueba."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Mou d'unviu"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Cifráu"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Métodu d'autenticación"
@@ -99,6 +100,16 @@ msgstr "Nun pudieron descifrase sus ficheros. Revisa'l owncloud.log o consulta c
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "Nun pudieron descifrase los ficheros. Revisa la contraseña ya inténtalo dempués"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Desaniciaes dafechu les claves de cifráu"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Nun pudieron desaniciase dafechu les tos claves d'encriptación, por favor comprueba'l to owncloud.log o entruga a un alministrador"
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Corréu-e guardáu"
@@ -115,6 +126,16 @@ msgstr "Nun pudo desaniciase'l grupu"
msgid "Unable to delete user"
msgstr "Nun pudo desaniciase l'usuariu"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Nun pudieron restaurase dafechu les tos claves d'encriptación, por favor comprueba'l to owncloud.log o entruga a un alministrador"
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Camudóse la llingua"
@@ -170,7 +191,7 @@ msgstr "El back-end nun sofita cambeos de contraseña, pero la contraseña de ci
msgid "Unable to change password"
msgstr "Nun pudo camudase la contraseña"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Unviando..."
@@ -226,34 +247,42 @@ msgstr "Anovar"
msgid "Updated"
msgstr "Anováu"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Esbillar una imaxe de perfil"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Contraseña mui feble"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Contraseña feble"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Contraseña pasable"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Contraseña bona"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Contraseña mui bona"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Desanciar dafechu les claves de cifráu."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Restaurar claves de cifráu."
+
#: js/users.js:47
msgid "deleted"
msgstr "desaniciáu"
@@ -266,8 +295,8 @@ msgstr "desfacer"
msgid "Unable to remove user"
msgstr "Imposible desaniciar al usuariu"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupos"
@@ -299,7 +328,7 @@ msgstr "Tien d'apurrise una contraseña válida"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Avisu: el direutoriu d'aniciu pal usuariu \"{user}\" yá esiste."
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Asturianu"
@@ -367,7 +396,7 @@ msgid ""
"root."
msgstr "El direutoriu de datos y ficheros ye dablemente accesible dende Internet, darréu que'l ficheru .htaccess nun ta funcionando. SuxerÃmoste que configures el sirvidor web de mou que'l direutoriu de datos nun seya accesible o que muevas talu direutoriu fuera del raigañu de documentos del sirvidor web."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Avisu de configuración"
@@ -382,53 +411,65 @@ msgstr "El sirvidor web entá nun ta configurado pa permitir la sincronización
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "Por favor, vuelvi a comprobar les <a href=\"%s\">guÃes de instalación</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Nun s'atopó'l módulu \"fileinfo\""
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "Nun s'atopó'l módulu PHP 'fileinfo'. Encamentámoste qu'habilites esti módulu pa obtener meyores resultaos cola deteición de tribes MIME."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "La versión de PHP nun ta anovada"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "La versión de PHP caducó. SuxerÃmose que l'anueves a 5.3.8 o a una más nueva porque davezu, les versiones vieyes nun funcionen bien. Puede ser qu'esta instalación nun tea funcionando bien."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "La configuración rexonal nun ta funcionando"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Nun se pue escoyer una configuración rexonal que sofite UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Esto significa que pue haber problemes con ciertos caráuteres nos nomes de los ficheros."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Ye enforma recomendable instalar los paquetes necesarios pa poder soportar una de les siguientes configuraciones rexonales: %s. "
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "La conexón a Internet nun ta funcionando"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -437,198 +478,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Esti sirvidor nun tien conexón a Internet. Esto significa que dalgunes de les carauterÃstiques nun van funcionar, como'l montaxe d'almacenamiento esternu, les notificaciones sobre anovamientos, la instalación d'aplicaciones de terceros, l'accesu a los ficheros de mou remotu o l'unviu de correos-e de notificación. Suxerimos habilitar una conexón a Internet nesti sirvidor pa esfrutar de toles funciones."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "Cron executóse per cabera vegada a les %s."
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "Cron executóse per cabera vegada a les %s. Esto foi hai más d'una hora, daqué anda mal."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "¡Cron entá nun s'executó!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Executar una xera con cada páxina cargada"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php rexÃstrase nun serviciu webcron pa llamar a cron.php cada 15 minutos al traviés de HTTP."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Usa'l serviciu cron del sistema pa llamar al ficheru cron.php cada 15 minutos."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Compartiendo"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Activar API de Compartición"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Permitir a les aplicaciones usar la API de Compartición"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Permitir enllaces"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permitir a los usuarios compartir elementos col públicu per aciu d'enllaces"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Permitir xubes públiques"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permitir a los usuarios habilitar a otros pa xubir ficheros nes sos carpetes compartÃes públicamente"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "Afitar la data d'espiración predeterminada"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Caduca dempués de"
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "dÃes"
-#: templates/admin.php:235
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Facer cumplir la data de caducidá"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Permitir a los usuarios compartir elementos col públicu per aciu d'enllaces"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Permitir re-compartición"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Permitir a los usuarios compartir de nuevu elementos ya compartÃos"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Permitir a los usuarios compartir con cualesquier persona"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Permitir a los usuarios compartir namái colos usuarios nos sos grupos"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Permitir notificaciones per corréu-e"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartÃos"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr "Afitar la data d'espiración predeterminada"
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Caduca dempués de"
-
-#: templates/admin.php:266
-msgid "days"
-msgstr "dÃes"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr "Facer cumplir la data de caducidá"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Ficheros compartÃos caduquen dempués de N dÃes"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Seguridá"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Forciar HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Forciar a los veceros a coneutase a %s per duana d'una conexón cifrada."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Por favor, conéutate a %s al traviés de HTTPS p'habilitar o deshabilitar l'aplicación de SSL."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Sirvidor de corréu-e"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "Esto úsase pa unviar notificaciones."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Dende la direición"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "NecesÃtase autenticación"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Direición del sirvidor"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Puertu"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Credenciales"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "Nome d'usuariu SMTP"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "Contraseña SMTP"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Probar configuración de corréu electrónicu"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Unviar mensaxe"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Rexistru"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Nivel de rexistru"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Más"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +830,33 @@ msgstr "Llingua"
msgid "Help translate"
msgstr "Ayúdanos nes traducciones"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Usa esta direición pa <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a los ficheros a traviés de WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "L'aplicación de cifráu yá nun ta activada, descifra tolos ficheros"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Contraseña d'accesu"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Descifrar ficheros"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Restaurar claves de cifráu."
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Desaniciar claves de cifráu"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Nome d'usuariu"
diff --git a/l10n/ast/user_ldap.po b/l10n/ast/user_ldap.po
index 2ba8b90b2301b0cf4d5c270672aba16123a15277..63acfdc500636555a10d6bddd88698822d274f80 100644
--- a/l10n/ast/user_ldap.po
+++ b/l10n/ast/user_ldap.po
@@ -3,14 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# dixebra <davidlopezcastanon@gmail.com>, 2014
# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
+# tebanpb <peruyero@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,17 +26,17 @@ msgstr ""
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Fallu al desaniciar la configuración del sevidor"
#: ajax/testConfiguration.php:39
msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "¡La configuración ye válida y pudo afitase la conexón!"
#: ajax/testConfiguration.php:42
msgid ""
"The configuration is valid, but the Bind failed. Please check the server "
"settings and credentials."
-msgstr ""
+msgstr "La configuración ye válida, pero falló'l vÃnculu. Por favor, comprueba la configuración y les credenciales nel servidor."
#: ajax/testConfiguration.php:46
msgid ""
@@ -71,6 +73,10 @@ msgstr ""
msgid "Keep settings?"
msgstr "¿Caltener los axustes?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Nun pue amestase la configuración del sirvidor"
@@ -87,6 +93,18 @@ msgstr "Con ésitu"
msgid "Error"
msgstr "Fallu"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -113,11 +131,11 @@ msgstr "Esbillar atributos"
#: js/settings.js:848
msgid "Connection test succeeded"
-msgstr ""
+msgstr "Test de conexón esitosu"
#: js/settings.js:855
msgid "Connection test failed"
-msgstr ""
+msgstr "Falló'l test de conexón"
#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
@@ -127,28 +145,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s grupu alcontráu"
msgstr[1] "%s grupos alcontraos"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s usuariu alcontráu"
msgstr[1] "%s usuarios alcontraos"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Nun pudo alcontrase la carauterÃstica deseyada"
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Guardar"
@@ -159,7 +193,7 @@ msgstr ""
#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
msgid "Help"
-msgstr ""
+msgstr "Ayuda"
#: templates/part.wizard-groupfilter.php:4
#, php-format
@@ -221,10 +255,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Amestar configuración del sirvidor"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Equipu"
@@ -288,6 +335,14 @@ msgstr ""
msgid "Continue"
msgstr "Continuar"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avanzáu"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/az/core.po b/l10n/az/core.po
index f61bb1c4aa44c2aafea064e97fc7c63b4ee334e6..121765cea49a00cef734d0b2d17ddf79af08bb01 100644
--- a/l10n/az/core.po
+++ b/l10n/az/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: az\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/az/files.po b/l10n/az/files.po
index 4bc174ab25f3d6267fb78ad1a45abc53a4f2d739..339898e0f5c95c58a15d09c80d936b005a5c4713 100644
--- a/l10n/az/files.po
+++ b/l10n/az/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/az/files_encryption.po b/l10n/az/files_encryption.po
index 7bbae1590a4a4b678aa76d3ce2d763c608baa391..bdf88bf50610a784e2146056b4870636c5686b0c 100644
--- a/l10n/az/files_encryption.po
+++ b/l10n/az/files_encryption.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: az\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ajax/adminrecovery.php:29
msgid "Recovery key successfully enabled"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/az/files_external.po b/l10n/az/files_external.po
index 65d4cc5ed30c331c29974405ae3c2c03be8f4614..fce611809732617904e6d9d1fd2e84d9f8a0442b 100644
--- a/l10n/az/files_external.po
+++ b/l10n/az/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/az/files_sharing.po b/l10n/az/files_sharing.po
index ec76b28b239aa77f486854141bfa436fcb966779..057a2d0612223921e386e264d7b9558d4b4fcdc8 100644
--- a/l10n/az/files_sharing.po
+++ b/l10n/az/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: az\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/az/files_trashbin.po b/l10n/az/files_trashbin.po
index ebef2b81415a91f3db80d35b3567ca7d3f0ee59c..7096af748a80b358062b6bd289345a6b4069502d 100644
--- a/l10n/az/files_trashbin.po
+++ b/l10n/az/files_trashbin.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: az\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ajax/delete.php:59
#, php-format
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/az/lib.po b/l10n/az/lib.po
index bd88ab335d924b1a0cc8ecf22b350f2cef5c0844..d183a188d32ab723b09af4f4f3789a2951282f33 100644
--- a/l10n/az/lib.po
+++ b/l10n/az/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: az\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/az/settings.po b/l10n/az/settings.po
index cd3448207bdb6a34b024f36dc40c55272830136e..98425adf19257754d892b5ac103273e64da66fd2 100644
--- a/l10n/az/settings.po
+++ b/l10n/az/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/az/user_ldap.po b/l10n/az/user_ldap.po
index 1da919a2bd93a118999031ee70299aaf29dd7abb..e630aec17d115b482ae443cdbab57c5b3ec461f3 100644
--- a/l10n/az/user_ldap.po
+++ b/l10n/az/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/be/core.po b/l10n/be/core.po
index 7b3d997c5f344def98ed8fe9757c84fc48d82135..8f98ce1d48eccff1925b9a07e37453e20eee757e 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: be\n"
"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);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -59,95 +64,95 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "ÐÑдзелÑ"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "ПанÑдзелак"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Ðўторак"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Серада"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Чацвер"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "ПÑтніца"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Субота"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Студзень"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Люты"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Сакавік"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "КраÑавік"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Май"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "ЧÑрвень"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Ліпень"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Жнівень"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "ВераÑень"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "КаÑтрычнік"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "ЛіÑтапад"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Снежань"
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr "Ðалады"
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr "Секунд таму"
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -155,7 +160,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -163,15 +168,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr "СённÑ"
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr "Ўчора"
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -179,11 +184,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr "У мінулым меÑÑцы"
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -191,39 +196,39 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr "У мінулым годзе"
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr "Гадоў таму"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Выбар"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Так"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ðе"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Выбар"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Добра"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
@@ -231,45 +236,45 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -301,140 +306,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Памылка"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -466,18 +480,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -678,6 +693,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -803,7 +822,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/be/files.po b/l10n/be/files.po
index 3dbf84fd3b3dba1bf4614ddd3f2318365fab0646..1a931330448aa5d11f1866f06f9c6aafc55ba2a9 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,77 +177,77 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Памылка"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
@@ -251,7 +255,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
@@ -259,7 +263,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
@@ -267,32 +271,32 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -302,12 +306,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -344,68 +348,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/be/files_encryption.po b/l10n/be/files_encryption.po
index 4cf8602735d8f34fb63dc1d54a87097087738fab..21b6aef26016988ef0be560ed59d713a86134cc0 100644
--- a/l10n/be/files_encryption.po
+++ b/l10n/be/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/be/files_external.po b/l10n/be/files_external.po
index 4aae87150c52f245b66f16bd26939f8bf57b0043..9ced33c56b219788cb8d1276d2599cc9048fa7dc 100644
--- a/l10n/be/files_external.po
+++ b/l10n/be/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/be/files_sharing.po b/l10n/be/files_sharing.po
index 6816667bffdb52a97637696a2dbb41199efc938d..cf93650d7dcc4c9bb2a8fa3d4126312d61f31fd4 100644
--- a/l10n/be/files_sharing.po
+++ b/l10n/be/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: be\n"
"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);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/be/files_trashbin.po b/l10n/be/files_trashbin.po
index 4ec9ee447f7bda9a821d4e6b36a781e7793fb8c1..a2a6246129f6cb9ffc4efd2cc6a6c9c402adf2a2 100644
--- a/l10n/be/files_trashbin.po
+++ b/l10n/be/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Памылка"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index dea965dc2ea031307d146a0944eb4c9df4de1754..953cd6cf1fa05f5f982eeb3ab39084c2a21e0047 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: be\n"
"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);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index 8e0a3d7a13bb4fdb35d7e8089cb001519c3730e5..7d98008ed5d8ea8716cd69184edef18792ab4724 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po
index 3699adf2e0409a67d9611f314331b97c1c8c8d16..5c07bd073e5e93f070e9954283e62b1a62d0604d 100644
--- a/l10n/be/user_ldap.po
+++ b/l10n/be/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,47 +90,59 @@ msgstr ""
msgid "Error"
msgstr "Памылка"
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -135,7 +151,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -144,14 +160,30 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -224,10 +256,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -291,6 +336,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "ДаÑведчаны"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 97b80bd607532d21c44111cb471185e3bd62447d..234c2a89ac2c62b844c0c440bd825d20def6c7ea 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -59,207 +64,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "ÐеделÑ"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Понеделник"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Вторник"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "СрÑда"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Четвъртък"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Петък"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Събота"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Януари"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Февруари"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Март"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Ðприл"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Май"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Юни"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Юли"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "ÐвгуÑÑ‚"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Септември"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Октомври"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Ðоември"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Декември"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "ÐаÑтройки"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "ЗапиÑване..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "преди Ñекунди"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "днеÑ"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "поÑледниÑÑ‚ меÑец"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "поÑледната година"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "поÑледните години"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Избери"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ðе"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Избери"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Добре"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Отказ"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -291,140 +296,149 @@ msgstr "Споделено"
msgid "Share"
msgstr "СподелÑне"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Грешка"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Грешка при ÑподелÑне"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Грепка докато Ñе премахва ÑподелÑнето"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Грешка при промÑна на доÑтъпноÑÑ‚"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Споделено Ñ Ñ‚ÐµÐ±Ðµ и група {group} от {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Споделено Ñ Ñ‚ÐµÐ±Ðµ от {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Защитено Ñ Ð¿Ð°Ñ€Ð¾Ð»Ð°"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Парола"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Изпрати връзка до пощата на нÑкои"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Изпрати"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "ПоÑочи дата на изтичане"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Дата на изтичане"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Ñподели по поща:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Ðе Ñа открити хора"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "група"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Допълнително ÑподелÑне не е разрешено"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Споделено в {item} Ñ {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Премахни ÑподелÑне"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "може да променÑ"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "контрол на доÑтъпа"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "Ñъздаване"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "ОбновÑване"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "Изтриване"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "СподелÑне"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Защитено Ñ Ð¿Ð°Ñ€Ð¾Ð»Ð°"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Грешка при премахване на дата за изтичане"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Грепка при поÑтавÑне на дата за изтичане"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Изпращам ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Пощата е изпратена"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Внимание"
@@ -456,18 +470,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -668,6 +683,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Създаване на <strong>админ профил</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Парола"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -793,7 +812,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 4d9f0ec19787324d229b1f39ea1d15e699b70bda..45a51c2e78f98ebf60734f749b492a37355535af 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr "ЛипÑва временна папка"
msgid "Failed to write to disk"
msgstr "Възникна проблем при Ð·Ð°Ð¿Ð¸Ñ Ð² диÑка"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Ðевалидна директориÑ."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Файлове"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Качването е ÑпрÑно."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "СподелÑне"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Изтриване завинаги"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Преименуване"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Чакащо"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Грешка"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Име"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Размер"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Променено"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr "ЗапиÑ"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "Ðово"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "ТекÑтов файл"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Ðова папка"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Папка"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Спри качването"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "ÐÑма нищо тук. Качете нещо."
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "ИзтеглÑне"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Изтриване"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Файлът който Ñте избрали за качване е прекалено голÑм"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Файловете които Ñе опитвате да качите Ñа по-големи от позволеното за Ñървъра."
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Файловете Ñе претърÑват, изчакайте."
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
index 59c82a6961b1d017e909dffbbdc26517bd5c15a7..3a6d6368073a446eeec4615a6078f84ffdcc1a09 100644
--- a/l10n/bg_BG/files_encryption.po
+++ b/l10n/bg_BG/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Криптиране"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index 9e60916349879d4f60be7e3a5766ea51aed5e1f3..aaefc159d5631f6264c7931eb10fa3c8a3df4d12 100644
--- a/l10n/bg_BG/files_external.po
+++ b/l10n/bg_BG/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "Уеб адреÑ"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "Уеб адреÑ"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index e29402aa9a60afa1498961da4fb8de815b91fcd5..76f7d01fc9715810963d484d1ce0bf2a7462bdcb 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "Парола"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "ИзтеглÑне"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index 32fb65bc9fb4fb06bde676b6b4478cee2444a469..e34d9be50a97fd7b6a3941ef02aad122aa94c4da 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "Ðевъзможно перманентното изтриване на
msgid "Couldn't restore %s"
msgstr "Ðевъзможно възтановÑване на %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "ВъзтановÑване"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Грешка"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Изтрити файлове"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "ÐÑма нищо. Кофата е празна!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Име"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "ВъзтановÑване"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Изтрито"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Изтриване"
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index dfe1f5b0d2ad2288f8152d2370bfdaa702586701..2854fc26bbd53d689678ae4548e7431ada764613 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -77,23 +77,23 @@ msgstr ""
msgid "web services under your control"
msgstr "уеб уÑлуги под Ваш контрол"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ИзтеглÑнето като ZIP е изключено."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Файловете Ñ‚Ñ€Ñбва да Ñе изтеглÑÑ‚ един по един."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Ðазад към файловете"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Избраните файлове Ñа прекалено големи за генерирането на ZIP архив."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -279,127 +279,138 @@ msgstr "Въведете потребителÑко име за админиÑÑ‚
msgid "Set an admin password."
msgstr "Въведете парола за админиÑтратор."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "ВашиÑÑ‚ web Ñървър вÑе още не е удачно наÑтроен да позволÑва ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° файлове, защото WebDAV интерфейÑÑŠÑ‚ изглежда не работи."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "ÐœÐ¾Ð»Ñ Ð½Ð°Ð¿Ñ€Ð°Ð²ÐµÑ‚Ðµ повторна Ñправка Ñ <a href='%s'>ръководÑтвото за инÑталиране</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Ðевъзможно откриване на категориÑта \"%s\""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index a8902fc4d78b225dab124d6778acb5a9c7a43528..fad2a01b3acbd4ae380f23763cdab4c9d4c595cb 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "Пощата е изпратена"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Криптиране"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Email адреÑа е запиÑан"
@@ -114,6 +124,16 @@ msgstr "Ðевъзможно изтриване на група"
msgid "Unable to delete user"
msgstr "Ðевъзможно изтриване на потребител"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Езикът е променен"
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr "ОбновÑване"
msgid "Updated"
msgstr "Обновено"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "изтрито"
@@ -265,8 +293,8 @@ msgstr "възтановÑване"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Групи"
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__language_name__"
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr "ВашиÑÑ‚ web Ñървър вÑе още не е удачно наÑ
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Крон"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "СподелÑне"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° Ñървъра"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Още"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "По-малко"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "ВерÑиÑ"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +828,33 @@ msgstr "Език"
msgid "Help translate"
msgstr "Помогнете Ñ Ð¿Ñ€ÐµÐ²Ð¾Ð´Ð°"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr ""
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr ""
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Потребител"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 26eb9f1f7c3d142c293fc254ca4ab16501c3ce62..9bcdbd187927cf68dd31c457a176ff5a63b8af89 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "Грешка"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "ЗапиÑ"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Разширено"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 1efcd1d974fb234b88474bb48735d64d8ccd555a..9b68372b33f891464e8eda2ae8b357fb261643f8 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "রবিবার"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "সোমবার"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "মঙà§à¦—লবার"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "বà§à¦§à¦¬à¦¾à¦°"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "বৃহসà§à¦ªà¦¤à¦¿à¦¬à¦¾à¦°"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "শà§à¦•à§à¦°à¦¬à¦¾à¦°"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "শনিবার"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "জানà§à§Ÿà¦¾à¦°à¦¿"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "ফেবà§à¦°à§à§Ÿà¦¾à¦°à¦¿"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "মারà§à¦š"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "à¦à¦ªà§à¦°à¦¿à¦²"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "মে"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "জà§à¦¨"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "জà§à¦²à¦¾à¦‡"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "অগাষà§à¦Ÿ"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "সেপà§à¦Ÿà§‡à¦®à§à¦¬à¦°"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "অকà§à¦Ÿà§‹à¦¬à¦°"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "নà¦à§‡à¦®à§à¦¬à¦°"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "ডিসেমà§à¦¬à¦°"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "নিয়ামকসমূহ"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "সংরকà§à¦·à¦£ করা হচà§à¦›à§‡.."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "সেকেনà§à¦¡ পূরà§à¦¬à§‡"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "আজ"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "গতকাল"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "গত মাস"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "গত বছর"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "বছর পূরà§à¦¬à§‡"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "বেছে নিন"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "হà§à¦¯à¦¾à¦"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "না"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "বেছে নিন"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "তথাসà§à¦¤à§"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "বাতির"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr "à¦à¦¾à¦—াà¦à¦¾à¦—িকৃত"
msgid "Share"
msgstr "à¦à¦¾à¦—াà¦à¦¾à¦—ি কর"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "সমসà§à¦¯à¦¾"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "à¦à¦¾à¦—াà¦à¦¾à¦—ি করতে সমসà§à¦¯à¦¾ দেখা দিয়েছে "
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "à¦à¦¾à¦—াà¦à¦¾à¦—ি বাতিল করতে সমসà§à¦¯à¦¾ দেখা দিয়েছে"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "অনà§à¦®à¦¤à¦¿à¦¸à¦®à§‚হ পরিবরà§à¦¤à¦¨ করতে সমসà§à¦¯à¦¾ দেখা দিয়েছে"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} আপনার à¦à¦¬à¦‚ {group} গোষà§à¦ ীর সাথে à¦à¦¾à¦—াà¦à¦¾à¦—ি করেছেন"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "{owner} আপনার সাথে à¦à¦¾à¦—াà¦à¦¾à¦—ি করেছেন"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "কূটশবà§à¦¦ সà§à¦°à¦•à§à¦·à¦¿à¦¤"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "কূটশবà§à¦¦"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "বà§à¦¯à¦•à§à¦¤à¦¿à¦° সাথে ই-মেইল যà§à¦•à§à¦¤ কর"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "পাঠাও"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "মেয়াদোতà§à¦¤à§€à¦°à§à¦£ হওয়ার তারিখ নিরà§à¦§à¦¾à¦°à¦£ করà§à¦¨"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "মেয়াদোতà§à¦¤à§€à¦°à§à¦£ হওয়ার তারিখ"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "ই-মেইলের মাধà§à¦¯à¦®à§‡ à¦à¦¾à¦—াà¦à¦¾à¦—ি করà§à¦¨à¦ƒ"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "কোন বà§à¦¯à¦•à§à¦¤à¦¿ খà§à¦à¦œà§‡ পাওয়া গেল না"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "পূনঃরায় à¦à¦¾à¦—াà¦à¦¾à¦—ি অনà§à¦®à§‹à¦¦à¦¿à¦¤ নয়"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "{user} à¦à¦° সাথে {item} à¦à¦¾à¦—াà¦à¦¾à¦—ি করা হয়েছে"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "à¦à¦¾à¦—াà¦à¦¾à¦—ি বাতিল "
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "সমà§à¦ªà¦¾à¦¦à¦¨à¦¾ করতে পারবেন"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "অধিগমà§à¦¯à¦¤à¦¾ নিয়নà§à¦¤à§à¦°à¦£"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "তৈরী করà§à¦¨"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "পরিবরà§à¦§à¦¨ কর"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "মà§à¦›à§‡ ফেল"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "à¦à¦¾à¦—াà¦à¦¾à¦—ি কর"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "কূটশবà§à¦¦à¦¦à§à¦¬à¦¾à¦°à¦¾ সà§à¦°à¦•à§à¦·à¦¿à¦¤"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "মেয়াদোতà§à¦¤à§€à¦°à§à¦£ হওয়ার তারিখ নিরà§à¦§à¦¾à¦°à¦£ বাতিল করতে সমসà§à¦¯à¦¾ দেখা দিয়েছে"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "মেয়াদোতà§à¦¤à§€à¦°à§à¦£ হওয়ার তারিখ নিরà§à¦§à¦¾à¦°à¦£ করতে সমসà§à¦¯à¦¾ দেখা দিয়েছে"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "পাঠানো হচà§à¦›à§‡......"
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "ই-মেইল পাঠানো হয়েছে"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "সতরà§à¦•à¦¬à¦¾à¦£à§€"
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>পà§à¦°à¦¶à¦¾à¦¸à¦• à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ</strong> তৈরী করà§à¦¨"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "কূটশবà§à¦¦"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,8 +811,27 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "%s à¦à¦¾à¦°à§à¦¸à¦¨à§‡ ownCloud পরিবরà§à¦§à¦¨ করা হচà§à¦›à§‡, à¦à¦œà¦¨à§à¦¯ কিছৠসময় পà§à¦°à§Ÿà§‹à¦œà¦¨à¥¤"
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 5cb1d332e35b9d652cbf5e9dbd50572857deafa5..206645eea2d678bcce668aa0b2665a17a80c9674 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr "%s কে সà§à¦¥à¦¾à¦¨à¦¾à¦¨à§à¦¤à¦° করা সমà§à¦à¦¬ হ
msgid "Could not move %s"
msgstr "%s কে সà§à¦¥à¦¾à¦¨à¦¾à¦¨à§à¦¤à¦° করা সমà§à¦à¦¬ হলো না"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "ফাইলের নামটি ফাà¦à¦•à¦¾ রাখা যাবে না।"
@@ -36,18 +36,18 @@ msgstr "ফাইলের নামটি ফাà¦à¦•à¦¾ রাখা যা
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "নামটি সঠিক নয়, '\\', '/', '<', '>', ':', '\"', '|', '?' à¦à¦¬à¦‚ '*' অনà§à¦®à§‹à¦¦à¦¿à¦¤ নয়।"
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr "অসà§à¦¥à¦¾à§Ÿà§€ ফোলà§à¦¡à¦¾à¦°à¦Ÿà¦¿ হারানো গ
msgid "Failed to write to disk"
msgstr "ডিসà§à¦•à§‡ লিখতে বà§à¦¯à¦°à§à¦¥"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "à¦à§à¦² ডিরেকà§à¦Ÿà¦°à¦¿"
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "ফাইল"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "আপলোড বাতিল করা হয়েছে।"
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr "ফাইল আপলোড চলমান। à¦à¦‡ পৃষà§à¦
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} টি বিদà§à¦¯à¦®à¦¾à¦¨"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "à¦à¦¾à¦—াà¦à¦¾à¦—ি কর"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "পূনঃনামকরণ"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "মà§à¦²à¦¤à§à¦¬à¦¿"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "সমসà§à¦¯à¦¾"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "রাম"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "আকার"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "পরিবরà§à¦¤à¦¿à¦¤"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr "ZIP ফাইলের ইনপà§à¦Ÿà§‡à¦° সরà§à¦¬à§‹à¦šà§à¦š
msgid "Save"
msgstr "সংরকà§à¦·à¦£"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "নতà§à¦¨"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "টেকà§à¦¸à¦Ÿ ফাইল"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "ফোলà§à¦¡à¦¾à¦°"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr " লিংক থেকে"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "আপলোড বাতিল কর"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "à¦à¦–ানে কিছà§à¦‡ নেই। কিছৠআপলোড করà§à¦¨ !"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "ডাউনলোড"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "মà§à¦›à§‡"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "আপলোডের আকারটি অনেক বড়"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "আপনি à¦à¦‡ সারà§à¦à¦¾à¦°à§‡ আপলোড করার জনà§à¦¯ অনà§à¦®à§‹à¦¦à¦¿à¦¤ ফাইলের সরà§à¦¬à§‹à¦šà§à¦š আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষà§à¦Ÿà¦¾ করছেন "
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "ফাইলগà§à¦²à§‹ সà§à¦•à§à¦¯à¦¾à¦¨ করা হচà§à¦›à§‡, দয়া করে অপেকà§à¦·à¦¾ করà§à¦¨à¥¤"
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "বরà§à¦¤à¦®à¦¾à¦¨ সà§à¦•à§à¦¯à¦¾à¦¨à¦¿à¦‚"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/bn_BD/files_encryption.po b/l10n/bn_BD/files_encryption.po
index a05beb216f300cc2304803ab7aa6b5bdd9a722c7..abf012c2d7bba8f0f4c24364787f2a83efc67de4 100644
--- a/l10n/bn_BD/files_encryption.po
+++ b/l10n/bn_BD/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "সংকেতায়ন"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po
index b2d2bfa4d91b9ab458fbff4ce15b827dfe588fb6..05e56b5366a8d993c3d8ac6c094cc916ec29088a 100644
--- a/l10n/bn_BD/files_external.po
+++ b/l10n/bn_BD/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:10+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "হোসà§à¦Ÿ"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr "Google Drive সংরকà§à¦·à¦£à¦¾à¦—ার নিরà§à¦§à¦¾à¦°à¦£
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index b5d789be46d2fd96289ae09e641fd22f1b86481e..1fb3a889510ce6dc7570d1f8306cf2ef93529110 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "কূটশবà§à¦¦"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "ডাউনলোড"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index b75add2cf3fa0c80183a1c6c4668cab9b1f0862a..3656674825662eb0d8311bb6a9937e880ebe88d6 100644
--- a/l10n/bn_BD/files_trashbin.po
+++ b/l10n/bn_BD/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "সমসà§à¦¯à¦¾"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "রাম"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "মà§à¦›à§‡"
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index 24ac80a65602c475b650851b418c9aaffd1ae1fe..ff851b3305482bc735510b83f57943801b09c409 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr "ওয়েব সারà§à¦à¦¿à¦¸ আপনার হাতের মà§à¦ োয়"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP ডাউনলোড বনà§à¦§ করা আছে।"
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "ফাইলগà§à¦²à§‹ à¦à¦•à§‡ à¦à¦•à§‡ ডাউনলোড করা আবশà§à¦¯à¦•à¥¤"
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "ফাইলে ফিরে চল"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ ফাইলগà§à¦²à§‹ à¦à¦¤à¦‡ বৃহৎ যে জিপ ফাইল তৈরী করা সমà§à¦à¦¬ নয়।"
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index c70a0887dfe1a5effb5679964a63e6d1cec0d474..78f52cc136377291039d04dfc0033da141f25419 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "ই-মেইল পাঠানো হয়েছে"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "সংকেতায়ন"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "ই-মেইল সংরকà§à¦·à¦¨ করা হয়েছে"
@@ -114,6 +124,16 @@ msgstr "গোষà§à¦ ী মà§à¦›à§‡ ফেলা সমà§à¦à¦¬ হলো
msgid "Unable to delete user"
msgstr "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ মà§à¦›à§‡ ফেলা সমà§à¦à¦¬ হলো না "
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "à¦à¦¾à¦·à¦¾ পরিবরà§à¦¤à¦¨ করা হয়েছে"
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr "পরিবরà§à¦§à¦¨"
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr "কà§à¦°à¦¿à§Ÿà¦¾ পà§à¦°à¦¤à§à¦¯à¦¾à¦¹à¦¾à¦°"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "গোষà§à¦ ীসমূহ"
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__language_name__"
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "সারà§à¦à¦¾à¦° ঠিকানা"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "পোরà§à¦Ÿ"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "বেশী"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "কম"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "à¦à¦¾à¦°à§à¦¸à¦¨"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +828,33 @@ msgstr "à¦à¦¾à¦·à¦¾"
msgid "Help translate"
msgstr "অনà§à¦¬à¦¾à¦¦ করতে সহায়তা করà§à¦¨"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr ""
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr ""
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "পà§à¦°à¦¬à§‡à¦¶"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index f68937abab5f433bcf9818b64ae8c0b2dd3bbad4..6814e4b2a3a7d1a54ebbe4ee2c34cb389fbcf688 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "সমসà§à¦¯à¦¾"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "গোষà§à¦ ী ছাà¦à¦•à¦¨à§€"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "সংরকà§à¦·à¦£"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "হোসà§à¦Ÿ"
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "সà§à¦šà¦¾à¦°à§"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/bn_IN/core.po b/l10n/bn_IN/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..21236dbdca7ee429b4b4fc5d10c8e9f658fd2663
--- /dev/null
+++ b/l10n/bn_IN/core.po
@@ -0,0 +1,843 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:10
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:13
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:16
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+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:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:487
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:587
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1211
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1212
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1213
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1214
+msgid "today"
+msgstr ""
+
+#: js/js.js:1215
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1216
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1217
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1218
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1219
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1220
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr ""
+
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:175 js/share.js:863
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:186
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:193
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:203
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:229
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:235
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:256
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:260
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:261
+msgid "Send"
+msgstr ""
+
+#: js/share.js:266
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:267
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:304
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:307
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:355 js/share.js:416
+msgid "group"
+msgstr ""
+
+#: js/share.js:388
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:432
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:454
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:462
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:465
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:467
+msgid "access control"
+msgstr ""
+
+#: js/share.js:470
+msgid "create"
+msgstr ""
+
+#: js/share.js:473
+msgid "update"
+msgstr ""
+
+#: js/share.js:476
+msgid "delete"
+msgstr ""
+
+#: js/share.js:479
+msgid "share"
+msgstr ""
+
+#: js/share.js:781
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:800
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:821
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:850
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:861
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:885
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:264
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
+
+#: js/update.js:61
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php: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 ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+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:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "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 ""
+
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+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"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+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:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, 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:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation. "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+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:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/bn_IN/files.po b/l10n/bn_IN/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..02b7c335e4ef1f55b6a0fe183f4f4585024cd97b
--- /dev/null
+++ b/l10n/bn_IN/files.po
@@ -0,0 +1,416 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:15
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:25 ajax/move.php:28
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:58 js/files.js:103
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:146
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:57
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:85
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:86
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:87
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:88
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:89
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:109
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:171
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:181
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:196
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1671
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1213
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1334
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1437 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1579 js/filelist.js:1618
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+msgstr ""
+
+#: templates/admin.php:4
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:6
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:16
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:21
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "Save"
+msgstr ""
+
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/bn_IN/files_encryption.po b/l10n/bn_IN/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..792d411a0f0c1150f43d02c8bb5068adf8df873b
--- /dev/null
+++ b/l10n/bn_IN/files_encryption.po
@@ -0,0 +1,201 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\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:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error. Please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+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:299
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:5
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:12
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:38
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:45
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:56
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:8
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:13
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:21
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:32
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:41
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:43
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:59
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/bn_IN/files_external.po b/l10n/bn_IN/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..9d35b57b0e71772a2d7b304fb23fc2e56e8decca
--- /dev/null
+++ b/l10n/bn_IN/files_external.po
@@ -0,0 +1,296 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, php-format
+msgid ""
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:623
+#, php-format
+msgid ""
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:625
+#, php-format
+msgid ""
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:27
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:97
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:132
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:150
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:168
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/bn_IN/files_sharing.po b/l10n/bn_IN/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..d1ea67d4d84a0e3df542b5baaedf35bc01bee372
--- /dev/null
+++ b/l10n/bn_IN/files_sharing.po
@@ -0,0 +1,103 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+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:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:52
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/bn_IN/files_trashbin.po b/l10n/bn_IN/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..c6a95d6457cf20468e88ad210e3777779d2c74a1
--- /dev/null
+++ b/l10n/bn_IN/files_trashbin.po
@@ -0,0 +1,60 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/bn_IN/files_versions.po b/l10n/bn_IN/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..a009336f260b2cd9f1c7227c02ec33a0282a09a5
--- /dev/null
+++ b/l10n/bn_IN/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:39
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:61
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:88
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:126
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:156
+msgid "Restore"
+msgstr ""
diff --git a/l10n/bn_IN/lib.po b/l10n/bn_IN/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..20e9890dcdde075dd0bb5d942b9daac4c1375d6f
--- /dev/null
+++ b/l10n/bn_IN/lib.po
@@ -0,0 +1,481 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:695
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:696
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:880
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+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 ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:144
+#: private/setup/oci.php:151 private/setup/oci.php:162
+#: private/setup/oci.php:169 private/setup/oci.php:178
+#: private/setup/oci.php:186 private/setup/oci.php:195
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:145
+#: private/setup/oci.php:152 private/setup/oci.php:163
+#: private/setup/oci.php:179 private/setup/oci.php:187
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:164
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:494
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:532
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:541
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:554 private/share/share.php:582
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:562
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:569
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:648
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:787
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:848
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:959
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:966
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:972
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1388
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1397
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1413
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1425
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1439
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/bn_IN/settings.po b/l10n/bn_IN/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..e034326876215527b9d8e4d5b1392e87deefbf35
--- /dev/null
+++ b/l10n/bn_IN/settings.po
@@ -0,0 +1,910 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:346
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:383
+msgid "Authentication method"
+msgstr ""
+
+#: 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:49
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+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/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+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:17
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:36
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:68
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:73
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:81
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:86 changepassword/controller.php:97
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:126
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:55
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+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:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:50 personal.php:51
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:50
+#, php-format
+msgid ""
+"You are accessing %s via HTTP. We strongly suggest you configure your server"
+" to require using HTTPS instead."
+msgstr ""
+
+#: templates/admin.php:64
+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:75 templates/admin.php:90
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:78
+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:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:108
+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:119
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: templates/admin.php:122
+msgid ""
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
+"newer because older versions are known to be broken. It is possible that "
+"this installation is not working correctly."
+msgstr ""
+
+#: templates/admin.php:133
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:138
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:142
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: templates/admin.php:146
+#, php-format
+msgid ""
+"We strongly suggest to install the required packages on your system to "
+"support one of the following locales: %s."
+msgstr ""
+
+#: templates/admin.php:158
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:161
+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:175
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:182
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:185
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:189
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:199
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:207
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:215
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:220
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:227
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:234
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:241
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:264
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:282
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:321
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:323
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:329
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:341
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:343
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:374
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:400
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:404
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:410
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:413
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:417
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:418
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:423
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:424
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:456
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:457
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:463 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:467 templates/personal.php:199
+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:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:38
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:49
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:51
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:53
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+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:38 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:49
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:61 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:78
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:81
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:100
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:111 templates/personal.php:112
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:131
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/bn_IN/user_ldap.po b/l10n/bn_IN/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..e2ea65e0b44e1a0807d20e3dad613867592cc964
--- /dev/null
+++ b/l10n/bn_IN/user_ldap.po
@@ -0,0 +1,587 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\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:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:83 lib/wizard.php:97
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:130
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:825 lib/wizard.php:837
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:1025
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, 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/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+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/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
+#: templates/settings.php:11
+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:14
+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:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitive LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, 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:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:47
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:54
+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:55
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:57
+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:58
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+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:62
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/bn_IN/user_webdavauth.po b/l10n/bn_IN/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..dba93a44a3a624dc73d10d37546a8a93ec935020
--- /dev/null
+++ b/l10n/bn_IN/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:2
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:6
+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/bs/core.po b/l10n/bs/core.po
index 8eb897aa256683eff13fbc86b0122e252ad94ccf..56f689e1011d7b74e5298becedccaeff420324dd 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: bs\n"
"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);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,212 +63,212 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Spašavam..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -295,140 +300,149 @@ msgstr ""
msgid "Share"
msgstr "Podijeli"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -460,18 +474,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -672,6 +687,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -797,7 +816,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/bs/files.po b/l10n/bs/files.po
index 103dceaf8f62d0908b0634408f4b308bfc8fe0cb..38d27b3af2fec3bebf819e0ef3bc67f479633f69 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,123 +177,123 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Podijeli"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Ime"
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "VeliÄina"
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -299,12 +303,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -341,68 +345,75 @@ msgstr ""
msgid "Save"
msgstr "Spasi"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Nova fascikla"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Fasikla"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/bs/files_encryption.po b/l10n/bs/files_encryption.po
index 818ff9d3614933d0152b7f4ef7320feb4d3f22fb..2264b620421f9425c985746c15679df348d57de8 100644
--- a/l10n/bs/files_encryption.po
+++ b/l10n/bs/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/bs/files_external.po b/l10n/bs/files_external.po
index d7ae3333e940d1df0714d5404e0206d8810f366f..e656955787bc2cc2b7f739109a1cd63a121614f7 100644
--- a/l10n/bs/files_external.po
+++ b/l10n/bs/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/bs/files_sharing.po b/l10n/bs/files_sharing.po
index 74a67fbf251c8c1afd194166d980fdf01960b711..1211e8e82774501ff1ba4e7ef08317d5a04cf170 100644
--- a/l10n/bs/files_sharing.po
+++ b/l10n/bs/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: bs\n"
"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);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/bs/files_trashbin.po b/l10n/bs/files_trashbin.po
index 7f286786a03d7fe0aad25ffec580b6ed7017c28d..30c9c123a58ac315e7c821190010439f30018e96 100644
--- a/l10n/bs/files_trashbin.po
+++ b/l10n/bs/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr "Ime"
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/bs/lib.po b/l10n/bs/lib.po
index cb89b60877280021582e4cc5a60e5dfdea92840d..e4a3d6148de8310e6abf22718c0fe5c8f11d0a37 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: bs\n"
"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);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po
index 484b7e50b12fd13dddb2b0d82519550fd957ad00..031cb1e3d390932b6f3771b26d7c4a2bbf29d516 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/bs/user_ldap.po b/l10n/bs/user_ldap.po
index e1eafb2bda351bb76c3fe141e921e6b0efc83a94..e75db6598cbd17262541b4a0a026db5352cae1c3 100644
--- a/l10n/bs/user_ldap.po
+++ b/l10n/bs/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,47 +90,59 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -134,7 +150,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -142,14 +158,30 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Spasi"
@@ -222,10 +254,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -289,6 +334,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 8a30a5a1a474046419bc113550b0e153210e2a15..8bba9ace4056f6e5a4e21f80502fb2d4f8cc8793 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "La data de venciment és en el passat."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "No s'ha pogut enviar correu als usuaris següents: %s"
@@ -41,6 +41,11 @@ msgstr "Desactivat el mode de manteniment"
msgid "Updated database"
msgstr "Actualitzada la base de dades"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "No s'han proporcionat imatges o fitxers"
@@ -61,207 +66,207 @@ msgstr "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho"
msgid "No crop data provided"
msgstr "No heu proporcionat dades del retall"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Diumenge"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Dilluns"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Dimarts"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Dimecres"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Dijous"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Divendres"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Dissabte"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Gener"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Febrer"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Març"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maig"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juny"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juliol"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Agost"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Setembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Octubre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Novembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Desembre"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Configuració"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Desant..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "segons enrere"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "fa %n minut"
msgstr[1] "fa %n minuts"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "fa %n hora"
msgstr[1] "fa %n hores"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "avui"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "ahir"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "fa %n dies"
msgstr[1] "fa %n dies"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "el mes passat"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "fa %n mes"
msgstr[1] "fa %n mesos"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "l'any passat"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "anys enrere"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Escull"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Error en carregar la plantilla de cà rrega de fitxers: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "SÃ"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Escull"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Error en carregar la plantilla de cà rrega de fitxers: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "D'acord"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Error en carregar la plantilla de missatge: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
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:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Un fitxer en conflicte"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Fitxers nous"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Fitxers que ja existeixen"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Quin fitxer voleu conservar?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
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:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancel·la"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continua"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(selecciona-ho tot)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} seleccionats)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Error en carregar la plantilla de fitxer existent"
@@ -293,140 +298,149 @@ msgstr "Compartit"
msgid "Share"
msgstr "Comparteix"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Error en compartir"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Error en deixar de compartir"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Error en canviar els permisos"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartit amb vos i amb el grup {group} per {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Compartit amb vos per {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "Comparteix amb usuari o grup..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Enllaç de compartició"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Protegir amb contrasenya"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Contrasenya"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Permet pujada pública"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Enllaç per correu electrónic amb la persona"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Envia"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Estableix la data de venciment"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Data de venciment"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Comparteix per correu electrònic"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "No s'ha trobat ningú"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "grup"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "No es permet compartir de nou"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Compartit en {item} amb {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Deixa de compartir"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "notifica per correu electrònic"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "pot editar"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "control d'accés"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "crea"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "actualitza"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "elimina"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "comparteix"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Protegeix amb contrasenya"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Error en eliminar la data de venciment"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Error en establir la data de venciment"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Enviant..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "El correu electrónic s'ha enviat"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "AvÃs"
@@ -458,18 +472,19 @@ msgstr "Error en carregar la plantilla de dià leg: {error}"
msgid "No tags selected for deletion."
msgstr "No heu seleccionat les etiquetes a eliminar."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Carregueu la pà gina de nou."
-#: 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 "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">la comunitat ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "L'actualització ha estat correcte. Ara us redirigim a ownCloud."
@@ -670,6 +685,10 @@ msgstr "Per informació de com configurar el servidor, comproveu la <a href=\"%s
msgid "Create an <strong>admin account</strong>"
msgstr "Crea un <strong>compte d'administrador</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Contrasenya"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Emmagatzematge i base de dades"
@@ -795,8 +814,27 @@ msgstr "Grà cies per la paciència."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "S'està actualitzant ownCloud a la versió %s, pot trigar una estona."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index dda159f5b590dadc93879af7434fe3f5e2c96256..07aa78e223931870eac93616f029bd4aca15a974 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -7,12 +7,13 @@
# jmontane <joan@montane.cat>, 2013
# Josep Tomàs <jtomas.binsoft@gmail.com>, 2013
# mickymadsystems <micky@madsystems.cat>, 2014
+# black_star <peredelgrau@hotmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -31,7 +32,7 @@ msgstr "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom"
msgid "Could not move %s"
msgstr " No s'ha pogut moure %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "El nom del fitxer no pot ser buit."
@@ -40,18 +41,18 @@ msgstr "El nom del fitxer no pot ser buit."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" no es un fitxer và lid."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "El nóm no és và lid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "La carpeta de destà s'ha mogut o eliminat."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -127,44 +128,48 @@ msgstr "Falta un fitxer temporal"
msgid "Failed to write to disk"
msgstr "Ha fallat en escriure al disc"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "No hi ha prou espai disponible"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "La pujada ha fallat. El fitxer pujat no s'ha trobat."
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Directori no và lid."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Fitxers"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
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:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "Mida total del fitxer {size1} excedeix el lÃmit de pujada {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "No hi ha prou espai lliure, està carregant {size1} però només pot {size2}"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "La pujada s'ha cancel·lat."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "No hi ha resposta del servidor."
@@ -177,120 +182,120 @@ msgstr "Hi ha una pujada en curs. Si abandoneu la pà gina la pujada es cancel·l
msgid "URL cannot be empty"
msgstr "L'URL no pot ser buit"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} ja existeix"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "No s'ha pogut crear el fitxer"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "No s'ha pogut crear la carpeta"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Error en obtenir la URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Comparteix"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Esborra permanentment"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Reanomena"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Pendent"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
-msgstr ""
+msgstr "Error en moure el fitxer."
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Error en moure el fitxer"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Error"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "No es pot canviar el nom de fitxer"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Error en esborrar el fitxer."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Nom"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Mida"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Modificat"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n carpeta"
msgstr[1] "%n carpetes"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fitxer"
msgstr[1] "%n fitxers"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Pujant %n fitxer"
msgstr[1] "Pujant %n fitxers"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" no es un fitxer và lid."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou."
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "La clau privada de l'aplicació d'encriptació no és và lida! Actualitzeu la contrasenya de la clau privada a l'arranjament personal per recuperar els fitxers encriptats."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -300,12 +305,12 @@ msgstr "L'encriptació s'ha desactivat però els vostres fitxers segueixen encri
msgid "{dirs} and {files}"
msgstr "{dirs} i {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s no es pot canviar el nom"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -342,68 +347,75 @@ msgstr "Mida mà xima d'entrada per fitxers ZIP"
msgid "Save"
msgstr "Desa"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Nou"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Nou fitxer de text"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Fitxer de text"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Carpeta nova"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Carpeta"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Des d'enllaç"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Fitxers esborrats"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Cancel·la la pujada"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "No teniu permisos per a pujar o crear els fitxers aquÃ"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Res per aquÃ. Pugeu alguna cosa!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Baixa"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Esborra"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "La pujada és massa gran"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "S'estan escanejant els fitxers, espereu"
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Actualment escanejant"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index 3865dfb3134226ae6bc6b931aad8a7ec0ca7d5d9..e42b9cbcc6ecf85f60dbb024b9618c2fab755bca 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 08:40+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -79,9 +79,9 @@ msgstr "No es pot desencriptar aquest fitxer, probablement és un fitxer compart
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Error desconegut. Comproveu l'arranjament del sistema o contacteu amb l'administrador"
+msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "Assegureu-vos que teniu instal·lat PHP 5.3.3 o una versió superior i que està activat Open SSL i habilitada i configurada correctament l'extensió de PHP. De moment, l'aplicació d'encriptació s'ha desactivat."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Els usuaris següents no estan configurats per a l'encriptació:"
@@ -114,91 +114,91 @@ msgstr "Vés directament a"
msgid "personal settings"
msgstr "arranjament personal"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Xifrat"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Activa la clau de recuperació (permet recuperar fitxers d'usuaris en cas de pèrdua de contrasenya):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Clau de recuperació de la contrasenya"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Repetiu la clau de recuperació de contrasenya"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Activat"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Desactivat"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Canvia la clau de recuperació de contrasenya:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Antiga clau de recuperació de contrasenya"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Nova clau de recuperació de contrasenya"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Repetiu la nova clau de recuperació de contrasenya"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Canvia la contrasenya"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "La clau privada ja no es correspon amb la contrasenya d'accés:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Establiu la vostra contrasenya clau en funció de la contrasenya actual d'accés."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Si no recordeu la contrasenya anterior podeu demanar a l'administrador que recuperi els vostres fitxers."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Contrasenya anterior d'accés"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Contrasenya d'accés actual"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Actualitza la contrasenya de clau privada"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Habilita la recuperació de contrasenya:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Activar aquesta opció us permetrà obtenir de nou accés als vostres fitxers encriptats en cas de perdre la contrasenya"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "S'han actualitzat els arranjaments de recuperació de fitxers"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "No s'ha pogut actualitzar la recuperació de fitxers"
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index 6a090c364b959c8a71313c6451a3faeeee7bfd7c..984713eacaa3678041f4075273a8c83abd8e15ee 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -4,14 +4,15 @@
#
# Translators:
# rogerc, 2014
+# Josep Torné <josep@substantiu.com>, 2014
# rogerc, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-23 12:26+0000\n"
+"Last-Translator: Josep Torné <josep@substantiu.com>\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"
@@ -23,157 +24,161 @@ msgstr ""
msgid "Local"
msgstr "Local"
-#: appinfo/app.php:36
+#: appinfo/app.php:37
msgid "Location"
msgstr "Ubicació"
-#: appinfo/app.php:39
+#: appinfo/app.php:40
msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
-#: appinfo/app.php:41
+#: appinfo/app.php:43
msgid "Key"
-msgstr ""
+msgstr "Clau"
-#: appinfo/app.php:42
+#: appinfo/app.php:44
msgid "Secret"
-msgstr ""
+msgstr "Secret"
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
msgid "Bucket"
msgstr ""
-#: appinfo/app.php:47
+#: appinfo/app.php:49
msgid "Amazon S3 and compliant"
msgstr ""
-#: appinfo/app.php:49
+#: appinfo/app.php:52
msgid "Access Key"
-msgstr ""
+msgstr "Clau d'accés"
-#: appinfo/app.php:50
+#: appinfo/app.php:53
msgid "Secret Key"
-msgstr ""
+msgstr "Clau secreta"
-#: appinfo/app.php:52
+#: appinfo/app.php:55
msgid "Hostname (optional)"
msgstr ""
-#: appinfo/app.php:53
+#: appinfo/app.php:56
msgid "Port (optional)"
msgstr ""
-#: appinfo/app.php:54
+#: appinfo/app.php:57
msgid "Region (optional)"
msgstr ""
-#: appinfo/app.php:55
+#: appinfo/app.php:58
msgid "Enable SSL"
-msgstr ""
+msgstr "Habilita SSL"
-#: appinfo/app.php:56
+#: appinfo/app.php:59
msgid "Enable Path Style"
msgstr ""
-#: appinfo/app.php:63
+#: appinfo/app.php:67
msgid "App key"
msgstr ""
-#: appinfo/app.php:64
+#: appinfo/app.php:68
msgid "App secret"
msgstr ""
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
+msgid "Host"
+msgstr "Equip remot"
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
msgid "Username"
msgstr "Nom d'usuari"
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
msgid "Password"
msgstr "Contrasenya"
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
msgid "Root"
msgstr ""
-#: appinfo/app.php:77
+#: appinfo/app.php:82
msgid "Secure ftps://"
-msgstr ""
+msgstr "Protocol segur ftps://"
-#: appinfo/app.php:84
+#: appinfo/app.php:90
msgid "Client ID"
-msgstr ""
+msgstr "Client ID"
-#: appinfo/app.php:85
+#: appinfo/app.php:91
msgid "Client secret"
msgstr ""
-#: appinfo/app.php:92
+#: appinfo/app.php:98
msgid "OpenStack Object Storage"
msgstr ""
-#: appinfo/app.php:94
+#: appinfo/app.php:101
msgid "Username (required)"
-msgstr ""
+msgstr "Nom d'usuari (necessari)"
-#: appinfo/app.php:95
+#: appinfo/app.php:102
msgid "Bucket (required)"
msgstr ""
-#: appinfo/app.php:96
+#: appinfo/app.php:103
msgid "Region (optional for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:97
+#: appinfo/app.php:104
msgid "API Key (required for Rackspace Cloud Files)"
msgstr ""
-#: appinfo/app.php:98
+#: appinfo/app.php:105
msgid "Tenantname (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:99
+#: appinfo/app.php:106
msgid "Password (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:100
+#: appinfo/app.php:107
msgid "Service Name (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:101
+#: appinfo/app.php:108
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:102
+#: appinfo/app.php:109
msgid "Timeout of HTTP requests in seconds (optional)"
msgstr ""
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
msgid "Share"
msgstr "Comparteix"
-#: appinfo/app.php:119
+#: appinfo/app.php:127
msgid "SMB / CIFS using OC login"
msgstr ""
-#: appinfo/app.php:122
+#: appinfo/app.php:131
msgid "Username as share"
-msgstr ""
+msgstr "Nom d'usuari per compartir"
+
+#: appinfo/app.php:141 appinfo/app.php:152
+msgid "URL"
+msgstr "URL"
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:145 appinfo/app.php:156
msgid "Secure https://"
-msgstr ""
+msgstr "Protocol segur https://"
-#: appinfo/app.php:144
+#: appinfo/app.php:155
msgid "Remote subfolder"
-msgstr ""
+msgstr "Subcarpeta remota"
#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
msgid "Access granted"
@@ -199,29 +204,29 @@ msgstr "Error en configurar l'emmagatzemament Google Drive"
msgid "Saved"
msgstr "Desat"
-#: lib/config.php:598
+#: lib/config.php:674
msgid "<b>Note:</b> "
msgstr "<b>Nota:</b> "
-#: lib/config.php:608
+#: lib/config.php:684
msgid " and "
msgstr "i"
-#: lib/config.php:630
+#: lib/config.php:706
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Nota:</b> El suport cURL no està activat o instal·lat a PHP. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li."
-#: lib/config.php:632
+#: lib/config.php:708
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Nota:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li."
-#: lib/config.php:634
+#: lib/config.php:710
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index f5f95b8297a340291888319dc126daed231059ba..551eece2547512134508a250f5fb9fdebfe1236a 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Compartits per {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Aquest compartit està protegit amb contrasenya"
@@ -34,6 +58,14 @@ msgstr "la contrasenya és incorrecta. Intenteu-ho de nou."
msgid "Password"
msgstr "Contrasenya"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Aquest enllaç sembla que no funciona."
@@ -62,11 +94,11 @@ msgstr "Per més informació contacteu amb qui us ha enviat l'enllaç."
msgid "Download"
msgstr "Baixa"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Baixa %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Enllaç directe"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index 936cd31894196408f859d42a4bd6c77fb9c35fcf..408e78b4e854aebd1f880ec6e89105a84adf7d57 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "No s'ha pogut esborrar permanentment %s"
msgid "Couldn't restore %s"
msgstr "No s'ha pogut restaurar %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Fitxers esborrats"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Recupera"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Error"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Fitxers eliminats"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "restaurat"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "La paperera està buida!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nom"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Recupera"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Eliminat"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Esborra"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 8ddb3e70c15c08c650ffe814e3c477c90a64eb41..497d29895c084c4661ce4b17b46fa43393acb60f 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -77,23 +77,23 @@ msgstr "Imatge no và lida"
msgid "web services under your control"
msgstr "controleu els vostres serveis web"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "La baixada en ZIP està desactivada."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Els fitxers s'han de baixar d'un en un."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Torna a Fitxers"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Els fitxers seleccionats son massa grans per generar un fitxer zip."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -279,127 +279,138 @@ msgstr "Establiu un nom d'usuari per l'administrador."
msgid "Set an admin password."
msgstr "Establiu una contrasenya per l'administrador."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfÃcie WebDAV sembla no funcionar correctament."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Comproveu les <a href='%s'>guies d'instal·lació</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s ha compartit »%s« amb tu"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "No s'ha trobat la categoria \"%s\""
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 8c9eeec16ef108f8d6e07e9c201f4e2bf8b9b406..9c6f2c937eb4da1a6fa62a87e4432b97ea0ac6c9 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -50,15 +50,15 @@ msgstr "El correu electrónic s'ha enviat"
msgid "You need to set your user email before being able to send test emails."
msgstr "Heu d'establir un nom d'usuari abans de poder enviar correus de prova."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Mode d'enviament"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Xifrat"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Mètode d'autenticació"
@@ -101,6 +101,16 @@ msgstr "No es poden desencriptar els fitxers. Comproveu owncloud.log o demaneu-h
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "No s'han pogut desencriptar els fitxers, comproveu la contrasenya i proveu-ho de nou"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "S'ha desat el correu electrònic"
@@ -117,6 +127,16 @@ msgstr "No es pot eliminar el grup"
msgid "Unable to delete user"
msgstr "No es pot eliminar l'usuari"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "S'ha canviat l'idioma"
@@ -172,7 +192,7 @@ msgstr "El dorsal no permet canviar la contrasenya, però la clau d'encripació
msgid "Unable to change password"
msgstr "No es pot canviar la contrasenya"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Enviant..."
@@ -228,34 +248,42 @@ msgstr "Actualitza"
msgid "Updated"
msgstr "Actualitzada"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Seleccioneu una imatge de perfil"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Contrasenya massa feble"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Contrasenya feble"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Contrasenya passable"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Contrasenya bona"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Contrasenya forta"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Desencriptant fitxers... Espereu, això pot trigar una estona."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "esborrat"
@@ -268,8 +296,8 @@ msgstr "desfés"
msgid "Unable to remove user"
msgstr "No s'ha pogut eliminar l'usuari"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grups"
@@ -301,7 +329,7 @@ msgstr "Heu de facilitar una contrasenya và lida"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "AvÃs: la carpeta Home per l'usuari \"{user}\" ja existeix"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Català "
@@ -369,7 +397,7 @@ msgid ""
"root."
msgstr "La carpeta de dades i els vostres fitxersprobablement són accessibles des d'Internet. La fitxer .htaccess no funciona. Us recomanem que configureu el servidor web de tal manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de l'arrel de documents del servidor web."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "AvÃs de configuració"
@@ -384,53 +412,65 @@ 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>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "No s'ha trobat el mòdul 'fileinfo'"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "El mòdul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mòdul per obtenir millors resultats amb la detecció mime-type."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "La versió de PHP és obsoleta"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "La versió de PHP és obsoleta. Us recomanem fermament que actualitzeu a la versió 5.3.8 o superior perquè les versions anteriors no funcionen. La instal·lació podria no funcionar correctament."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Locale no funciona"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "No s'ha pogut establir cap localització del sistema amb suport per UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Això podria comportar problemes amb alguns carà cters en els noms dels fitxer."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Us recomanem que instal·leu els paquets necessaris en el sistema per donar suport a alguna de les localitzacions següents: %s"
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "La connexió a internet no funciona"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -439,198 +479,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Aquest servidor no té cap connexió a internet que funcioni. Això significa que algunes de les caracterÃstiques com el muntatge d'emmagatzemament extern, les notificacions quant a actualitzacions o la instal·lació d'aplicacions de tercers no funcionarà . L'accés remot a fitxers i l'enviament de correus electrònics podria tampoc no funcionar. Us suggerim que habiliteu la connexió a internet per aquest servidor si voleu tenir totes les caracterÃstiques."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "L'últim cron s'ha executat el %s"
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "L'últim cron es va executar a %s. Fa més d'una hora, alguna cosa sembla que va malament."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "El cron encara no s'ha executat!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Executa una tasca per cada paquet carregat"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Utilitza el servei cron del sistema per fer una crida al fitxer cron.php cada 15 minuts."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Compartir"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Habilita l'API de compartir"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Permet que les aplicacions utilitzin l'API de compartir"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Permet enllaços"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permet als usuaris compartir elements amb el públic amb enllaços"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Permet pujada pública"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permet als usuaris habilitar pujades de tercers en les seves carpetes compartides al públic"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Permet als usuaris compartir elements amb el públic amb enllaços"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Permet compartir de nou"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Permet als usuaris compartir de nou elements ja compartits amb ells"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Permet compartir amb qualsevol"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Permet als usuaris compartir només amb els usuaris del seu grup"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Permet notificacions per correu electrónic"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Seguretat"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Força HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Força la connexió dels clients a %s a través d'una connexió encriptada."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Connecteu a %s a través de HTTPS per habilitar o inhabilitar l'accés SSL."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Servidor de correu"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "S'usa per enviar notificacions."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Des de l'adreça"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Es requereix autenticació"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Adreça del servidor"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Port"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Credencials"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "Nom d'usuari SMTP"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "Contrasenya SMTP"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Prova l'arranjament del correu"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Envia correu"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Registre"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Nivell de registre"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Més"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Menys"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versió"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -690,7 +738,7 @@ msgstr "Suport comercial"
#: templates/personal.php:8
msgid "Get the apps to sync your files"
-msgstr "Obtén les aplicacions per sincronitzar fitxers"
+msgstr "Obtingueu les aplicacions per sincronitzar els vostres fitxers"
#: templates/personal.php:19
msgid "Show First Run Wizard again"
@@ -783,29 +831,33 @@ msgstr "Idioma"
msgid "Help translate"
msgstr "Ajudeu-nos amb la traducció"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Contrasenya d'accés"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Desencripta tots els fitxers"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Nom d'accés"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 977b13762827a1a432e6965b0f2cd3e6a0f9fa20..6cd3b4e2000c41481f405a9c253f0c325d702242 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -4,15 +4,16 @@
#
# Translators:
# rogerc, 2013-2014
+# Josep Torné <josep@substantiu.com>, 2014
# rogerc, 2013
# victek, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -73,6 +74,10 @@ msgstr "Voleu prendre l'arranjament de la configuració actual del servidor?"
msgid "Keep settings?"
msgstr "Voleu mantenir la configuració?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "No es pot afegir la configuració del servidor"
@@ -89,6 +94,18 @@ msgstr "Èxit"
msgid "Error"
msgstr "Error"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Configuració correcte"
@@ -129,28 +146,44 @@ msgstr "Voleu eliminar la configuració actual del servidor?"
msgid "Confirm Deletion"
msgstr "Confirma l'eliminació"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "S'ha trobat %s grup"
msgstr[1] "S'han trobat %s grups"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "S'ha trobat %s usuari"
msgstr[1] "S'han trobat %s usuaris"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Ordinador central no và lid"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "La caracterÃstica desitjada no s'ha trobat"
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtre de grup"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Desa"
@@ -223,10 +256,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "Defineix el filtre a aplicar quan s'intenta iniciar la sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió. Per exemple: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Afegeix la configuració del servidor"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Equip remot"
@@ -290,6 +336,14 @@ msgstr "Enrera"
msgid "Continue"
msgstr "Continua"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avançat"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
@@ -354,11 +408,11 @@ msgstr "No es recomana, useu-ho només com a prova! Importeu el certificat SSL d
#: templates/settings.php:28
msgid "Cache Time-To-Live"
-msgstr "Memòria de cau Time-To-Live"
+msgstr "Memòria cau Time-To-Live"
#: templates/settings.php:28
msgid "in seconds. A change empties the cache."
-msgstr "en segons. Un canvi buidarà la memòria de cau."
+msgstr "en segons. Un canvi buidarà la memòria cau."
#: templates/settings.php:30
msgid "Directory Settings"
@@ -526,7 +580,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 "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisió i reconèixer els usuaris, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A més, la DN es posa a la memòria de cau per reduir la interacció LDAP, però no s'usa per identificació. En cas que la DN canvïi, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producció, només en un estadi de prova o experimental."
+msgstr "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisió i reconèixer els usuaris, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A més, la DN es posa a la memòria cau per reduir la interacció LDAP, però no s'usa per identificació. En cas que la DN canvïi, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producció, només en un estadi de prova o experimental."
#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/ca@valencia/core.po b/l10n/ca@valencia/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..1415d6625e5d1f5f73b101e6e868a3c4d3dd34b2
--- /dev/null
+++ b/l10n/ca@valencia/core.po
@@ -0,0 +1,843 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca@valencia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:10
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:13
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:16
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+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:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:496
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:596
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1220
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1221
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1222
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1223
+msgid "today"
+msgstr ""
+
+#: js/js.js:1224
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1225
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1226
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1227
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1228
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1229
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:69 js/share.js:84 js/share.js:127
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:130
+msgid "Share"
+msgstr ""
+
+#: js/share.js:195 js/share.js:208 js/share.js:215 js/share.js:822
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:197 js/share.js:885
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:208
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:215
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:225
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:227
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:251
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:257
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:263
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:265
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:270
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:272
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:278
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:282
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:283
+msgid "Send"
+msgstr ""
+
+#: js/share.js:288
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:289
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:326
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:329
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:377 js/share.js:438
+msgid "group"
+msgstr ""
+
+#: js/share.js:410
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:454
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:476
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:484
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:487
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:489
+msgid "access control"
+msgstr ""
+
+#: js/share.js:492
+msgid "create"
+msgstr ""
+
+#: js/share.js:495
+msgid "update"
+msgstr ""
+
+#: js/share.js:498
+msgid "delete"
+msgstr ""
+
+#: js/share.js:501
+msgid "share"
+msgstr ""
+
+#: js/share.js:803
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:822
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:843
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:872
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:883
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:907
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:264
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
+
+#: js/update.js:61
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php: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 ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+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:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "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 ""
+
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+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"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+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:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, 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:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation. "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+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:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/ca@valencia/files.po b/l10n/ca@valencia/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..fdaa61f73986dc8ab0db01a17912c29ac80372e5
--- /dev/null
+++ b/l10n/ca@valencia/files.po
@@ -0,0 +1,416 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca@valencia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:15
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:25 ajax/move.php:28
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:58 js/files.js:103
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:146
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:57
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:85
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:86
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:87
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:88
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:89
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:109
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:171
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:181
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:196
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1188
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:211
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:224
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:226 templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: js/fileactions.js:262
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:314
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:619 js/filelist.js:1691
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1139
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1147
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1147
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1225
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1346
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1449 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1450 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1451 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1599 js/filelist.js:1638
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+msgstr ""
+
+#: templates/admin.php:4
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:6
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:16
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:21
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "Save"
+msgstr ""
+
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/ca@valencia/files_encryption.po b/l10n/ca@valencia/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..78bc1c95a4c314a3d58d4f9ae6054d704c7be146
--- /dev/null
+++ b/l10n/ca@valencia/files_encryption.po
@@ -0,0 +1,201 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca@valencia\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:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error. Please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+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:299
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:5
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:12
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:38
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:45
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:56
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:8
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:13
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:21
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:32
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:41
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:43
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:59
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ca@valencia/files_external.po b/l10n/ca@valencia/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..3f96fb236bd8f0aec0f608966d19fcb936de22a4
--- /dev/null
+++ b/l10n/ca@valencia/files_external.po
@@ -0,0 +1,296 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca@valencia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:37
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:40
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:43
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:44
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:45 appinfo/app.php:54
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:57
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:58
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:59
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:67
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:68
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:82
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:90
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:91
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:103
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:104
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:105
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:106
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:107
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:108
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:109
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:122 appinfo/app.php:132
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:127
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:131
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:141 appinfo/app.php:152
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:145 appinfo/app.php:156
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:155
+msgid "Remote subfolder"
+msgstr ""
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:674
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:684
+msgid " and "
+msgstr ""
+
+#: lib/config.php:706
+#, php-format
+msgid ""
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:708
+#, php-format
+msgid ""
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:710
+#, php-format
+msgid ""
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:27
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:97
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:132
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:150
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:168
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/ca@valencia/files_sharing.po b/l10n/ca@valencia/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..93d817b5a7ceb9a05d0ad6355b65c55658adb5f2
--- /dev/null
+++ b/l10n/ca@valencia/files_sharing.po
@@ -0,0 +1,103 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca@valencia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+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:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:52
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/ca@valencia/files_trashbin.po b/l10n/ca@valencia/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..f8905160015971bd54903a314f21e611901b9bb2
--- /dev/null
+++ b/l10n/ca@valencia/files_trashbin.po
@@ -0,0 +1,60 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca@valencia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:52 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ca@valencia/files_versions.po b/l10n/ca@valencia/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..e771036143cb52639e64c0f01e7ac2aa8665325d
--- /dev/null
+++ b/l10n/ca@valencia/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca@valencia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:48
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:70
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:97
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:135
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:165
+msgid "Restore"
+msgstr ""
diff --git a/l10n/ca@valencia/lib.po b/l10n/ca@valencia/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..498da620580d30a35ccf0a26040b30b913a8d9ea
--- /dev/null
+++ b/l10n/ca@valencia/lib.po
@@ -0,0 +1,481 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca@valencia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:710
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:711
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:880
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:138
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:144
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:157
+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 ""
+
+#: private/installer.php:167
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:180
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:144
+#: private/setup/oci.php:151 private/setup/oci.php:162
+#: private/setup/oci.php:169 private/setup/oci.php:178
+#: private/setup/oci.php:186 private/setup/oci.php:195
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:145
+#: private/setup/oci.php:152 private/setup/oci.php:163
+#: private/setup/oci.php:179 private/setup/oci.php:187
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:164
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:494
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:532
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:541
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:554 private/share/share.php:582
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:562
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:569
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:648
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:787
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:848
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:959
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:966
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:972
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1388
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1397
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1413
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1425
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1439
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:238
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:243
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:247
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:252
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/ca@valencia/settings.po b/l10n/ca@valencia/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..bc1a846f0532662ea1d3b370046922c2aeacacf9
--- /dev/null
+++ b/l10n/ca@valencia/settings.po
@@ -0,0 +1,910 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca@valencia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:346
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:383
+msgid "Authentication method"
+msgstr ""
+
+#: 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:49
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+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/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+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:17
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:36
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:68
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:73
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:81
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:86 changepassword/controller.php:97
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:126
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:55
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+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:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:50 personal.php:51
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:50
+#, php-format
+msgid ""
+"You are accessing %s via HTTP. We strongly suggest you configure your server"
+" to require using HTTPS instead."
+msgstr ""
+
+#: templates/admin.php:64
+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:75 templates/admin.php:90
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:78
+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:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:108
+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:119
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: templates/admin.php:122
+msgid ""
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
+"newer because older versions are known to be broken. It is possible that "
+"this installation is not working correctly."
+msgstr ""
+
+#: templates/admin.php:133
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:138
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:142
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: templates/admin.php:146
+#, php-format
+msgid ""
+"We strongly suggest to install the required packages on your system to "
+"support one of the following locales: %s."
+msgstr ""
+
+#: templates/admin.php:158
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:161
+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:175
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:182
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:185
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:189
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:199
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:207
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:215
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:220
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:227
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:234
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:241
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:264
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:282
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:321
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:323
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:329
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:341
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:343
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:374
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:400
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:404
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:410
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:413
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:417
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:418
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:423
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:424
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:456
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:457
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:463 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:467 templates/personal.php:199
+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:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:38
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:49
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:51
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:53
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+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:38 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:49
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:61 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:78
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:81
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:100
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:111 templates/personal.php:112
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:131
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/ca@valencia/user_ldap.po b/l10n/ca@valencia/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..af75d25b42545f5a82d4dbb7cb6908f0ceee8fad
--- /dev/null
+++ b/l10n/ca@valencia/user_ldap.po
@@ -0,0 +1,587 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca@valencia\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:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:83 lib/wizard.php:97
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:130
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:825 lib/wizard.php:837
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:1025
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, 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/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+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/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
+#: templates/settings.php:11
+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:14
+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:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitive LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, 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:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:47
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:54
+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:55
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:57
+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:58
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+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:62
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/ca@valencia/user_webdavauth.po b/l10n/ca@valencia/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..af609cb2865c0bcf308fbca68aaa7fea77ef6cbe
--- /dev/null
+++ b/l10n/ca@valencia/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca@valencia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:2
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:6
+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/cs_CZ/core.po b/l10n/cs_CZ/core.po
index c7095624f70261d13a4431e841f7ac2f91fe2c53..93f5b25cf2c76a4782eb719da08cedfa617915e4 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -26,11 +26,11 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "Datum expirace je v minulosti."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Nebylo možné odeslat e-mail následujÃcÃm uživatelům: %s"
@@ -47,6 +47,11 @@ msgstr "Vypnut režim údržby"
msgid "Updated database"
msgstr "Zaktualizována databáze"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Soubor nebo obrázek nebyl zadán"
@@ -67,212 +72,212 @@ msgstr "DoÄasný profilový obrázek nenà k dispozici, zkuste to znovu"
msgid "No crop data provided"
msgstr "Nebyla poskytnuta data pro oÅ™Ãznutà obrázku"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Neděle"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "PondÄ›lÃ"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Úterý"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Středa"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "ÄŒtvrtek"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Pátek"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sobota"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Leden"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Únor"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Březen"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Duben"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Květen"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "ÄŒerven"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "ÄŒervenec"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Srpen"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "ZářÃ"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "ŘÃjen"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Listopad"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Prosinec"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "NastavenÃ"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Ukládám..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "před pár vteřinami"
-#: js/js.js:1241
+#: js/js.js:1212
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:1242
+#: js/js.js:1213
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:1243
+#: js/js.js:1214
msgid "today"
msgstr "dnes"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "vÄera"
-#: js/js.js:1245
+#: js/js.js:1216
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:1246
+#: js/js.js:1217
msgid "last month"
msgstr "minulý mÄ›sÃc"
-#: js/js.js:1247
+#: js/js.js:1218
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:1248
+#: js/js.js:1219
msgid "last year"
msgstr "minulý rok"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "před lety"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Vybrat"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Chyba při nahrávánà šablony výběru souborů: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ano"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Vybrat"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Chyba při nahrávánà šablony výběru souborů: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Chyba při nahrávánà šablony zprávy: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} souborový konflikt"
msgstr[1] "{count} souborové konflikty"
msgstr[2] "{count} souborových konfliktů"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Jeden konflikt souboru"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nové soubory"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Již existujÃcà soubory"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Které soubory chcete ponechat?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Pokud zvolÃte obÄ› verze, zkopÃrovaný soubor bude mÃt název doplnÄ›ný o ÄÃslo."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Zrušit"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "PokraÄovat"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(vybráno vše)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "(vybráno {count})"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Chyba při nahrávánà šablony existence souboru"
@@ -304,140 +309,149 @@ msgstr "SdÃlené"
msgid "Share"
msgstr "SdÃlet"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Chyba"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Chyba pÅ™i sdÃlenÃ"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Chyba pÅ™i ruÅ¡enà sdÃlenÃ"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Chyba pÅ™i zmÄ›nÄ› oprávnÄ›nÃ"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "S Vámi a skupinou {group} sdÃlà {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "S Vámi sdÃlà {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "SdÃlet s uživatelem nebo skupinou"
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "SdÃlet odkaz"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "VeÅ™ejný odkaz nevyprÅ¡Ã dÅ™Ãve než za {days} dnà po svém vytvoÅ™enÃ"
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr "Ve výchozÃm nastavenà vyprÅ¡Ã veÅ™ejný odkaz za {days} dnÃ"
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Chránit heslem"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Heslo"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr "Zadej heslo pro tento veřejný odkaz"
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Povolit veÅ™ejné nahrávánÃ"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Odeslat osobÄ› odkaz e-mailem"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Odeslat"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Nastavit datum vypršenà platnosti"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Datum vypršenà platnosti"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "SdÃlet e-mailem:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Žádnà lidé nenalezeni"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "skupina"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "SdÃlenà již sdÃlené položky nenà povoleno"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "SdÃleno v {item} s {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "ZruÅ¡it sdÃlenÃ"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "upozornit e-mailem"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "lze upravovat"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "Å™Ãzenà pÅ™Ãstupu"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "vytvořit"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "aktualizovat"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "smazat"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "sdÃlet"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Chráněno heslem"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Chyba při odstraňovánà data vypršenà platnosti"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Chyba při nastavenà data vypršenà platnosti"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "OdesÃlám ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "E-mail odeslán"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "VarovánÃ"
@@ -469,18 +483,19 @@ msgstr "Chyba pÅ™i naÄÃtánà šablony dialogu: {error}"
msgid "No tags selected for deletion."
msgstr "Žádné Å¡tÃtky nebyly vybrány ke smazánÃ."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "NaÄtÄ›te stránku znovu, prosÃm."
-#: 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 "Aktualizace neprobÄ›hla úspěšnÄ›. Nahlaste prosÃm problém do <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">evidence chyb ownCloud</a>"
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Aktualizace byla úspěšná. Přesměrovávám na ownCloud."
@@ -681,6 +696,10 @@ msgstr "Pro informace, jak správnÄ› nastavit váš server, se podÃvejte do <a
msgid "Create an <strong>admin account</strong>"
msgstr "VytvoÅ™it <strong>úÄet správce</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Heslo"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Úložiště & databáze"
@@ -806,8 +825,27 @@ msgstr "Děkuji za trpělivost."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Aktualizuji ownCloud na verzi %s, bude to chvÃli trvat."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index d91cfd16636cafc836229fc72b9eda8fa24e75f0..a387fd1d77ca83b8c43012876c0dd4a5cde5369a 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
-"Last-Translator: svetlemodry <jaroslav@lichtblau.cz>\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -37,7 +37,7 @@ msgstr "Nelze přesunout %s - již existuje soubor se stejným názvem"
msgid "Could not move %s"
msgstr "Nelze přesunout %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Název souboru nemůže být prázdný řetězec."
@@ -46,18 +46,18 @@ msgstr "Název souboru nemůže být prázdný řetězec."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" je neplatným názvem souboru."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "CÃlová složka byla pÅ™esunuta nebo smazána."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -133,44 +133,48 @@ msgstr "Chybà adresář pro doÄasné soubory"
msgid "Failed to write to disk"
msgstr "Zápis na disk selhal"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Nedostatek dostupného úložného prostoru"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Nahrávánà selhalo. Nepodařilo se nalézt nahraný soubor."
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Nahrávánà selhalo. NepodaÅ™ilo se zÃskat informace o souboru."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Neplatný adresář"
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Soubory"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "Nelze nahrát soubor {filename}, protože je to buÄ adresář nebo má velikost 0 bytů"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "Celková velikost souboru {size1} pÅ™ekraÄuje povolenou velikost pro nahrávánà {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Nenà dostatek mÃsta pro uloženÃ, velikost souboru je {size1}, zbývá pouze {size2}"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "OdesÃlánà zruÅ¡eno."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "NepodaÅ™ilo se zÃskat výsledek ze serveru."
@@ -183,123 +187,123 @@ msgstr "ProbÃhá odesÃlánà souboru. OpuÅ¡tÄ›nà stránky způsobà zruÅ¡enÃ
msgid "URL cannot be empty"
msgstr "URL nemůže zůstat prázdná"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} již existuje"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Nepodařilo se vytvořit soubor"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Nepodařilo se vytvořit složku"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Chyba pÅ™i naÄÃtánà URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "SdÃlet"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Trvale odstranit"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Přejmenovat"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "NevyÅ™Ãzené"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr "Chyba při přesunu souboru."
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Chyba při přesunu souboru"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Chyba"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Nepodařilo se přejmenovat soubor"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Chyba při mazánà souboru."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Název"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Velikost"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Upraveno"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
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:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n soubor"
msgstr[1] "%n soubory"
msgstr[2] "%n souborů"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
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/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" je neplatným názvem souboru."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Vaše úložiště je téměř plné ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Aplikace pro Å¡ifrovánà je zapnuta, ale vaÅ¡e klÃÄe nejsou inicializované. ProsÃm odhlaste se a znovu pÅ™ihlaste"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Chybný soukromý klÃÄ pro Å¡ifrovacà aplikaci. Aktualizujte prosÃm heslo svého soukromého klÃÄe ve vaÅ¡em osobnÃm nastavenÃ, abyste znovu zÃskali pÅ™Ãstup k vaÅ¡im zaÅ¡ifrovaným souborům."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -309,12 +313,12 @@ msgstr "Šifrovánà bylo vypnuto, vaše soubory jsou však stále zašifrované
msgid "{dirs} and {files}"
msgstr "{dirs} a {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s nemůže být přejmenován"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Nahrát (max. %s)"
@@ -351,68 +355,75 @@ msgstr "Maximálnà velikost vstupu pro ZIP soubory"
msgid "Save"
msgstr "Uložit"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Použijte <a href=\"%s\" target=\"_blank\">tuto adresu pro pÅ™Ãstup k vaÅ¡im souborům pÅ™es WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Nový"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Nový textový soubor"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Textový soubor"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Nová složka"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Složka"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Z odkazu"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Odstraněné soubory"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "ZruÅ¡it odesÃlánÃ"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Nemáte oprávnÄ›nà zde nahrávat Äi vytvářet soubory"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Žádný obsah. Nahrajte něco."
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Stáhnout"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Smazat"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "OdesÃlaný soubor je pÅ™ÃliÅ¡ velký"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Soubory se prohledávajÃ, prosÃm Äekejte."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Aktuálnà prohledávánÃ"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index 79a16d3cee8c82da18ab245155df8413615ce364..2b81e7470181b50b57920efac9ebde8417dccf68 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-14 01:54-0400\n"
-"PO-Revision-Date: 2014-04-14 04:55+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -82,9 +82,9 @@ msgstr "Tento soubor se nepodaÅ™ilo deÅ¡ifrovat, pravdÄ›podobnÄ› je sdÃlený. P
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Neznámá chyba, zkontrolujte vaše systémová nastavenà nebo kontaktujte vašeho správce"
+msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -97,7 +97,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "UjistÄ›te se prosÃm, že máte nainstalované PHP 5.3.3 nebo novÄ›jÅ¡Ã a že máte povolené a správnÄ› nakonfigurované OpenSSL vÄetnÄ› jeho rozÅ¡ÃÅ™enà pro PHP. ProzatÃm byla aplikace pro Å¡ifrovánà vypnuta."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "NásledujÃcà uživatelé nemajà nastavené Å¡ifrovánÃ:"
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index ca8bddaf9dc4e4dc38cf0d894e74db146544a9a7..c1912393c3379b687c9e755ec55af0505fc7c4e8 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
-"PO-Revision-Date: 2014-05-04 07:41+0000\n"
-"Last-Translator: svetlemodry <jaroslav@lichtblau.cz>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: I Robot\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"
@@ -85,9 +85,9 @@ msgid "App secret"
msgstr "Tajemstvà aplikace"
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "PoÄÃtaÄ"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -168,6 +168,10 @@ msgstr "SMB / CIFS za použità OC loginu"
msgid "Username as share"
msgstr "Uživatelské jméno jako sdÃlený adresář"
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr "ZabezpeÄené https://"
@@ -200,29 +204,29 @@ msgstr "Chyba při nastavenà úložiště Google Drive"
msgid "Saved"
msgstr "Uloženo"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr "<b>Poznámka:</b>"
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr "a"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Poznámka:</b> cURL podpora v PHP nenà povolena nebo nainstalována. Nenà možné pÅ™ipojenà %s. ProsÃm požádejte svého správce systému aÅ¥ ji nainstaluje."
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Poznámka:</b> FTP podpora v PHP nenà povolena nebo nainstalována. Nenà možné pÅ™ipojenà %s. ProsÃm požádejte svého správce systému aÅ¥ ji nainstaluje."
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 9240e00c8ce3b59ed981bcfa7ebc92e3c78a6577..9dff1fe7e91ac9c8291471b79d04b9cf4e5125cf 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,34 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "SdÃlà {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Toto sdÃlenà je chránÄ›no heslem"
@@ -36,6 +60,14 @@ msgstr "Heslo nenà správné. Zkuste to znovu."
msgid "Password"
msgstr "Heslo"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Je nám lÃto, ale tento odkaz již nenà funkÄnÃ."
@@ -64,11 +96,11 @@ msgstr "Pro vÃce informacà kontaktujte osobu, která vám zaslala tento odkaz.
msgid "Download"
msgstr "Stáhnout"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Stáhnout %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "PÅ™Ãmý odkaz"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index f704f7a49defa83b62c88a135bc86228ae50afc0..fdcf928f47ed1b40d5fe8cc62d8676925fb3b1d0 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -29,38 +29,34 @@ msgstr "Nelze trvale odstranit %s"
msgid "Couldn't restore %s"
msgstr "Nelze obnovit %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Odstraněné soubory"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Obnovit"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Chyba"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Smazané soubory"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "obnoveno"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Žádný obsah. Váš koš je prázdný."
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Název"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Obnovit"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Smazáno"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Smazat"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index bf0b927b40a35261114bb74ac173fb95fef2b211..5933fc7f05fe1c7d4bbd313febe1a0568e111081 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Honza K. <honza889@gmail.com>, 2013
+# Honza K. <honza889@gmail.com>, 2013-2014
# liska_, 2013
# svetlemodry <jaroslav@lichtblau.cz>, 2014
# xmorave2 <josef.moravec@gmail.com>, 2014
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -24,16 +24,16 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr "Přistupujete na server z nedůvěryhodné domény."
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
"example configuration is provided in config/config.sample.php."
-msgstr ""
+msgstr "Kontaktujte prosÃm správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. PÅ™Ãklad konfigurace najdete v souboru config/config.sample.php."
#: private/app.php:236
#, php-format
@@ -83,23 +83,23 @@ msgstr "Chybný obrázek"
msgid "web services under your control"
msgstr "webové služby pod Vašà kontrolou"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Stahovánà v ZIPu je vypnuto."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Soubory musà být stahovány jednotlivě."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Zpět k souborům"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Vybrané soubory jsou pÅ™ÃliÅ¡ velké pro vytvoÅ™enà ZIP souboru."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -285,127 +285,138 @@ msgstr "Zadejte uživatelské jméno správce."
msgid "Set an admin password."
msgstr "Zadejte heslo správce."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Váš webový server nenà správně nastaven pro umožněnà synchronizace, rozhranà WebDAV se zdá být rozbité."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Zkonzultujte, prosÃm, <a href='%s'>průvodce instalacÃ</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s s vámi sdÃlà »%s«"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr "SdÃlenà %s selhalo, protože soubor neexistuje"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "SdÃlenà položky %s selhalo, protože uživatel %s je jejÃm vlastnÃkem"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "SdÃlenà položky %s selhalo, protože uživatel %s neexistuje"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr "SdÃlenà položky %s selhalo, protože uživatel %s nenà Älenem žádné skupiny spoleÄné s uživatelem %s"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "SdÃlenà položky %s selhalo, protože položka již je s uživatelem %s sdÃlena"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "SdÃlenà položky %s selhalo, protože skupina %s neexistuje"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "SdÃlenà položky %s selhalo, protože uživatel %s nenà Älenem skupiny %s"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "SdÃlenà položky %s selhalo, protože sdÃlenà pomocà linků nenà povoleno"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
-msgstr ""
+msgstr "SdÃlenà typu %s nenà korektnà pro %s"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "Nastavenà práv pro %s selhalo, protože položka nebyla nalezena"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Nelze nalézt kategorii \"%s\""
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 6cd52880203bb22e6cbb67e47c67890503b369a8..fee855a0a6428b9be60a33af8b4bb0001d136d93 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -55,15 +55,15 @@ msgstr "E-mail odeslán"
msgid "You need to set your user email before being able to send test emails."
msgstr "Pro možnost odeslánà zkuÅ¡ebnÃch e-mailů musÃte nejprve nastavit svou e-mailovou adresu."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Mód odesÃlánÃ"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Å ifrovánÃ"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Metoda ověřenÃ"
@@ -106,6 +106,16 @@ msgstr "Nebylo možno deÅ¡ifrovat soubory, zkontroluje prosÃm owncloud.log nebo
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "Nebylo možno dešifrovat soubory, zkontrolujte své heslo a zkuste znovu"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Å ifrovacà klÃÄe trvale smazány"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Nebylo možno trvale smazat vaÅ¡e Å¡ifrovacà klÃÄe, zkontrolujte prosÃm owncloud.log nebo kontaktujte svého administrátora"
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "E-mail uložen"
@@ -122,6 +132,16 @@ msgstr "Nelze smazat skupinu"
msgid "Unable to delete user"
msgstr "Nelze smazat uživatele"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Zálohy úspěšně obnoveny"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Nebylo možno obnovit vaÅ¡e Å¡ifrovacà klÃÄe, zkontrolujte prosÃm owncloud.log nebo kontaktujte svého administrátora"
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Jazyk byl změněn"
@@ -177,7 +197,7 @@ msgstr "ÚložiÅ¡tÄ› nepodporuje zmÄ›nu hesla, ale Å¡ifrovacà klÃÄ uživatel
msgid "Unable to change password"
msgstr "Změna hesla se nezdařila"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "OdesÃlánÃ..."
@@ -233,34 +253,42 @@ msgstr "Aktualizovat"
msgid "Updated"
msgstr "Aktualizováno"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Vyberte profilový obrázek"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Velmi slabé heslo"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Slabé heslo"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Středně silné heslo"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Dobré heslo"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Silné heslo"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "ProbÃhá deÅ¡ifrovánà souborů... ÄŒekejte prosÃm, tato operace může trvat nÄ›jakou dobu."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Trvale smazat Å¡ifrovacà klÃÄe"
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Obnovit Å¡ifrovacà klÃÄe"
+
#: js/users.js:47
msgid "deleted"
msgstr "smazáno"
@@ -273,8 +301,8 @@ msgstr "vrátit zpět"
msgid "Unable to remove user"
msgstr "Nelze odebrat uživatele"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Skupiny"
@@ -306,7 +334,7 @@ msgstr "MusÃte zadat platné heslo"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "VarovánÃ: Osobnà složka uživatele \"{user}\" již existuje."
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "ÄŒesky"
@@ -374,7 +402,7 @@ msgid ""
"root."
msgstr "Váš datový adresář i vaÅ¡e soubory jsou pravdÄ›podobnÄ› pÅ™Ãstupné z internetu. Soubor .htaccess nefunguje. DůraznÄ› doporuÄujeme nakonfigurovat webový server tak, aby datový adresář nebyl nadále pÅ™Ãstupný, nebo pÅ™esunout datový adresář mimo prostor zpÅ™Ãstupňovaný webovým serverem."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "UpozornÄ›nà nastavenÃ"
@@ -389,53 +417,65 @@ 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 "Zkontrolujte prosÃm znovu <a href=\"%s\">instalaÄnà pÅ™ÃruÄku</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Scházà modul 'fileinfo'"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "Scházà PHP modul 'fileinfo'. DoporuÄujeme jej povolit pro nejlepÅ¡Ã výsledky detekce typů MIME."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Vaše verze PHP je zastaralá"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Vámi použÃvaná verze PHP je zastaralá. DůraznÄ› doporuÄujeme aktualizovat na verzi 5.3.8 nebo novÄ›jÅ¡Ã, protože starÅ¡Ã verze obsahujà chyby. Je možné, že tato instalace nebude fungovat správnÄ›."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Lokalizace nefunguje"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Nenà možné nastavit znakovou sadu, která podporuje UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "To znamená, že se mohou vyskytnout problémy s urÄitými znaky v názvech souborů."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "DůraznÄ› doporuÄujeme nainstalovat do vaÅ¡eho systém balÃÄky nutné pro podporu nÄ›které z následujÃcÃch znakových sad: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Připojenà k internetu nefunguje"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -444,198 +484,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Server nemá funkÄnà pÅ™ipojenà k internetu. NÄ›které moduly jako napÅ™. externà úložiÅ¡tÄ›, oznámenà o dostupných aktualizacÃch nebo instalace aplikacà tÅ™etÃch stran nebudou fungovat. PÅ™Ãstup k souborům z jiných mÃst a odesÃlánà oznamovacÃch e-mailů také nemusà fungovat. Pokud si pÅ™ejete využÃvat vÅ¡ech vlastnostà ownCloud, doporuÄujeme povolit pÅ™ipojenà k internetu tomuto serveru."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "Poslednà cron byl spuštěn v %s"
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "Poslednà cron byl spuÅ¡tÄ›n v %s. To je vÃce než pÅ™ed hodinou. Vypadá to, že nenà nÄ›co v pořádku."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "Cron ještě nebyl spuštěn!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Spustit jednu úlohu s každým naÄtenÃm stránky"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "PoužÃt systémovou službu cron pro volánà cron.php každých 15 minut."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "SdÃlenÃ"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Povolit API sdÃlenÃ"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Povolit aplikacÃm použÃvat API sdÃlenÃ"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Povolit odkazy"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Povolit uživatelům sdÃlet položky veÅ™ejnÄ› pomocà odkazů"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr "Vynutit ochranu heslem"
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Povolit veřejné nahrávánà souborů"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Povolit uživatelům, aby mohli ostatnÃm umožnit nahrávat do jejich veÅ™ejnÄ› sdÃlené složky"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "Nastavit výchozà datum vypršenà platnosti"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Vypršà po"
-#: templates/admin.php:235
+#: templates/admin.php:250
+msgid "days"
+msgstr "dnech"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Vynutit datum vyprÅ¡enÃ"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Povolit uživatelům sdÃlet položky veÅ™ejnÄ› pomocà odkazů"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Povolit znovu-sdÃlenÃ"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Povolit uživatelům znovu sdÃlet položky, které jsou pro nÄ› sdÃleny"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Povolit uživatelům sdÃlet s kýmkoliv"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Povolit uživatelům sdÃlet pouze s uživateli v jejich skupinách"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Povolit e-mailová upozornÄ›nÃ"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Povolit uživatelům odesÃlat e-mailová upozornÄ›nà pro sdÃlené soubory"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr "Nastavit výchozà datum vypršenà platnosti"
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Vypršà po"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr "Vyjmout skupiny ze sdÃlenÃ"
-#: templates/admin.php:266
-msgid "days"
-msgstr "dnech"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr "Vynutit datum vyprÅ¡enÃ"
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Výchozà lhůta vyprÅ¡enà sdÃlenà po N dnech"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "TÄ›mto skupinám bude stále možno sdÃlet, nemohou ale sami sdÃlet ostatnÃm."
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "ZabezpeÄenÃ"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Vynutit HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Vynutà pÅ™ipojovánà klientů k %s Å¡ifrovaným spojenÃm."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Připojte se k %s skrze HTTPS pro povolenà nebo zakázánà vynucovánà SSL."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "E-mailový server"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "Toto se použÃvá pro odesÃlánà upozornÄ›nÃ."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Adresa odesÃlatele"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Vyžadováno ověřenÃ"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Adresa serveru"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Port"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Přihlašovacà údaje"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "SMTP uživatelské jméno "
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "SMTP heslo"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Otestovat nastavenà e-mailu"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Odeslat e-mail"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Záznam"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Úroveň zaznamenávánÃ"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "VÃce"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Méně"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Verze"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -788,29 +836,33 @@ msgstr "Jazyk"
msgid "Help translate"
msgstr "Pomoci s překladem"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Použijte <a href=\"%s\" target=\"_blank\">tuto adresu pro pÅ™Ãstup k vaÅ¡im souborům pÅ™es WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "Å ifrovacà aplikace již nenà spuÅ¡tÄ›na, deÅ¡ifrujte prosÃm vÅ¡echny své soubory"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Přihlašovacà heslo"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Odšifrovat všechny soubory"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "VaÅ¡e Å¡ifrovacà klÃÄe byly zálohovány. Pokud se nÄ›co pokazilo, dajà se znovu obnovit. Smažte je trvale pouze pokud jste jisti, že jsou vÅ¡echny vaÅ¡e soubory bezchybnÄ› deÅ¡ifrovány."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Obnovit Å ifrovacà KlÃÄe"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Smazat Å ifrovacà KlÃÄe"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Přihlašovacà jméno"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index d89662a4cbe1298bfc59f1c717d075500af3145c..598acf76b499307cf99be3b4b5fa65f4a18e10a0 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -77,6 +77,10 @@ msgstr "PÅ™evzÃt nastavenà z nedávné konfigurace serveru?"
msgid "Keep settings?"
msgstr "Ponechat nastavenÃ?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Nelze přidat nastavenà serveru"
@@ -93,6 +97,18 @@ msgstr "Úspěch"
msgid "Error"
msgstr "Chyba"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Konfigurace v pořádku"
@@ -133,7 +149,7 @@ msgstr "Opravdu si pÅ™ejete smazat souÄasné nastavenà serveru?"
msgid "Confirm Deletion"
msgstr "Potvrdit smazánÃ"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -141,7 +157,7 @@ msgstr[0] "nalezena %s skupina"
msgstr[1] "nalezeny %s skupiny"
msgstr[2] "nalezeno %s skupin"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -149,14 +165,30 @@ msgstr[0] "nalezen %s uživatel"
msgstr[1] "nalezeni %s uživatelé"
msgstr[2] "nalezeno %s uživatelů"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Neplatný hostitel"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Nelze nalézt požadovanou vlastnost"
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtr skupin"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Uložit"
@@ -229,10 +261,23 @@ msgid ""
"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\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Přidat nastavenà serveru"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "PoÄÃtaÄ"
@@ -296,6 +341,14 @@ msgstr "Zpět"
msgid "Continue"
msgstr "PokraÄovat"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "PokroÄilé"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index cf15ec3d6e503adf8b51becdb76362a3755b5dba..40a3c2fac1573382dc166e221616f68ee9899494 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: cy_GB\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -59,95 +64,95 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sul"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Llun"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Mawrth"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mercher"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Iau"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Gwener"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sadwrn"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Ionawr"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Chwefror"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mawrth"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Ebrill"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Mehefin"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Gorffennaf"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Awst"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Medi"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Hydref"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Tachwedd"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Rhagfyr"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Gosodiadau"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Yn cadw..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "eiliad yn ôl"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
@@ -155,7 +160,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
@@ -163,15 +168,15 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "heddiw"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "ddoe"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
@@ -179,11 +184,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "mis diwethaf"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
@@ -191,39 +196,39 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "y llynedd"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "blwyddyn yn ôl"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Dewisiwch"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ie"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Na"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Dewisiwch"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Iawn"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
@@ -231,45 +236,45 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Diddymu"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -301,140 +306,149 @@ msgstr "Rhannwyd"
msgid "Share"
msgstr "Rhannu"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Gwall"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Gwall wrth rannu"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Gwall wrth ddad-rannu"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Gwall wrth newid caniatâd"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Rhannwyd â chi a'r grŵp {group} gan {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Rhannwyd â chi gan {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Diogelu cyfrinair"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Cyfrinair"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "E-bostio dolen at berson"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Anfon"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Gosod dyddiad dod i ben"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Dyddiad dod i ben"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Rhannu drwy e-bost:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Heb ganfod pobl"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "grŵp"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Does dim hawl ail-rannu"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Rhannwyd yn {item} â {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Dad-rannu"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "yn gallu golygu"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "rheolaeth mynediad"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "creu"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "diweddaru"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "dileu"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "rhannu"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Diogelwyd â chyfrinair"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Gwall wrth ddad-osod dyddiad dod i ben"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Gwall wrth osod dyddiad dod i ben"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Yn anfon ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Anfonwyd yr e-bost"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Rhybudd"
@@ -466,18 +480,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">gymuned ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr."
@@ -678,6 +693,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Crewch <strong>gyfrif gweinyddol</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Cyfrinair"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -803,8 +822,27 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Yn diweddaru owncloud i fersiwn %s, gall hyn gymryd amser."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index 1d49d16d1eb955a5a2eae8d2185f543b0c51c6f9..1d4083219c6b5848fdcd4fe67faf701e75a88f53 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr "Methwyd symud %s - Mae ffeil gyda'r enw hwn eisoes yn bodoli"
msgid "Could not move %s"
msgstr "Methwyd symud %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Does dim hawl cael enw ffeil gwag."
@@ -36,18 +36,18 @@ msgstr "Does dim hawl cael enw ffeil gwag."
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr "Plygell dros dro yn eisiau"
msgid "Failed to write to disk"
msgstr "Methwyd ysgrifennu i'r ddisg"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Dim digon o le storio ar gael"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Cyfeiriadur annilys."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Ffeiliau"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Diddymwyd llwytho i fyny."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,77 +177,77 @@ msgstr "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} yn bodoli'n barod"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Rhannu"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Dileu'n barhaol"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Ailenwi"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "I ddod"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Gwall"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Enw"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Maint"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Addaswyd"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
@@ -251,7 +255,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
@@ -259,7 +263,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
@@ -267,32 +271,32 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -302,12 +306,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -344,68 +348,75 @@ msgstr "Maint mewnbynnu mwyaf ffeiliau ZIP"
msgid "Save"
msgstr "Cadw"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "Newydd"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Ffeil destun"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Plygell"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Dolen o"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Ffeiliau ddilewyd"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Diddymu llwytho i fyny"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Llwytho i lawr"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Dileu"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Maint llwytho i fyny'n rhy fawr"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Arhoswch, mae ffeiliau'n cael eu sganio."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Sganio cyfredol"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/cy_GB/files_encryption.po b/l10n/cy_GB/files_encryption.po
index 07ded87631801e8ee702b64ab305ec2476f56844..6ee638fb90f23ddddd24b4cd8e1c0efa331bf834 100644
--- a/l10n/cy_GB/files_encryption.po
+++ b/l10n/cy_GB/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -92,7 +92,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -112,91 +112,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Amgryptiad"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/cy_GB/files_external.po b/l10n/cy_GB/files_external.po
index 969a74b589d842b7c6f1472e2242198549ede10e..eb30c50c2150ed9f64dfbef8e4f6a7887de1e522 100644
--- a/l10n/cy_GB/files_external.po
+++ b/l10n/cy_GB/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index 673e5d52df70befc29dfc78a4ffb7d77fd4a51e4..e8594f29f8505a69334c572b353629a2d30488c0 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: cy_GB\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "Cyfrinair"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "Llwytho i lawr"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/cy_GB/files_trashbin.po b/l10n/cy_GB/files_trashbin.po
index dadbbbd9b17bd5d378414e6c09d6825b2ac8b1ff..c04bbd89fbb32861aa8e465ba047f205f3ea0085 100644
--- a/l10n/cy_GB/files_trashbin.po
+++ b/l10n/cy_GB/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr "Methwyd dileu %s yn barhaol"
msgid "Couldn't restore %s"
msgstr "Methwyd adfer %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Ffeiliau ddilewyd"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Adfer"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Gwall"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Ffeiliau Ddilewyd"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Does dim byd yma. Mae eich bin sbwriel yn wag!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Enw"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Adfer"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Wedi dileu"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Dileu"
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index 38967b69e1e88f5533747f13b4f767537750c5cc..284991312724cfcd5345a23b5f5cc18d48cabee9 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: cy_GB\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr "gwasanaethau gwe a reolir gennych"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Mae llwytho ZIP wedi ei ddiffodd."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Mae angen llwytho ffeiliau i lawr fesul un."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Nôl i Ffeiliau"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Mae'r ffeiliau ddewiswyd yn rhy fawr i gynhyrchu ffeil zip."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr "Creu enw defnyddiwr i'r gweinyddwr."
msgid "Set an admin password."
msgstr "Gosod cyfrinair y gweinyddwr."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Methu canfod categori \"%s\""
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index 5302bb93371db535e8f0040437cb352cc40c9dd3..d70dacf3f0f4478100abdec2be4e049526acaa7d 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "Anfonwyd yr e-bost"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Amgryptiad"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr "dadwneud"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grwpiau"
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ 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 ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index 7547c26d0a874fbae1772b9860265d4bd4c0f083..0e8c9f49d00b09b31ec54c1728d83328ff51bb71 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "Gwall"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,7 +142,7 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -135,7 +151,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -144,14 +160,30 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Cadw"
@@ -224,10 +256,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -291,6 +336,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Uwch"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 392f412154cb4a1fb046b91718302858765b1dfe..4ac91918c88200c55ee43ccf5392b28d1438ceba 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -24,11 +24,11 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
-msgstr ""
+msgstr "Udløbsdatoen er overskredet."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Kunne ikke sende mail til følgende brugere: %s"
@@ -45,6 +45,11 @@ msgstr "standsede vedligeholdelsestilstand"
msgid "Updated database"
msgstr "Opdaterede database"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Ingen fil eller billede givet"
@@ -65,207 +70,207 @@ msgstr "Intet midlertidigt profilbillede tilgængeligt, prøv igen"
msgid "No crop data provided"
msgstr "Ingen beskæringsdata give"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Søndag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Mandag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Tirsdag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Onsdag"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Torsdag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Fredag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Lørdag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marts"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "December"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Indstillinger"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Gemmer..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "sekunder siden"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut siden"
msgstr[1] "%n minutter siden"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n time siden"
msgstr[1] "%n timer siden"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "i dag"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "i går"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dag siden"
msgstr[1] "%n dage siden"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "sidste måned"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n måned siden"
msgstr[1] "%n måneder siden"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "sidste år"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "Ã¥r siden"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Vælg"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Fejl ved indlæsning af filvælger skabelon: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nej"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Vælg"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Fejl ved indlæsning af filvælger skabelon: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Fejl ved indlæsning af besked skabelon: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} filkonflikt"
msgstr[1] "{count} filkonflikter"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "En filkonflikt"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nye filer"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
-msgstr ""
+msgstr "Allerede eksisterende filer"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Hvilke filer ønsker du at beholde?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Hvis du vælger begge versioner, vil den kopierede fil få tilføjet et nummer til sit navn."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Annuller"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Videre"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(alle valgt)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} valgt)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Fejl ved inlæsning af; fil eksistere skabelon"
@@ -297,140 +302,149 @@ msgstr "Delt"
msgid "Share"
msgstr "Del"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Fejl"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Fejl under deling"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Fejl under annullering af deling"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Fejl under justering af rettigheder"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Delt med dig og gruppen {group} af {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Delt med dig af {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "Del med bruger eller gruppe ..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Del link"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Beskyt med adgangskode"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Kodeord"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Tillad Offentlig Upload"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "E-mail link til person"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Send"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Vælg udløbsdato"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Udløbsdato"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Del via email:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Ingen personer fundet"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "gruppe"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Videredeling ikke tilladt"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Delt i {item} med {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Fjern deling"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "Giv besked med mail"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "kan redigere"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "Adgangskontrol"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "opret"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "opdater"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "slet"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "del"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Beskyttet med adgangskode"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Fejl ved fjernelse af udløbsdato"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Fejl under sætning af udløbsdato"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Sender ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "E-mail afsendt"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Advarsel"
@@ -462,18 +476,19 @@ msgstr "Fejl ved indlæsning dialog skabelon: {error}"
msgid "No tags selected for deletion."
msgstr "Ingen tags markeret til sletning."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Genindlæs venligst siden"
-#: 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 "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouds community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud."
@@ -549,12 +564,12 @@ msgstr "Nulstil kodeord"
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
-msgstr ""
+msgstr "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!"
#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
-msgstr ""
+msgstr "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet."
#: strings.php:5
msgid "Personal"
@@ -674,6 +689,10 @@ msgstr "For information om, hvordan du konfigurerer din server korrekt se <a hre
msgid "Create an <strong>admin account</strong>"
msgstr "Opret en <strong>administratorkonto</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Kodeord"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Lager & database"
@@ -777,7 +796,7 @@ msgstr "Alternative logins"
msgid ""
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
"with you.<br><a href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Hej med dig,<br><br>Dette er blot for at informere dig om, at %s har delt <strong>%s</strong> med dig.<br><a href=\"%s\">Se det her!</a><br><br>"
#: templates/singleuser.user.php:3
msgid "This ownCloud instance is currently in single user mode."
@@ -799,8 +818,27 @@ msgstr "Tak for din tålmodighed."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Opdatere Owncloud til version %s, dette kan tage et stykke tid."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 5f0ea9907f4f7013a1475854e6ab79a752a95fff..ace18acde39aac0cd5b2be4d415d51b2514571af 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 19:16+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -32,7 +32,7 @@ msgstr "Kunne ikke flytte %s - der findes allerede en fil med dette navn"
msgid "Could not move %s"
msgstr "Kunne ikke flytte %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Filnavnet kan ikke stå tomt."
@@ -41,18 +41,18 @@ msgstr "Filnavnet kan ikke stå tomt."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" er et ugyldigt filnavn."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "Mappen er blevet slettet eller fjernet."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -128,44 +128,48 @@ msgstr "Manglende midlertidig mappe."
msgid "Failed to write to disk"
msgstr "Fejl ved skrivning til disk."
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Der er ikke nok plads til rådlighed"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Upload fejlede. Kunne ikke finde den uploadede fil."
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Upload fejlede. Kunne ikke hente filinformation."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Ugyldig mappe."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Filer"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "Kan ikke upload {filename} da det er enten en mappe eller indholder 0 bytes."
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "Den totale filstørrelse {size1} er større end uploadgrænsen {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Der er ikke tilstrækkeligt friplads. Du uplaoder {size1} men der er kun {size2} tilbage"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Upload afbrudt."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Kunne ikke hente resultat fra server."
@@ -178,120 +182,120 @@ msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuler
msgid "URL cannot be empty"
msgstr "URL kan ikke være tom"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} eksisterer allerede"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Kunne ikke oprette fil"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Kunne ikke oprette mappe"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Fejl ved URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Del"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Slet permanent"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Omdøb"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Afventer"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr "Fejl ved flytning af fil"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Fejl ved flytning af fil"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Fejl"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Kunne ikke omdøbe filen"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Fejl ved sletnign af fil."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Navn"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Størrelse"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Ændret"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n mappe"
msgstr[1] "%n mapper"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fil"
msgstr[1] "%n filer"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Uploader %n fil"
msgstr[1] "Uploader %n filer"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "'{name}' er et ugyldigt filnavn."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen."
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Ugyldig privat nøgle for krypteringsprogrammet. Opdater venligst dit kodeord for den private nøgle i dine personlige indstillinger. Det kræves for at få adgang til dine krypterede filer."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -301,12 +305,12 @@ msgstr "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. GÃ¥ v
msgid "{dirs} and {files}"
msgstr "{dirs} og {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s kunne ikke omdøbes"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Upload (max. %s)"
@@ -343,68 +347,75 @@ msgstr "Maksimal størrelse på ZIP filer"
msgid "Save"
msgstr "Gem"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Brug denne adresse for at <a href=\"%s\" target=\"_blank\">tilgå dine filer via WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Ny"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Ny tekstfil"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Tekstfil"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Ny Mappe"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Mappe"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Fra link"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Slettede filer"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Fortryd upload"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Du har ikke tilladelse til at uploade eller oprette filer her"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Her er tomt. Upload noget!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Download"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Slet"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Upload er for stor"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Filerne bliver indlæst, vent venligst."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Indlæser"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index 83a7a049743f365a0bf4cd1f5fffa49abc538c8d..88c9e7d9cadf7b5ee51b6cc5ded30ffbe329a353 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 12:00+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -79,9 +79,9 @@ msgstr "Kan ikke kryptere denne fil, sandsynligvis fordi felen er delt. Bed venl
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Ukendt fejl. Kontroller venligst dit system eller kontakt din administrator"
+msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "Sørg for at PHP 5.3.3 eller nyere er installeret og at OpenSSL sammen med PHP-udvidelsen er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Følgende brugere er ikke sat op til kryptering:"
@@ -114,91 +114,91 @@ msgstr "GÃ¥ direkte til din "
msgid "personal settings"
msgstr "Personlige indstillinger"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Kryptering"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Aktiver gendannelsesnøgle (Tillad gendannelse af brugerfiler i tilfælde af tab af kodeord):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Gendannelsesnøgle kodeord"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Gentag gendannelse af nøglekoden"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Aktiveret"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Deaktiveret"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Skift gendannelsesnøgle kodeord:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Gammel Gendannelsesnøgle kodeord"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Ny Gendannelsesnøgle kodeord"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Gentag dannelse af ny gendannaleses nøglekode"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Skift Kodeord"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Dit private nøgle kodeord stemmer ikke længere overens med dit login kodeord:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Sæt dit gamle private nøgle kodeord til at være dit nuværende login kodeord. "
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Gammelt login kodeord"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Nuvrende login kodeord"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Opdater Privat Nøgle Kodeord"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Aktiver kodeord gendannelse:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Filgendannelsesindstillinger opdateret"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Kunne ikke opdatere filgendannelse"
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index 9403bf565e58f02b9d3d0b1b7375099db9143f3f..c82bc960397864ba6532ad1a248ca2b63bbcb64d 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 19:21+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: I Robot\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"
@@ -84,9 +84,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -167,6 +167,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr "Sikker https://"
@@ -199,29 +203,29 @@ msgstr "Fejl ved konfiguration af Google Drive plads"
msgid "Saved"
msgstr "Gemt"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr "<b>Note:</b> "
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr "og"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 7164ebffa75cf9eca61647791fbd7063a3fc14e9..263a8827d38ec26568727f6441264384ed341645 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,34 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Delt af {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Delingen er beskyttet af kodeord"
@@ -36,6 +60,14 @@ msgstr "Kodeordet er forkert. Prøv igen."
msgid "Password"
msgstr "Kodeord"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Desværre, dette link ser ikke ud til at fungerer længere."
@@ -64,11 +96,11 @@ msgstr "For yderligere information, kontakt venligst personen der sendte linket.
msgid "Download"
msgstr "Download"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Download %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Direkte link"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index 6b4c9cc53b4c39eb7ce3f0af0b9c664f835260eb..3db9c94e5fb9b3b2d717599be57878b5af270250 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -29,38 +29,34 @@ msgstr "Kunne ikke slette %s permanent"
msgid "Couldn't restore %s"
msgstr "Kunne ikke gendanne %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Slettede filer"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Gendan"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Fejl"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Slettede filer"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "Gendannet"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Intet at se her. Din papirkurv er tom!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Navn"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Gendan"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Slettet"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Slet"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 25b014d4626486a8fe0cf222df65927621820423..f46ddfb06c47bb9b58fa1bad41f790626d183510 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -80,23 +80,23 @@ msgstr "Ugyldigt billede"
msgid "web services under your control"
msgstr "Webtjenester under din kontrol"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP-download er slået fra."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Filer skal downloades en for en."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Tilbage til Filer"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "De markerede filer er for store til at generere en ZIP-fil."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -282,127 +282,138 @@ msgstr "Angiv et admin brugernavn."
msgid "Set an admin password."
msgstr "Angiv et admin kodeord."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s delte »%s« med sig"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Kunne ikke finde kategorien \"%s\""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 275d131bddfa4318e9832d0d368dde46244df275..dbb9befd928e313e920a4b3ba6dd3c1b1880e39c 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -51,15 +51,15 @@ msgstr "E-mail afsendt"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Kryptering"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -102,6 +102,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Email adresse gemt"
@@ -118,6 +128,16 @@ msgstr "Gruppen kan ikke slettes"
msgid "Unable to delete user"
msgstr "Bruger kan ikke slettes"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Sprog ændret"
@@ -173,7 +193,7 @@ msgstr "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnø
msgid "Unable to change password"
msgstr "Kunne ikke ændre kodeord"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Sender..."
@@ -229,34 +249,42 @@ msgstr "Opdater"
msgid "Updated"
msgstr "Opdateret"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Vælg et profilbillede"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Meget svagt kodeord"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Svagt kodeord"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Jævnt kodeord"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Godt kodeord"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Stærkt kodeord"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Dekryptere filer... Vent venligst, dette kan tage lang tid. "
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "Slettet"
@@ -269,8 +297,8 @@ msgstr "fortryd"
msgid "Unable to remove user"
msgstr "Kan ikke fjerne bruger"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupper"
@@ -302,7 +330,7 @@ msgstr "En gyldig adgangskode skal angives"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Advarsel: Hjemmemappen for bruger \"{user}\" findes allerede"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Dansk"
@@ -370,7 +398,7 @@ msgid ""
"root."
msgstr "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver så data mappen ikke længere er tilgængelig, eller at du flytter data mappen uden for webserverens dokument rod. "
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Opsætnings Advarsel"
@@ -385,53 +413,65 @@ 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>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Module 'fileinfo' mangler"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Din PHP-version er forældet"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Din PHP-version er forældet. Vi anbefaler at du opgraderer til 5.3.8 eller nyere, fordi ældre versioner har kendte fejl. Det er derfor muligt at installationen ikke fungerer korrekt."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Landestandard fungerer ikke"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Systemets locale kan ikke sættes til et der bruger UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Det betyder at der kan være problemer med visse tegn i filnavne."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Vi anbefaler at du installerer den krævede pakke på dit system, for at understøtte følgende locales: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Internetforbindelse fungerer ikke"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -440,198 +480,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af 3.-parts applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informationsemails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Udføre en opgave med hver side indlæst"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Brug systemets cron service til at kalde cron.php hvert 15. minut."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Deling"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Aktiver Share API"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Tillad apps til at bruge Share API"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Tillad links"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Tillad brugere at dele elementer til offentligheden med links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Tillad offentlig upload"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Tillad brugere at give andre mulighed for at uploade i deres offentligt delte mapper"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Udløber efter"
-#: templates/admin.php:235
+#: templates/admin.php:250
+msgid "days"
+msgstr "dage"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Tillad brugere at dele elementer til offentligheden med links"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Tillad videredeling"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Tillad brugere at dele elementer delt med dem igen"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Tillad brugere at dele med alle"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Tillad brugere at kun dele med brugerne i deres grupper"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Tillad mail underretninger"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Sikkerhed"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Gennemtving HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Tving klienten til at forbinde til %s via en kryptetet forbindelse."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Email Server"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Fra adresse"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Godkendelse påkrævet"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Serveradresse"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Port"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Brugeroplysninger"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "SMTP Brugernavn"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "SMTP Kodeord"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Test email indstillinger"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Send email"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Log"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Log niveau"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Mere"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Version"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -784,29 +832,33 @@ msgstr "Sprog"
msgid "Help translate"
msgstr "Hjælp med oversættelsen"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Brug denne adresse for at <a href=\"%s\" target=\"_blank\">tilgå dine filer via WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "Krypteringsprogrammet er ikke længere aktiveret. Dekrypter venligst alle dine filer"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Log-in kodeord"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Dekrypter alle Filer "
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Loginnavn"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index bacbb9759dee3c3248e9e2843fe998b0f5445eb9..50894adf90b67be3d5e901b7035c87d7bab8b970 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr "Overtag indstillinger fra nylig server konfiguration? "
msgid "Keep settings?"
msgstr "Behold indstillinger?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Kan ikke tilføje serverkonfiguration"
@@ -87,6 +91,18 @@ msgstr "Succes"
msgid "Error"
msgstr "Fejl"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -127,28 +143,44 @@ msgstr "Ønsker du virkelig at slette den nuværende Server Konfiguration?"
msgid "Confirm Deletion"
msgstr "Bekræft Sletning"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Gruppe Filter"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Gem"
@@ -221,10 +253,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Tilføj Server Konfiguration"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Host"
@@ -288,6 +333,14 @@ msgstr "Tilbage"
msgid "Continue"
msgstr "Videre"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avanceret"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index ad9ad8eb4b709fbb79a64c9d6cfe2781b32a7bd9..5950a101f9b51fc330fb0af35d5f34d1f9ae5c51 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -18,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 09:12+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,11 +28,11 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "Ablaufdatum liegt in der Vergangenheit."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s"
@@ -49,6 +49,11 @@ msgstr "Wartungsmodus ausgeschaltet"
msgid "Updated database"
msgstr "Datenbank aktualisiert"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr "Deaktivierte inkompatible Apps: %s"
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Kein Bild oder Datei zur Verfügung gestellt"
@@ -69,207 +74,207 @@ msgstr "Kein temporäres Profilbild verfügbar, bitte versuche es nochmal"
msgid "No crop data provided"
msgstr "Keine Zuschnittdaten zur Verfügung gestellt"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sonntag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Montag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Dienstag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mittwoch"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Donnerstag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Freitag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Samstag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "März"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Dezember"
-#: js/js.js:483
+#: js/js.js:496
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:583
+#: js/js.js:596
msgid "Saving..."
msgstr "Speichern..."
-#: js/js.js:1240
+#: js/js.js:1220
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:1241
+#: js/js.js:1221
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: js/js.js:1242
+#: js/js.js:1222
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: js/js.js:1243
+#: js/js.js:1223
msgid "today"
msgstr "Heute"
-#: js/js.js:1244
+#: js/js.js:1224
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:1245
+#: js/js.js:1225
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: js/js.js:1246
+#: js/js.js:1226
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:1247
+#: js/js.js:1227
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: js/js.js:1248
+#: js/js.js:1228
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:1249
+#: js/js.js:1229
msgid "years ago"
msgstr "Vor Jahren"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Auswählen"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nein"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Auswählen"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} Dateikonflikt"
msgstr[1] "{count} Dateikonflikte"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Ein Dateikonflikt"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Neue Dateien"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Die Dateien existieren bereits"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Welche Dateien möchtest Du behalten?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
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:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Fortsetzen"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(Alle ausgewählt)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} ausgewählt)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Fehler beim Laden der vorhanden Dateivorlage"
@@ -293,148 +298,157 @@ msgstr "Gutes Passwort"
msgid "Strong password"
msgstr "Starkes Passwort"
-#: js/share.js:51 js/share.js:66 js/share.js:106
+#: js/share.js:69 js/share.js:84 js/share.js:127
msgid "Shared"
msgstr "Geteilt"
-#: js/share.js:109
+#: js/share.js:130
msgid "Share"
msgstr "Teilen"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:195 js/share.js:208 js/share.js:215 js/share.js:822
#: templates/installation.php:10
msgid "Error"
msgstr "Fehler"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:197 js/share.js:885
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
-#: js/share.js:171
+#: js/share.js:208
msgid "Error while unsharing"
msgstr "Fehler beim Aufheben der Freigabe"
-#: js/share.js:178
+#: js/share.js:215
msgid "Error while changing permissions"
msgstr "Fehler beim Ändern der Rechte"
-#: js/share.js:188
+#: js/share.js:225
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} hat dies mit Dir und der Gruppe {group} geteilt"
-#: js/share.js:190
+#: js/share.js:227
msgid "Shared with you by {owner}"
msgstr "{owner} hat dies mit Dir geteilt"
-#: js/share.js:214
+#: js/share.js:251
msgid "Share with user or group …"
msgstr "Mit Benutzer oder Gruppe teilen ...."
-#: js/share.js:220
+#: js/share.js:257
msgid "Share link"
msgstr "Link Teilen"
-#: js/share.js:223
+#: js/share.js:263
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen"
+
+#: js/share.js:265
+msgid "By default the public link will expire after {days} days"
+msgstr "Standardmäßig wird der öffentliche Link nach {days} Tagen ablaufen"
+
+#: js/share.js:270
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passwort"
+#: js/share.js:272
+msgid "Choose a password for the public link"
+msgstr "Wählen Sie ein Passwort für den öffentlichen Link"
-#: js/share.js:230
+#: js/share.js:278
msgid "Allow Public Upload"
msgstr "Öffentliches Hochladen erlauben"
-#: js/share.js:234
+#: js/share.js:282
msgid "Email link to person"
msgstr "Link per E-Mail verschicken"
-#: js/share.js:235
+#: js/share.js:283
msgid "Send"
msgstr "Senden"
-#: js/share.js:240
+#: js/share.js:288
msgid "Set expiration date"
msgstr "Setze ein Ablaufdatum"
-#: js/share.js:241
+#: js/share.js:289
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:277
+#: js/share.js:326
msgid "Share via email:"
msgstr "Ãœber eine E-Mail teilen:"
-#: js/share.js:280
+#: js/share.js:329
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:377 js/share.js:438
msgid "group"
msgstr "Gruppe"
-#: js/share.js:357
+#: js/share.js:410
msgid "Resharing is not allowed"
msgstr "Weiterverteilen ist nicht erlaubt"
-#: js/share.js:401
+#: js/share.js:454
msgid "Shared in {item} with {user}"
msgstr "Für {user} in {item} freigegeben"
-#: js/share.js:423
+#: js/share.js:476
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:431
+#: js/share.js:484
msgid "notify by email"
msgstr "Per E-Mail informieren"
-#: js/share.js:434
+#: js/share.js:487
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:436
+#: js/share.js:489
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:439
+#: js/share.js:492
msgid "create"
msgstr "erstellen"
-#: js/share.js:442
+#: js/share.js:495
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:445
+#: js/share.js:498
msgid "delete"
msgstr "löschen"
-#: js/share.js:448
+#: js/share.js:501
msgid "share"
msgstr "teilen"
-#: js/share.js:721
+#: js/share.js:803
msgid "Password protected"
msgstr "Durch ein Passwort geschützt"
-#: js/share.js:734
+#: js/share.js:822
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:752
+#: js/share.js:843
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:777
+#: js/share.js:872
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:788
+#: js/share.js:883
msgid "Email sent"
msgstr "E-Mail wurde verschickt"
-#: js/share.js:812
+#: js/share.js:907
msgid "Warning"
msgstr "Warnung"
@@ -466,18 +480,19 @@ msgstr "Fehler beim Laden der Dialogvorlage: {error}"
msgid "No tags selected for deletion."
msgstr "Es wurden keine Schlagwörter zum Löschen ausgewählt."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern."
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Bitte lade diese Seite neu."
-#: 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 "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr "Die Aktualisierung war erfolgreich."
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet."
@@ -678,6 +693,10 @@ msgstr "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bit
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>Administrator-Konto</strong> anlegen"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passwort"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Speicher & Datenbank"
@@ -803,8 +822,27 @@ msgstr "Vielen Dank für Deine Geduld."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
+msgid "%s will be updated to version %s."
+msgstr "%s wird auf Version %s aktualisiert."
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr "Die folgenden Apps werden deaktiviert:"
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr "Das Theme %s wurde deaktiviert."
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr "Stelle vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurde."
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr "Aktualisierung starten"
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 008d7dc79801726a4e2a1986dfd156fd9fb2c702..4142ee4ceb457f391dbb8278ed15c40782bbe07d 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 16:11+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgstr "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert berei
msgid "Could not move %s"
msgstr "Konnte %s nicht verschieben"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Der Dateiname darf nicht leer sein."
@@ -44,18 +44,18 @@ msgstr "Der Dateiname darf nicht leer sein."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" ist kein gültiger Dateiname."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "Der Zielordner wurde verschoben oder gelöscht."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -131,44 +131,48 @@ msgstr "Kein temporärer Ordner vorhanden"
msgid "Failed to write to disk"
msgstr "Fehler beim Schreiben auf die Festplatte"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Nicht genug Speicher vorhanden."
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden."
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Ungültiges Verzeichnis."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Dateien"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Alle Dateien"
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Nicht genügend freier Speicherplatz, du möchtest {size1} hochladen, es sind jedoch nur noch {size2} verfügbar."
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Upload abgebrochen."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Ergebnis konnte nicht vom Server abgerufen werden."
@@ -181,120 +185,120 @@ msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload a
msgid "URL cannot be empty"
msgstr "Die URL darf nicht leer sein"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} existiert bereits"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Die Datei konnte nicht erstellt werden"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Der Ordner konnte nicht erstellt werden"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Fehler beim Abrufen der URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Teilen"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Endgültig löschen"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Umbenennen"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Ausstehend"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr "Fehler beim Verschieben der Datei."
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Fehler beim Verschieben der Datei"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Fehler"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Die Datei konnte nicht umbenannt werden"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Fehler beim Löschen der Datei."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Name"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Größe"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Geändert"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n Ordner"
msgstr[1] "%n Ordner"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n Datei"
msgstr[1] "%n Dateien"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n Datei wird hochgeladen"
msgstr[1] "%n Dateien werden hochgeladen"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" ist kein gültiger Dateiname."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Dein Speicher ist fast voll ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melden Dich nochmals ab und wieder an."
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Ungültiger privater Schlüssel für die Verschlüsselung-App. Bitte aktualisiere Dein privates Schlüssel-Passwort, um den Zugriff auf Deine verschlüsselten Dateien wiederherzustellen."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -304,12 +308,12 @@ msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Deine Dateien nach w
msgid "{dirs} and {files}"
msgstr "{dirs} und {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s konnte nicht umbenannt werden"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Hochladen (max. %s)"
@@ -346,68 +350,75 @@ msgstr "Maximale Größe für ZIP-Dateien"
msgid "Save"
msgstr "Speichern"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Neu"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Neue Textdatei"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Textdatei"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Neuer Ordner"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Ordner"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Von einem Link"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Gelöschte Dateien"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Upload abbrechen"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Du besitzt hier keine Berechtigung, um Dateien hochzuladen oder zu erstellen"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Alles leer. Lade etwas hoch!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Herunterladen"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Löschen"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Der Upload ist zu groß"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Dateien werden gescannt, bitte warten."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Scanne"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr "Durchsuchen läuft"
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index 241666d0885527916017bd12c93592f87428eeed..50302161a958fab869bac666624605a82bd80230 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -5,7 +5,7 @@
# Translators:
# iLennart21 <a12s34d56f78@live.com>, 2013
# Stephan Köninger <mail@stekoe.de>, 2013
-# Mario Siegmann <mario_siegmann@web.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
# ninov <ninovdl@ymail.com>, 2013
# Pwnicorn <pwnicorndev@gmail.com>, 2013
# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
@@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 11:00+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 16:11+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -85,9 +85,9 @@ msgstr "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Unbekannter Fehler, bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator"
+msgstr "Unbekannter Fehler. Bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator"
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -100,7 +100,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "Bitte stelle 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."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
@@ -120,91 +120,91 @@ msgstr "Direkt wechseln zu Deinem"
msgid "personal settings"
msgstr "Private Einstellungen"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Verschlüsselung"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Wiederherstellungsschlüssel-Passwort"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Schlüssel-Passwort zur Wiederherstellung wiederholen"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Aktiviert"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Deaktiviert"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Wiederherstellungsschlüssel-Passwort ändern:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Altes Wiederherstellungsschlüssel-Passwort"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Neues Wiederherstellungsschlüssel-Passwort"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Passwort ändern"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Das Passwort für Deinen privaten Schlüssel stimmt nicht mehr mit Deinem Loginpasswort überein."
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Setze Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Login-Passwort"
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Altes Login Passwort"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Aktuelles Passwort"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Passwort für den privaten Schlüssel aktualisieren"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Passwortwiederherstellung aktivieren:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Dateiwiederherstellung konnte nicht aktualisiert werden"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index 630916b5375fad44fe3a38b293d634df7a682d79..74eeb6ed7c8942f1f8622d3cbd5f248283d747ef 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 11:00+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:02+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -85,9 +85,9 @@ msgid "App secret"
msgstr "Geheime Zeichenkette der App"
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -168,6 +168,10 @@ msgstr "´"
msgid "Username as share"
msgstr "Benutzername als Freigabe"
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr "Sicherer HTTPS://"
@@ -200,29 +204,29 @@ msgstr "Fehler beim Einrichten von Google Drive"
msgid "Saved"
msgstr "Gespeichert"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr "<b>Hinweis:</b> "
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr "und"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich zur Installation an Deinen Systemadministrator."
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator."
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 02a5233df720d01b98c46d74d8c59f426891c1d6..944507254ec17906dcc62e037c8dab252a9d0723 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -22,10 +22,34 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Geteilt von {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Diese Freigabe ist durch ein Passwort geschützt"
@@ -38,6 +62,14 @@ msgstr "Bitte überprüfe Dein Passwort und versuche es erneut."
msgid "Password"
msgstr "Passwort"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren."
@@ -66,11 +98,11 @@ msgstr "Für mehr Informationen, frage bitte die Person, die Dir diesen Link ges
msgid "Download"
msgstr "Herunterladen"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Download %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Direkter Link"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index c6285cfd76cfe4c319c0fcef19995e13358c8130..fe8deaa636a2a2d83cafaa8323330c3fbdcf8e71 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "Konnte %s nicht dauerhaft löschen"
msgid "Couldn't restore %s"
msgstr "Konnte %s nicht wiederherstellen"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Gelöschte Dateien"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Wiederherstellen"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Fehler"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Gelöschte Dateien"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "Wiederhergestellt"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Nichts zu löschen, der Papierkorb ist leer!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Name"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Wiederherstellen"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "gelöscht"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Löschen"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 49604a892e650626a8d967e44ecc81f48a8b32ae..4c03a45595b6dd4a0d0eace0a0b97ac9f732784a 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:33+0000\n"
+"POT-Creation-Date: 2014-05-25 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 10:12+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -23,11 +23,11 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:712
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr "Du greifst von einer nicht vertrauenswürdigen Domain auf den Server zu."
-#: base.php:713
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -82,23 +82,23 @@ msgstr "Ungültiges Bild"
msgid "web services under your control"
msgstr "Web-Services unter Deiner Kontrolle"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Der ZIP-Download ist deaktiviert."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Die Dateien müssen einzeln heruntergeladen werden."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Zurück zu \"Dateien\""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -295,116 +295,127 @@ 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>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s teilte »%s« mit Dir"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Die Freigabe von %s ist Dir nicht erlaubt"
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s nicht existiert"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s kein Gruppenmitglied einer der Gruppen von %s ist"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "Freigabe von %s fehlgeschlagen, da die Gruppe %s nicht existiert"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren"
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr "Freigabetyp %s ist nicht gültig für %s"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da das Objekt nicht gefunden wurde"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden"
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr "Freigabe-Backend %s nicht gefunden"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr "Freigabe-Backend für %s nicht gefunden"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s der offizielle Freigeber ist"
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr "Freigabe von %s fehlgeschlagen, da die Berechtigungen die erteilten Berechtigungen %s überschreiten"
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr "Freigabe von %s fehlgeschlagen, da das Freigabe-Backend für %s nicht in dieser Quelle gefunden werden konnte"
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr "Freigabe von %s fehlgeschlagen, da die Datei im Datei-Cache nicht gefunden werden konnte"
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Die Kategorie \"%s\" konnte nicht gefunden werden."
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 7fc5e00ed4835821ec5d5b18ceefe0d2db301e0a..41ba79befcad834c800ef8fbe228ff3388994dcf 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -10,15 +10,16 @@
# Pwnicorn <pwnicorndev@gmail.com>, 2013
# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
# noxin <transifex.com@davidmainzer.com>, 2013
+# nickvergessen <transifex@schilljs.com>, 2014
# Mirodin <blobbyjj@ymail.com>, 2013
# kabum <uu.kabum@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +38,7 @@ msgstr "Gespeichert"
#: admin/controller.php:90
msgid "test email settings"
-msgstr "E-Mail-Einstellungen teste"
+msgstr "E-Mail-Einstellungen testen"
#: admin/controller.php:91
msgid "If you received this email, the settings seem to be correct."
@@ -56,15 +57,15 @@ msgstr "E-Mail wurde verschickt"
msgid "You need to set your user email before being able to send test emails."
msgstr "Du musst zunächst deine Benutzer-E-Mail-Adresse setzen, bevor du Test-E-Mail verschicken kannst."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Sende-Modus"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Verschlüsselung"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Authentifizierungsmethode"
@@ -107,6 +108,16 @@ msgstr "Dateien konnten nicht entschlüsselt werden, prüfe bitte Dein owncloud.
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort und versuche es erneut."
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Verschlüsselungsschlüssel dauerhaft gelöscht"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator"
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "E-Mail Adresse gespeichert"
@@ -123,6 +134,16 @@ msgstr "Gruppe konnte nicht gelöscht werden"
msgid "Unable to delete user"
msgstr "Benutzer konnte nicht gelöscht werden"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Backups erfolgreich wiederhergestellt"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator"
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Sprache geändert"
@@ -178,7 +199,7 @@ msgstr "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzer
msgid "Unable to change password"
msgstr "Passwort konnte nicht geändert werden"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Sende..."
@@ -234,34 +255,42 @@ msgstr "Aktualisierung durchführen"
msgid "Updated"
msgstr "Aktualisiert"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Wähle ein Profilbild"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Sehr schwaches Passwort"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Schwaches Passwort"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Durchschnittliches Passwort"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Gutes Passwort"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Starkes Passwort"
-#: js/personal.js:313
+#: js/personal.js:310
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:324
+msgid "Delete encryption keys permanently."
+msgstr "Verschlüsselungsschlüssel dauerhaft löschen."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Verschlüsselungsschlüssel wiederherstellen."
+
#: js/users.js:47
msgid "deleted"
msgstr "gelöscht"
@@ -274,8 +303,8 @@ msgstr "rückgängig machen"
msgid "Unable to remove user"
msgstr "Benutzer konnte nicht entfernt werden."
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Gruppen"
@@ -307,7 +336,7 @@ msgstr "Es muss ein gültiges Passwort angegeben werden"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Warnung: Das Benutzerverzeichnis für den Benutzer \"{user}\" existiert bereits"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Deutsch (Persönlich)"
@@ -375,7 +404,7 @@ msgid ""
"root."
msgstr "Dein Datenverzeichnis und deine Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Einrichtungswarnung"
@@ -390,53 +419,65 @@ 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 nochmals die <a href=\"%s\">Installationsanleitungen</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Modul 'fileinfo' fehlt "
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Deine PHP-Version ist veraltet"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Deine PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Ländereinstellung funktioniert nicht"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Keine Netzwerkverbindung"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -445,198 +486,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "Letzter Cron wurde um %s ausgeführt."
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "Cron wurde bis jetzt noch nicht ausgeführt!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Führe eine Aufgabe mit jeder geladenen Seite aus"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Benutze den System-Crondienst um die cron.php alle 15 Minuten aufzurufen."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Teilen"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Aktiviere Sharing-API"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Erlaubt Apps die Nutzung der Share-API"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Erlaubt Links"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr "Passwortschutz erzwingen"
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Öffentliches Hochladen erlauben"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "Setze Ablaufdatum"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Ablauf nach dem"
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "Tage"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Ablaufdatum erzwingen"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen"
-#: templates/admin.php:235
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Erlaubt erneutes Teilen"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Erlaubt Benutzern, mit jedem zu teilen"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Mail-Benachrichtigung erlauben"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr "Setze Ablaufdatum"
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Ablauf nach dem"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr "Gruppen von Freigaben ausschließen"
-#: templates/admin.php:266
-msgid "days"
-msgstr "Tage"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr "Ablaufdatum erzwingen"
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Lässt Freigaben in der Grundeinstellung nach N-Tagen ablaufen"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren."
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Sicherheit"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Erzwinge HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Bitte verbinde dich zu deinem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "E-Mail-Server"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "Dies wird zum Senden von Benachrichtigungen verwendet."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Absender-Adresse"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr "Mail"
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Authentifizierung benötigt"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Adresse des Servers"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Port"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Zugangsdaten"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "SMTP Benutzername"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
-msgstr "SMTP Passwor"
+msgstr "SMTP Passwort"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
-msgstr "Teste E-Mail-Einstellunge"
+msgstr "Teste E-Mail-Einstellungen"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Sende E-Mail"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Log"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Loglevel"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Mehr"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Weniger"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Version"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -789,29 +838,33 @@ msgstr "Sprache"
msgid "Help translate"
msgstr "Hilf bei der Ãœbersetzung"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "Die Verschlüsselungsanwendung ist nicht länger aktiviert, bitte entschlüsseln Sie alle ihre Daten."
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Login-Passwort"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Alle Dateien entschlüsseln"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Deine Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Lösche diese nur dann dauerhaft, wenn Du dir sicher bist, dass alle Dateien korrekt entschlüsselt wurden."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Verschlüsselungsschlüssel wiederherstellen"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Verschlüsselungsschlüssel löschen"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Loginname"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 108da686858218efd7c9559ff82b56b5164119d2..188b6649bb64a6b794582cad4695206d599b5c08 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 16:11+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -74,6 +74,10 @@ msgstr "Einstellungen von letzter Konfiguration übernehmen?"
msgid "Keep settings?"
msgstr "Einstellungen beibehalten?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Server"
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
@@ -90,6 +94,18 @@ msgstr "Erfolgreich"
msgid "Error"
msgstr "Fehler"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Bitte ein Base-DN spezifizieren"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Base-DN konnte nicht festgestellt werden"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Bitte Port spezifizieren"
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Konfiguration OK"
@@ -130,28 +146,44 @@ msgstr "Möchtest Du die aktuelle Serverkonfiguration wirklich löschen?"
msgid "Confirm Deletion"
msgstr "Löschung bestätigen"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s Gruppe gefunden"
msgstr[1] "%s Gruppen gefunden"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s Benutzer gefunden"
msgstr[1] "%s Benutzer gefunden"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Ungültiger Host"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Konnte die gewünschte Funktion nicht finden"
+#: settings.php:52
+msgid "Server"
+msgstr "Server"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Nutzer-Filter"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Anmeldefilter"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Gruppen-Filter"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Speichern"
@@ -224,10 +256,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Server"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Server:"
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Serverkonfiguration hinzufügen"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Konfiguration löschen"
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Host"
@@ -291,6 +336,14 @@ msgstr "Zurück"
msgid "Continue"
msgstr "Fortsetzen"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Experte"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Fortgeschritten"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po
index 778918889985cdb9bf99ae89eacc075af783d0d2..82c9863dfad974491ef00ac6397c67e496e45b73 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: de_AT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -59,207 +64,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sonntag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Montag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Dienstag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mittwoch"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Donnerstag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Freitag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Samstag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "März"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Dezember"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -291,140 +296,149 @@ msgstr ""
msgid "Share"
msgstr "Freigeben"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passwort"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "Gruppe"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Teilung zurücknehmen"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -456,18 +470,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -668,6 +683,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passwort"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -793,7 +812,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/de_AT/files.po b/l10n/de_AT/files.po
index f317d5f846517cb25d5fb74a08f4730b85340008..acc34fe4d6fe8843d4ebbc881595aa5375490a28 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Freigeben"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr "Speichern"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Herunterladen"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Löschen"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/de_AT/files_encryption.po b/l10n/de_AT/files_encryption.po
index 7cd4e354cfbe1a36b37f331c81b8b7cad7649c20..be82e2a3dfd07a5f6275d3df0d4ad798774075fe 100644
--- a/l10n/de_AT/files_encryption.po
+++ b/l10n/de_AT/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/de_AT/files_external.po b/l10n/de_AT/files_external.po
index cb76434f02fc18248316a1613b1a47ef7e144f97..e63f3d26318b47c33f4c05a7f0f87d9061235d8d 100644
--- a/l10n/de_AT/files_external.po
+++ b/l10n/de_AT/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/de_AT/files_sharing.po b/l10n/de_AT/files_sharing.po
index 272d331dc1399b4281a9b18d2763d4bc89959a6c..a5f191cc5b780dbfbc92ade5d7b24f714508c34e 100644
--- a/l10n/de_AT/files_sharing.po
+++ b/l10n/de_AT/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: de_AT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "Passwort"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "Herunterladen"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/de_AT/files_trashbin.po b/l10n/de_AT/files_trashbin.po
index 03100b293f170de9a50ac5a4f1df83b33de5e320..fb37a0f8cad95e8d150030b7ae12ebb4fa52446a 100644
--- a/l10n/de_AT/files_trashbin.po
+++ b/l10n/de_AT/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Löschen"
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/de_AT/lib.po b/l10n/de_AT/lib.po
index f0e51cd1e14c34fa72e9f78bc7cc652ce4d2e27d..f910392d2abbba3237f7abe46b356c21a510cd6e 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: de_AT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po
index 086f1193a06dec1e8f9250f79ac2aecb062466c1..620f49fe5cc48fd0a2f51c15029f911be2a0ae8d 100644
--- a/l10n/de_AT/settings.po
+++ b/l10n/de_AT/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -99,6 +99,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -115,6 +125,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -170,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -226,34 +246,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -266,8 +294,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -299,7 +327,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Deutsch (Österreich)"
@@ -367,7 +395,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -382,53 +410,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -437,198 +477,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Adresse des Servers"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,27 +829,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/de_AT/user_ldap.po b/l10n/de_AT/user_ldap.po
index 4343cca5ab400be0a65503ec9058878af3f4fb68..d2ea30debdf25b3d53436a74e6ffd59a4553d157 100644
--- a/l10n/de_AT/user_ldap.po
+++ b/l10n/de_AT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr ""
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Speichern"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Erweitert"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
index fc8c5d4d726b13759dcbdf11a5e34604941249ef..44ae548d17692cff0dba5b8124920b9a1064ef97 100644
--- a/l10n/de_CH/core.po
+++ b/l10n/de_CH/core.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
"Language: de_CH\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -48,6 +48,11 @@ msgstr "Wartungsmodus ausgeschaltet"
msgid "Updated database"
msgstr "Datenbank aktualisiert"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -68,207 +73,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sonntag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Montag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Dienstag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mittwoch"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Donnerstag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Freitag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Samstag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "März"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Dezember"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Speichern..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "Heute"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "Vor Jahren"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Auswählen"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nein"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Auswählen"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Neue Dateien"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -300,140 +305,149 @@ msgstr "Geteilt"
msgid "Share"
msgstr "Teilen"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Fehler"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Fehler beim Aufheben der Freigabe"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Fehler bei der Änderung der Rechte"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt."
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Von {owner} mit Ihnen geteilt."
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passwort"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Öffentliches Hochladen erlauben"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Link per E-Mail verschicken"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Senden"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Ein Ablaufdatum setzen"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Mittels einer E-Mail teilen:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "Gruppe"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Das Weiterverteilen ist nicht erlaubt"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Freigegeben in {item} von {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "erstellen"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "löschen"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "teilen"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Passwortgeschützt"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Email gesendet"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Warnung"
@@ -465,18 +479,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
@@ -677,6 +692,10 @@ msgstr "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>Administrator-Konto</strong> anlegen"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passwort"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -802,8 +821,27 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po
index 99055af310149a6d57fe30ff759131e1bf4912d5..209f5bcb2ea1ae1c54a5b8cd26b206efc182e3cd 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@ msgstr "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert
msgid "Could not move %s"
msgstr "Konnte %s nicht verschieben"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Der Dateiname darf nicht leer sein."
@@ -45,18 +45,18 @@ msgstr "Der Dateiname darf nicht leer sein."
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -132,44 +132,48 @@ msgstr "Kein temporärer Ordner vorhanden"
msgid "Failed to write to disk"
msgstr "Fehler beim Schreiben auf die Festplatte"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Nicht genug Speicher vorhanden."
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Ungültiges Verzeichnis."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Dateien"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Upload abgebrochen."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -182,120 +186,120 @@ msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} existiert bereits"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Teilen"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Endgültig löschen"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Umbenennen"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Ausstehend"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Fehler"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Name"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Grösse"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Geändert"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] "%n Ordner"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] "%n Dateien"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n Datei wird hochgeladen"
msgstr[1] "%n Dateien werden hochgeladen"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -305,12 +309,12 @@ msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wi
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s konnte nicht umbenannt werden"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -347,68 +351,75 @@ msgstr "Maximale Grösse für ZIP-Dateien"
msgid "Save"
msgstr "Speichern"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "Neu"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Textdatei"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Neues Verzeichnis"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Ordner"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Von einem Link"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Gelöschte Dateien"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Upload abbrechen"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Alles leer. Laden Sie etwas hoch!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Herunterladen"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Löschen"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Der Upload ist zu gross"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Dateien werden gescannt, bitte warten."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Scanne"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/de_CH/files_encryption.po b/l10n/de_CH/files_encryption.po
index e0ff909df61a6b1825d8fa82f5838233019da317..4bb13bfa88952b8b13a24646e9767ebb49069b9a 100644
--- a/l10n/de_CH/files_encryption.po
+++ b/l10n/de_CH/files_encryption.po
@@ -8,13 +8,13 @@
# FlorianScholz <work@bgstyle.de>, 2013
# JamFX <niko@nik-o-mat.de>, 2013
# Mario Siegmann <mario_siegmann@web.de>, 2013
-# traductor <transifex-3.7.mensaje@spamgourmet.com>, 2013
+# traductor, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -82,7 +82,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -97,7 +97,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "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."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
@@ -117,91 +117,91 @@ msgstr ""
msgid "personal settings"
msgstr "Persönliche Einstellungen"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Verschlüsselung"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht)."
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Wiederherstellungschlüsselpasswort"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Aktiviert"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Deaktiviert"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Wiederherstellungsschlüsselpasswort ändern"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Altes Wiederherstellungsschlüsselpasswort"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Neues Wiederherstellungsschlüsselpasswort "
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Passwort ändern"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Das Privatschlüsselpasswort darf nicht länger mit den Login-Passwort übereinstimmen."
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Setzen Sie Ihr altes Privatschlüsselpasswort auf Ihr aktuelles LogIn-Passwort."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Altes Login-Passwort"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Momentanes Login-Passwort"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Das Passwort des privaten Schlüssels aktualisieren"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Die Passwort-Wiederherstellung aktivieren:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "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."
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert."
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
diff --git a/l10n/de_CH/files_external.po b/l10n/de_CH/files_external.po
index 150bd2e2e061933e5e45b13028dc406db3aa03cc..c56ce8c325e0bfd33ce4dc995a49698218aa77b0 100644
--- a/l10n/de_CH/files_external.po
+++ b/l10n/de_CH/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,6 +166,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -198,29 +202,29 @@ msgstr "Fehler beim Einrichten von Google Drive"
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/de_CH/files_sharing.po b/l10n/de_CH/files_sharing.po
index e188bd274fd869debf358831f7ca79abfe7eca9b..95a38751593a80e7fe17af6c0594334330cc94e7 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,34 @@ msgstr ""
"Language: de_CH\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Geteilt von {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -36,6 +60,14 @@ msgstr "Das Passwort ist falsch. Bitte versuchen Sie es erneut."
msgid "Password"
msgstr "Passwort"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren."
@@ -64,11 +96,11 @@ msgstr "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen L
msgid "Download"
msgstr "Herunterladen"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/de_CH/files_trashbin.po b/l10n/de_CH/files_trashbin.po
index 3ef33e0c89a5a75877ade83ef2ac8c3ba7568f7b..95b147d7c68b0489715c85ba0838af1b14086373 100644
--- a/l10n/de_CH/files_trashbin.po
+++ b/l10n/de_CH/files_trashbin.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -30,38 +30,34 @@ msgstr "Konnte %s nicht dauerhaft löschen"
msgid "Couldn't restore %s"
msgstr "Konnte %s nicht wiederherstellen"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Gelöschte Dateien"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Wiederherstellen"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Fehler"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Gelöschte Dateien"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "Wiederhergestellt"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Nichts zu löschen, Ihr Papierkorb ist leer!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Name"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Wiederherstellen"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Gelöscht"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Löschen"
diff --git a/l10n/de_CH/lib.po b/l10n/de_CH/lib.po
index 1bfae400cb4803cbe099a7fe1bb315375aa5f7bf..363e51ac9e8d69029c985483f7b98ff1a3955349 100644
--- a/l10n/de_CH/lib.po
+++ b/l10n/de_CH/lib.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
"Language: de_CH\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -80,23 +80,23 @@ msgstr ""
msgid "web services under your control"
msgstr "Web-Services unter Ihrer Kontrolle"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Der ZIP-Download ist deaktiviert."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Die Dateien müssen einzeln heruntergeladen werden."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Zurück zu \"Dateien\""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Die gewählten Dateien sind zu gross, um eine ZIP-Datei zu erstellen."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -282,127 +282,138 @@ msgstr "Setze Administrator Benutzername."
msgid "Set an admin password."
msgstr "Setze Administrator Passwort"
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s teilt »%s« mit Ihnen"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Die Kategorie «%s» konnte nicht gefunden werden."
diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po
index 3734cf7fa64186df7c2fe298bf674d18f1ca3a22..e198a57c11f4307d42cfeca2247d7290dd6b1281 100644
--- a/l10n/de_CH/settings.po
+++ b/l10n/de_CH/settings.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -56,15 +56,15 @@ msgstr "Email gesendet"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Verschlüsselung"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -107,6 +107,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "E-Mail-Adresse gespeichert"
@@ -123,6 +133,16 @@ msgstr "Die Gruppe konnte nicht gelöscht werden"
msgid "Unable to delete user"
msgstr "Der Benutzer konnte nicht gelöscht werden"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Sprache geändert"
@@ -178,7 +198,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -234,34 +254,42 @@ msgstr "Update durchführen"
msgid "Updated"
msgstr "Aktualisiert"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
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:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "gelöscht"
@@ -274,8 +302,8 @@ msgstr "rückgängig machen"
msgid "Unable to remove user"
msgstr "Der Benutzer konnte nicht entfernt werden."
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Gruppen"
@@ -307,7 +335,7 @@ msgstr "Es muss ein gültiges Passwort angegeben werden"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Deutsch (Schweiz)"
@@ -375,7 +403,7 @@ msgid ""
"root."
msgstr "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."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Einrichtungswarnung"
@@ -390,53 +418,65 @@ 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 überprüfen Sie die <a href=\"%s\">Instalationsanleitungen</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Das Modul 'fileinfo' fehlt"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Die Lokalisierung funktioniert nicht"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Keine Internetverbindung"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -445,198 +485,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Eine Aufgabe bei jedem Laden der Seite ausführen"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Teilen"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Share-API aktivieren"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Anwendungen erlauben, die Share-API zu benutzen"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Links erlauben"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Erlaube öffentliches hochladen"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Erlaube Weiterverteilen"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Erlaubt Benutzern, mit jedem zu teilen"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Sicherheit"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "HTTPS erzwingen"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Adresse des Servers"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Port"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Log"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Log-Level"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Mehr"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Weniger"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Version"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -789,29 +837,33 @@ msgstr "Sprache"
msgid "Help translate"
msgstr "Helfen Sie bei der Ãœbersetzung"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr ""
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Login-Passwort"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Alle Dateien entschlüsseln"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Loginname"
diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po
index 79a318b0a966e53991a24fd6b8cb5deb8a8d713b..76ad0dcef908b0ab719e34d3d9aad59d95f393e3 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -78,6 +78,10 @@ msgstr "Einstellungen von letzter Konfiguration übernehmen?"
msgid "Keep settings?"
msgstr "Einstellungen beibehalten?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
@@ -94,6 +98,18 @@ msgstr "Erfolg"
msgid "Error"
msgstr "Fehler"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -134,28 +150,44 @@ msgstr "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?"
msgid "Confirm Deletion"
msgstr "Löschung bestätigen"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Gruppen-Filter"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Speichern"
@@ -228,10 +260,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Serverkonfiguration hinzufügen"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Host"
@@ -295,6 +340,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Erweitert"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index afc46ebcaff6c8493dc8763fbb8b28154e2b4157..9d40e6add5ca7e2f6ebea23a7c6919eac10a7b49 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -12,15 +12,15 @@
# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
# traductor, 2013
-# noxin <transifex.com@davidmainzer.com>, 2013
+# noxin <transifex.com@davidmainzer.com>, 2013-2014
# Mirodin <blobbyjj@ymail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 09:12+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,11 +28,11 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "Ablaufdatum liegt in der Vergangenheit."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "An folgende Benutzer konnte keine E-Mail gesendet werden: %s"
@@ -49,6 +49,11 @@ msgstr "Wartungsmodus ausgeschaltet"
msgid "Updated database"
msgstr "Datenbank aktualisiert"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr "Deaktivierte inkompatible Apps: %s"
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Weder Bild noch ein Datei wurden zur Verfügung gestellt"
@@ -69,207 +74,207 @@ msgstr "Kein temporäres Profilbild verfügbar, bitte versuchen Sie es nochmal"
msgid "No crop data provided"
msgstr "Keine Zuschnittdaten zur Verfügung gestellt"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sonntag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Montag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Dienstag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mittwoch"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Donnerstag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Freitag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Samstag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "März"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Dezember"
-#: js/js.js:483
+#: js/js.js:496
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:583
+#: js/js.js:596
msgid "Saving..."
msgstr "Speichern..."
-#: js/js.js:1240
+#: js/js.js:1220
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:1241
+#: js/js.js:1221
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Vor %n Minute"
msgstr[1] "Vor %n Minuten"
-#: js/js.js:1242
+#: js/js.js:1222
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Vor %n Stunde"
msgstr[1] "Vor %n Stunden"
-#: js/js.js:1243
+#: js/js.js:1223
msgid "today"
msgstr "Heute"
-#: js/js.js:1244
+#: js/js.js:1224
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:1245
+#: js/js.js:1225
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Vor %n Tag"
msgstr[1] "Vor %n Tagen"
-#: js/js.js:1246
+#: js/js.js:1226
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:1247
+#: js/js.js:1227
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Vor %n Monat"
msgstr[1] "Vor %n Monaten"
-#: js/js.js:1248
+#: js/js.js:1228
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:1249
+#: js/js.js:1229
msgid "years ago"
msgstr "Vor Jahren"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Auswählen"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nein"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Auswählen"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} Dateikonflikt"
msgstr[1] "{count} Dateikonflikte"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Ein Dateikonflikt"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Neue Dateien"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Die Dateien existieren bereits"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Welche Dateien möchten Sie behalten?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Wenn Sie beide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Fortsetzen"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(Alle ausgewählt)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} ausgewählt)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Fehler beim Laden der vorhanden Dateivorlage"
@@ -293,148 +298,157 @@ msgstr "Gutes Passwort"
msgid "Strong password"
msgstr "Starkes Passwort"
-#: js/share.js:51 js/share.js:66 js/share.js:106
+#: js/share.js:69 js/share.js:84 js/share.js:127
msgid "Shared"
msgstr "Geteilt"
-#: js/share.js:109
+#: js/share.js:130
msgid "Share"
msgstr "Teilen"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:195 js/share.js:208 js/share.js:215 js/share.js:822
#: templates/installation.php:10
msgid "Error"
msgstr "Fehler"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:197 js/share.js:885
msgid "Error while sharing"
msgstr "Fehler beim Teilen"
-#: js/share.js:171
+#: js/share.js:208
msgid "Error while unsharing"
msgstr "Fehler beim Aufheben der Freigabe"
-#: js/share.js:178
+#: js/share.js:215
msgid "Error while changing permissions"
msgstr "Fehler bei der Änderung der Rechte"
-#: js/share.js:188
+#: js/share.js:225
msgid "Shared with you and the group {group} by {owner}"
msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt."
-#: js/share.js:190
+#: js/share.js:227
msgid "Shared with you by {owner}"
msgstr "Von {owner} mit Ihnen geteilt."
-#: js/share.js:214
+#: js/share.js:251
msgid "Share with user or group …"
msgstr "Mit Benutzer oder Gruppe teilen ...."
-#: js/share.js:220
+#: js/share.js:257
msgid "Share link"
msgstr "Link teilen"
-#: js/share.js:223
+#: js/share.js:263
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen"
+
+#: js/share.js:265
+msgid "By default the public link will expire after {days} days"
+msgstr "Standardmäßig wird der öffentliche Link nach {days} Tagen ablaufen"
+
+#: js/share.js:270
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passwort"
+#: js/share.js:272
+msgid "Choose a password for the public link"
+msgstr "Wählen Sie ein Passwort für den öffentlichen Link"
-#: js/share.js:230
+#: js/share.js:278
msgid "Allow Public Upload"
msgstr "Öffentliches Hochladen erlauben"
-#: js/share.js:234
+#: js/share.js:282
msgid "Email link to person"
msgstr "Link per E-Mail verschicken"
-#: js/share.js:235
+#: js/share.js:283
msgid "Send"
msgstr "Senden"
-#: js/share.js:240
+#: js/share.js:288
msgid "Set expiration date"
msgstr "Ein Ablaufdatum setzen"
-#: js/share.js:241
+#: js/share.js:289
msgid "Expiration date"
msgstr "Ablaufdatum"
-#: js/share.js:277
+#: js/share.js:326
msgid "Share via email:"
msgstr "Mittels einer E-Mail teilen:"
-#: js/share.js:280
+#: js/share.js:329
msgid "No people found"
msgstr "Niemand gefunden"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:377 js/share.js:438
msgid "group"
msgstr "Gruppe"
-#: js/share.js:357
+#: js/share.js:410
msgid "Resharing is not allowed"
msgstr "Das Weiterverteilen ist nicht erlaubt"
-#: js/share.js:401
+#: js/share.js:454
msgid "Shared in {item} with {user}"
msgstr "Freigegeben in {item} von {user}"
-#: js/share.js:423
+#: js/share.js:476
msgid "Unshare"
msgstr "Freigabe aufheben"
-#: js/share.js:431
+#: js/share.js:484
msgid "notify by email"
msgstr "Per E-Mail informieren"
-#: js/share.js:434
+#: js/share.js:487
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:436
+#: js/share.js:489
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:439
+#: js/share.js:492
msgid "create"
msgstr "erstellen"
-#: js/share.js:442
+#: js/share.js:495
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:445
+#: js/share.js:498
msgid "delete"
msgstr "löschen"
-#: js/share.js:448
+#: js/share.js:501
msgid "share"
msgstr "teilen"
-#: js/share.js:721
+#: js/share.js:803
msgid "Password protected"
msgstr "Passwortgeschützt"
-#: js/share.js:734
+#: js/share.js:822
msgid "Error unsetting expiration date"
msgstr "Fehler beim Entfernen des Ablaufdatums"
-#: js/share.js:752
+#: js/share.js:843
msgid "Error setting expiration date"
msgstr "Fehler beim Setzen des Ablaufdatums"
-#: js/share.js:777
+#: js/share.js:872
msgid "Sending ..."
msgstr "Sende ..."
-#: js/share.js:788
+#: js/share.js:883
msgid "Email sent"
msgstr "Email gesendet"
-#: js/share.js:812
+#: js/share.js:907
msgid "Warning"
msgstr "Warnung"
@@ -466,18 +480,19 @@ msgstr "Fehler beim Laden der Dialogvorlage: {error}"
msgid "No tags selected for deletion."
msgstr "Es wurden keine Schlagwörter zum Löschen ausgewählt."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern."
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Bitte laden Sie diese Seite neu."
-#: 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 "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr "Die Aktualisierung war erfolgreich."
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
@@ -678,6 +693,10 @@ msgstr "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>,
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>Administrator-Konto</strong> anlegen"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passwort"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Speicher & Datenbank"
@@ -803,8 +822,27 @@ msgstr "Vielen Dank für Ihre Geduld."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
+msgid "%s will be updated to version %s."
+msgstr "%s wird auf Version %s aktualisiert."
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr "Die folgenden Apps werden deaktiviert:"
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr "Das Theme %s wurde deaktiviert."
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr "Stellen Sie vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurde."
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr "Aktualisierung starten"
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 6f53f790f676635a84cf9a87b94f93d7dd9bfcc5..a99ba86f2e234dd68f9c4bfddd0198d28a1337a0 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -11,15 +11,15 @@
# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
# traductor, 2013
-# noxin <transifex.com@davidmainzer.com>, 2013
+# noxin <transifex.com@davidmainzer.com>, 2013-2014
# Mirodin <blobbyjj@ymail.com>, 2013
# kabum <uu.kabum@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 16:11+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgstr "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert
msgid "Could not move %s"
msgstr "Konnte %s nicht verschieben"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Der Dateiname darf nicht leer sein."
@@ -47,18 +47,18 @@ msgstr "Der Dateiname darf nicht leer sein."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" ist kein gültiger Dateiname."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "Der Ziel-Ordner wurde verschoben oder gelöscht."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -134,44 +134,48 @@ msgstr "Kein temporärer Ordner vorhanden"
msgid "Failed to write to disk"
msgstr "Fehler beim Schreiben auf die Festplatte"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Nicht genug Speicher vorhanden."
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Hochladen fehlgeschlagen. Die hochgeladene Datei konnte nicht gefunden werden."
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Hochladen fehlgeschlagen. Die Dateiinformationen konnten nicht abgerufen werden."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Ungültiges Verzeichnis."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Dateien"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Alle Dateien"
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar."
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Upload abgebrochen."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Ergebnis konnte nicht vom Server abgerufen werden."
@@ -184,120 +188,120 @@ msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload
msgid "URL cannot be empty"
msgstr "Die URL darf nicht leer sein"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} existiert bereits"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Die Datei konnte nicht erstellt werden"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Der Ordner konnte nicht erstellt werden"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Fehler beim Abrufen der URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Teilen"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Endgültig löschen"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Umbenennen"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Ausstehend"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr "Fehler beim Verschieben der Datei."
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Fehler beim Verschieben der Datei"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Fehler"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Die Datei konnte nicht umbenannt werden"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Fehler beim Löschen der Datei."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Name"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Größe"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Geändert"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n Ordner"
msgstr[1] "%n Ordner"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n Datei"
msgstr[1] "%n Dateien"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n Datei wird hoch geladen"
msgstr[1] "%n Dateien werden hoch geladen"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" ist kein gültiger Dateiname."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden sich nochmals ab und wieder an."
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Ungültiger privater Schlüssel für die Verschlüsselung-App. Bitte aktualisieren Sie Ihr privates Schlüssel-Passwort, um den Zugriff auf Ihre verschlüsselten Dateien wiederherzustellen."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -307,12 +311,12 @@ msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wi
msgid "{dirs} and {files}"
msgstr "{dirs} und {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s konnte nicht umbenannt werden"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Hochladen (max. %s)"
@@ -349,68 +353,75 @@ msgstr "Maximale Größe für ZIP-Dateien"
msgid "Save"
msgstr "Speichern"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Neu"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Neue Textdatei"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Textdatei"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Neuer Ordner"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Ordner"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Von einem Link"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Gelöschte Dateien"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Upload abbrechen"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Sie besitzen hier keine Berechtigung Dateien hochzuladen oder zu erstellen"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Alles leer. Laden Sie etwas hoch!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Herunterladen"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Löschen"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Der Upload ist zu groß"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Dateien werden gescannt, bitte warten."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Scanne"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr "Durchsuchen läuft"
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index 17029f21abed699861fb4e5a09a57d95c6632c8a..2362c837b9e635e7bc1499918c033a1d795d211c 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -7,13 +7,13 @@
# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
# JamFX <niko@nik-o-mat.de>, 2013
# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
-# traductor <transifex-3.7.mensaje@spamgourmet.com>, 2013
+# traductor, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 13:31+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 16:11+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -81,9 +81,9 @@ msgstr "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Unbekannter Fehler, bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator"
+msgstr "Unbekannter Fehler. Bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator"
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -96,7 +96,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "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."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
@@ -116,91 +116,91 @@ msgstr "Direkt wechseln zu Ihrem"
msgid "personal settings"
msgstr "Persönliche Einstellungen"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Verschlüsselung"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht)."
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Wiederherstellungschlüsselpasswort"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Schlüssel-Passwort zur Wiederherstellung wiederholen"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Aktiviert"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Deaktiviert"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Wiederherstellungsschlüsselpasswort ändern"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Altes Wiederherstellungsschlüsselpasswort"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Neues Wiederherstellungsschlüsselpasswort "
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Passwort ändern"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Das Privatschlüsselpasswort darf nicht länger mit den Login-Passwort übereinstimmen."
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Setzen Sie Ihr altes Privatschlüsselpasswort auf Ihr aktuelles LogIn-Passwort."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Altes Login-Passwort"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Momentanes Login-Passwort"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Das Passwort des privaten Schlüssels aktualisieren"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Die Passwort-Wiederherstellung aktivieren:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "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."
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert."
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index 77abf7fb2d4ff5628f5c213df05add8f2589450c..b7a5e8005b17133d79f1159822190be570ad975a 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 11:00+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:02+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -86,9 +86,9 @@ msgid "App secret"
msgstr "Geheime Zeichenkette der App"
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -169,6 +169,10 @@ msgstr "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)"
msgid "Username as share"
msgstr "Benutzername als Freigabe"
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr "Sicherer HTTPS://"
@@ -201,29 +205,29 @@ msgstr "Fehler beim Einrichten von Google Drive"
msgid "Saved"
msgstr "Gespeichert"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr "<b>Hinweis:</b> "
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr "und"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator."
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator."
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index 2275194ef426b46e1b694fee48063c4c42ff14a9..5b4add6df8f37f8fa8d73b9c2e422e4a0d7ed83a 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -21,10 +21,34 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Geteilt von {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Diese Freigabe ist durch ein Passwort geschützt"
@@ -37,6 +61,14 @@ msgstr "Das Passwort ist falsch. Bitte versuchen Sie es erneut."
msgid "Password"
msgstr "Passwort"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren."
@@ -65,11 +97,11 @@ msgstr "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen L
msgid "Download"
msgstr "Herunterladen"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Download %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Direkte Verlinkung"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index 4eced02e01b399f5c7c92fe49479c41d837181c5..5a3604768fb9fa7527376ae8b24b5d2bc8874b67 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -29,38 +29,34 @@ msgstr "Konnte %s nicht dauerhaft löschen"
msgid "Couldn't restore %s"
msgstr "Konnte %s nicht wiederherstellen"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Gelöschte Dateien"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Wiederherstellen"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Fehler"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Gelöschte Dateien"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "Wiederhergestellt"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Nichts zu löschen, Ihr Papierkorb ist leer!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Name"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Wiederherstellen"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Gelöscht"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Löschen"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 7c43c75ee6271f384c251b6c0ec6083fafd224f5..b1cb083dbd7e53ed9a998c9b380915cec2ac1231 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -7,14 +7,14 @@
# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
# traductor, 2013
-# noxin <transifex.com@davidmainzer.com>, 2013
+# noxin <transifex.com@davidmainzer.com>, 2013-2014
# kabum <uu.kabum@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:33+0000\n"
+"POT-Creation-Date: 2014-05-25 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 10:12+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -23,11 +23,11 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:712
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr "Sie greifen von einer nicht vertrauenswürdigen Domain auf den Server zu."
-#: base.php:713
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -82,23 +82,23 @@ msgstr "Ungültiges Bild"
msgid "web services under your control"
msgstr "Web-Services unter Ihrer Kontrolle"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Der ZIP-Download ist deaktiviert."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Die Dateien müssen einzeln heruntergeladen werden."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Zurück zu \"Dateien\""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -295,116 +295,127 @@ 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>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s hat »%s« mit Ihnen geteilt"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Die Freigabe von %s ist Ihnen nicht erlaubt"
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s nicht existiert"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s kein Gruppenmitglied einer der Gruppen von %s ist"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "Freigabe von %s fehlgeschlagen, da die Gruppe %s nicht existiert"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren"
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr "Freigabetyp %s ist nicht gültig für %s"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da das Objekt nicht gefunden wurde"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden"
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr "Freigabe-Backend %s nicht gefunden"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr "Freigabe-Backend für %s nicht gefunden"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s der offizielle Freigeber ist"
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr "Freigabe von %s fehlgeschlagen, da die Berechtigungen die erteilten Berechtigungen %s überschreiten"
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr "Freigabe von %s fehlgeschlagen, da das Freigabe-Backend für %s nicht in dieser Quelle gefunden werden konnte"
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr "Freigabe von %s fehlgeschlagen, da die Datei im Datei-Cache nicht gefunden werden konnte"
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Die Kategorie \"%s\" konnte nicht gefunden werden."
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index cbf6cc2844dfae972a8f5f46ff0a2caac9e0bd70..e21f6139c11faaa6c5f339bd624f23022a615478 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -10,16 +10,16 @@
# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
# traductor, 2013
-# noxin <transifex.com@davidmainzer.com>, 2013
+# noxin <transifex.com@davidmainzer.com>, 2013-2014
# Mirodin <blobbyjj@ymail.com>, 2013
# kabum <uu.kabum@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -57,15 +57,15 @@ msgstr "Email gesendet"
msgid "You need to set your user email before being able to send test emails."
msgstr "Sie müssen Ihre Benutzer-E-Mail-Adresse setzen, bevor Sie Test-E-Mails versenden können."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Sende-Modus"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Verschlüsselung"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Authentifizierungsmethode"
@@ -108,6 +108,16 @@ msgstr "Dateien konnten nicht entschlüsselt werden, prüfen Sie bitte Ihre ownc
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passwort und versuchen Sie es erneut."
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Verschlüsselungsschlüssel dauerhaft gelöscht"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfen Sie bitte Ihre owncloud.log oder frage Deinen Administrator"
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "E-Mail-Adresse gespeichert"
@@ -124,6 +134,16 @@ msgstr "Die Gruppe konnte nicht gelöscht werden"
msgid "Unable to delete user"
msgstr "Der Benutzer konnte nicht gelöscht werden"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Backups erfolgreich wiederhergestellt"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator"
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Sprache geändert"
@@ -179,7 +199,7 @@ msgstr "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzer
msgid "Unable to change password"
msgstr "Passwort konnte nicht geändert werden"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Sende..."
@@ -235,34 +255,42 @@ msgstr "Update durchführen"
msgid "Updated"
msgstr "Aktualisiert"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Wählen Sie ein Profilbild"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Sehr schwaches Passwort"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Schwaches Passwort"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Passables Passwort"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Gutes Passwort"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Starkes Passwort"
-#: js/personal.js:313
+#: js/personal.js:310
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:324
+msgid "Delete encryption keys permanently."
+msgstr "Verschlüsselungsschlüssel dauerhaft löschen."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Verschlüsselungsschlüssel wiederherstellen."
+
#: js/users.js:47
msgid "deleted"
msgstr "gelöscht"
@@ -275,8 +303,8 @@ msgstr "rückgängig machen"
msgid "Unable to remove user"
msgstr "Der Benutzer konnte nicht entfernt werden."
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Gruppen"
@@ -308,7 +336,7 @@ msgstr "Es muss ein gültiges Passwort angegeben werden"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Warnung: Das Benutzerverzeichnis für den Benutzer \"{user}\" existiert bereits"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Deutsch (Förmlich: Sie)"
@@ -376,7 +404,7 @@ msgid ""
"root."
msgstr "Ihr Datenverzeichnis und Ihre Dateien sind möglicherweise 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 außerhalb des Wurzelverzeichnisses des Webservers."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Einrichtungswarnung"
@@ -391,53 +419,65 @@ 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 nochmals die <a href=\"%s\">Installationsanleitungen</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Das Modul 'fileinfo' fehlt"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Ihre PHP-Version ist veraltet"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Ihre PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Die Lokalisierung funktioniert nicht"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Keine Internetverbindung"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -446,198 +486,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Versenden von Mail-Benachrichtigungen funktionieren eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "Letzter Cron wurde um %s ausgeführt."
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "Cron wurde bis jetzt noch nicht ausgeführt!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Eine Aufgabe bei jedem Laden der Seite ausführen"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Teilen"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Share-API aktivieren"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Anwendungen erlauben, die Share-API zu benutzen"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Links erlauben"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr "Passwortschutz erzwingen"
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Öffentliches Hochladen erlauben"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "Setze Ablaufdatum"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Ablauf nach dem"
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "Tage"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Ablaufdatum erzwingen"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
-#: templates/admin.php:235
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Erlaube Weiterverteilen"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Erlaubt Benutzern, mit jedem zu teilen"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Mail-Benachrichtigung erlauben"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr "Setze Ablaufdatum"
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Ablauf nach dem"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr "Gruppen von Freigaben ausschließen"
-#: templates/admin.php:266
-msgid "days"
-msgstr "Tage"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr "Ablaufdatum erzwingen"
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Lässt Freigaben in der Grundeinstellung nach N-Tagen ablaufen"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren."
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Sicherheit"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "HTTPS erzwingen"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "E-Mail-Server"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "Dies wird für das Senden von Benachrichtigungen verwendet."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Absender-Adresse"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr "Mail"
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Authentifizierung benötigt"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Adresse des Servers"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Port"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Zugangsdaten"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "SMTP Benutzername"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "SMTP Passwort"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "E-Mail-Einstellungen testen"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "E-Mail senden"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Log"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Log-Level"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Mehr"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Weniger"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Version"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -790,29 +838,33 @@ msgstr "Sprache"
msgid "Help translate"
msgstr "Helfen Sie bei der Ãœbersetzung"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "Die Verschlüsselungsanwendung ist nicht länger aktiv, bitte entschlüsseln Sie alle ihre Daten"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Login-Passwort"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Alle Dateien entschlüsseln"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Ihre Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Löschen Sie diese nur dann dauerhaft, wenn Sie sich sicher sind, dass alle Dateien korrekt entschlüsselt wurden."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Verschlüsselungsschlüssel wiederherstellen"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Verschlüsselungsschlüssel löschen"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Loginname"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 1510c7e5d125d9b72b443bb73b11231ea874e5e4..cecdcd01e2f1ac70418bd18e9d795e78d308a0fd 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 16:11+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -76,6 +76,10 @@ msgstr "Einstellungen von letzter Konfiguration übernehmen?"
msgid "Keep settings?"
msgstr "Einstellungen beibehalten?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Server"
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
@@ -92,6 +96,18 @@ msgstr "Erfolg"
msgid "Error"
msgstr "Fehler"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Bitte ein Base-DN spezifizieren"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Base-DN konnte nicht festgestellt werden"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Bitte Port spezifizieren"
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Konfiguration OK"
@@ -132,28 +148,44 @@ msgstr "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?"
msgid "Confirm Deletion"
msgstr "Löschung bestätigen"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s Gruppe gefunden"
msgstr[1] "%s Gruppen gefunden"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s Benutzer gefunden"
msgstr[1] "%s Benutzer gefunden"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Ungültiger Host"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Konnte die gewünschte Funktion nicht finden"
+#: settings.php:52
+msgid "Server"
+msgstr "Server"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Nutzer-Filter"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Anmeldefilter"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Gruppen-Filter"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Speichern"
@@ -226,10 +258,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Server"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Server:"
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Serverkonfiguration hinzufügen"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Konfiguration löschen"
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Host"
@@ -293,6 +338,14 @@ msgstr "Zurück"
msgid "Continue"
msgstr "Fortsetzen"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Experte"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Fortgeschritten"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 26767a32923b2b3ba5ebd7ca02b58ea9fb250531..1dec38203c2ffab8bf92bda833f96eebb6ee1aee 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -18,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 09:14+0000\n"
+"Last-Translator: pe_ppe <peppe@cs.uoi.gr>\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"
@@ -28,11 +28,11 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "Η ημεÏομηνία λήξης είναι στο παÏελθόν."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Αδυναμία αποστολής μηνÏματος στους ακόλουθους χÏήστες: %s"
@@ -49,6 +49,11 @@ msgstr "Η κατάσταση συντήÏησης απενεÏγοποιήθη
msgid "Updated database"
msgstr "ΕνημεÏωμÎνη βάση δεδομÎνων"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr "ΑπενεÏγοποιημÎνες μη συμβατÎÏ‚ εφαÏμογÎÏ‚: %s"
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Δεν δόθηκε εικόνα ή αÏχείο"
@@ -69,207 +74,207 @@ msgstr "Δεν υπάÏχει Ï€ÏοσωÏινή φωτογÏαφία Ï€Ïοφί
msgid "No crop data provided"
msgstr "Δεν δόθηκαν δεδομÎνα πεÏικοπής"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "ΚυÏιακή"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "ΔευτÎÏα"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "ΤÏίτη"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "ΤετάÏτη"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Î Îμπτη"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "ΠαÏασκευή"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Σάββατο"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "ΙανουάÏιος"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "ΦεβÏουάÏιος"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "ΜάÏτιος"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "ΑπÏίλιος"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Μάϊος"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "ΙοÏνιος"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "ΙοÏλιος"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "ΑÏγουστος"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "ΣεπτÎμβÏιος"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "ΟκτώβÏιος"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "ÎοÎμβÏιος"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "ΔεκÎμβÏιος"
-#: js/js.js:483
+#: js/js.js:496
msgid "Settings"
msgstr "Ρυθμίσεις"
-#: js/js.js:583
+#: js/js.js:596
msgid "Saving..."
msgstr "Γίνεται αποθήκευση..."
-#: js/js.js:1240
+#: js/js.js:1220
msgid "seconds ago"
msgstr "δευτεÏόλεπτα Ï€Ïιν"
-#: js/js.js:1241
+#: js/js.js:1221
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n λεπτό Ï€Ïιν"
msgstr[1] "%n λεπτά Ï€Ïιν"
-#: js/js.js:1242
+#: js/js.js:1222
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n ÏŽÏα Ï€Ïιν"
msgstr[1] "%n ÏŽÏες Ï€Ïιν"
-#: js/js.js:1243
+#: js/js.js:1223
msgid "today"
msgstr "σήμεÏα"
-#: js/js.js:1244
+#: js/js.js:1224
msgid "yesterday"
msgstr "χτες"
-#: js/js.js:1245
+#: js/js.js:1225
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n ημÎÏα Ï€Ïιν"
msgstr[1] "%n ημÎÏες Ï€Ïιν"
-#: js/js.js:1246
+#: js/js.js:1226
msgid "last month"
msgstr "τελευταίο μήνα"
-#: js/js.js:1247
+#: js/js.js:1227
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n μήνας Ï€Ïιν"
msgstr[1] "%n μήνες Ï€Ïιν"
-#: js/js.js:1248
+#: js/js.js:1228
msgid "last year"
msgstr "τελευταίο χÏόνο"
-#: js/js.js:1249
+#: js/js.js:1229
msgid "years ago"
msgstr "χÏόνια Ï€Ïιν"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "ΕπιλÎξτε"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Σφάλμα κατά την φόÏτωση Ï€ÏοτÏπου επιλογÎα αÏχείων: {σφάλμα}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Îαι"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Όχι"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "ΕπιλÎξτε"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Σφάλμα κατά την φόÏτωση Ï€ÏοτÏπου επιλογÎα αÏχείων: {σφάλμα}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Οκ"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Σφάλμα φόÏτωσης Ï€ÏοτÏπου μηνυμάτων: {σφάλμα}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} αÏχείο διαφÎÏει"
msgstr[1] "{count} αÏχεία διαφÎÏουν"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Ένα αÏχείο διαφÎÏει"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "ÎÎα ΑÏχεία"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
-msgstr ""
+msgstr "Ήδη υπάÏχοντα αÏχεία"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Ποια αÏχεία θÎλετε να κÏατήσετε;"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Εάν επιλÎξετε και τις δυο εκδοχÎÏ‚, Îνας αÏιθμός θα Ï€Ïοστεθεί στο αντιγÏαφόμενο αÏχείο."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "ΆκυÏο"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "ΣυνÎχεια"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(όλα τα επιλεγμÎνα)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} επιλÎχθησαν)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Σφάλμα κατά την φόÏτωση του Ï€ÏοτÏπου ÏπαÏξης αÏχείου"
@@ -293,148 +298,157 @@ msgstr "Καλό συνθηματικό"
msgid "Strong password"
msgstr "Δυνατό συνθηματικό"
-#: js/share.js:51 js/share.js:66 js/share.js:106
+#: js/share.js:69 js/share.js:84 js/share.js:127
msgid "Shared"
msgstr "ΚοινόχÏηστα"
-#: js/share.js:109
+#: js/share.js:130
msgid "Share"
msgstr "ΔιαμοιÏασμός"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:195 js/share.js:208 js/share.js:215 js/share.js:822
#: templates/installation.php:10
msgid "Error"
msgstr "Σφάλμα"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:197 js/share.js:885
msgid "Error while sharing"
msgstr "Σφάλμα κατά τον διαμοιÏασμό"
-#: js/share.js:171
+#: js/share.js:208
msgid "Error while unsharing"
msgstr "Σφάλμα κατά το σταμάτημα του διαμοιÏασμοÏ"
-#: js/share.js:178
+#: js/share.js:215
msgid "Error while changing permissions"
msgstr "Σφάλμα κατά την αλλαγή των δικαιωμάτων"
-#: js/share.js:188
+#: js/share.js:225
msgid "Shared with you and the group {group} by {owner}"
msgstr "ΔιαμοιÏάστηκε με σας και με την ομάδα {group} του {owner}"
-#: js/share.js:190
+#: js/share.js:227
msgid "Shared with you by {owner}"
msgstr "ΔιαμοιÏάστηκε με σας από τον {owner}"
-#: js/share.js:214
+#: js/share.js:251
msgid "Share with user or group …"
msgstr "ΔιαμοιÏασμός με χÏήστη ή ομάδα ..."
-#: js/share.js:220
+#: js/share.js:257
msgid "Share link"
msgstr "ΔιαμοιÏασμός συνδÎσμου"
-#: js/share.js:223
+#: js/share.js:263
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Ο δημόσιος σÏνδεσμος θα απενεÏγοποιηθεί το Ï€Î¿Î»Ï {days} ημÎÏες μετά την δημιουÏγία του"
+
+#: js/share.js:265
+msgid "By default the public link will expire after {days} days"
+msgstr "Ο δημόσιος σÏνδεσμος θα απενεÏγοποιηθεί εÏήμην μετά από {days} ημÎÏες"
+
+#: js/share.js:270
msgid "Password protect"
msgstr "Î Ïοστασία συνθηματικοÏ"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Συνθηματικό"
+#: js/share.js:272
+msgid "Choose a password for the public link"
+msgstr "ΕπιλÎξτε κωδικό για τον δημόσιο σÏνδεσμο"
-#: js/share.js:230
+#: js/share.js:278
msgid "Allow Public Upload"
msgstr "ΕπιτÏÎπεται η Δημόσια Αποστολή"
-#: js/share.js:234
+#: js/share.js:282
msgid "Email link to person"
msgstr "Αποστολή συνδÎσμου με email "
-#: js/share.js:235
+#: js/share.js:283
msgid "Send"
msgstr "Αποστολή"
-#: js/share.js:240
+#: js/share.js:288
msgid "Set expiration date"
msgstr "ΟÏισμός ημ. λήξης"
-#: js/share.js:241
+#: js/share.js:289
msgid "Expiration date"
msgstr "ΗμεÏομηνία λήξης"
-#: js/share.js:277
+#: js/share.js:326
msgid "Share via email:"
msgstr "ΔιαμοιÏασμός μÎσω email:"
-#: js/share.js:280
+#: js/share.js:329
msgid "No people found"
msgstr "Δεν βÏÎθηκε άνθÏωπος"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:377 js/share.js:438
msgid "group"
msgstr "ομάδα"
-#: js/share.js:357
+#: js/share.js:410
msgid "Resharing is not allowed"
msgstr "ΞαναμοιÏασμός δεν επιτÏÎπεται"
-#: js/share.js:401
+#: js/share.js:454
msgid "Shared in {item} with {user}"
msgstr "ΔιαμοιÏασμός του {item} με τον {user}"
-#: js/share.js:423
+#: js/share.js:476
msgid "Unshare"
msgstr "Διακοπή διαμοιÏασμοÏ"
-#: js/share.js:431
+#: js/share.js:484
msgid "notify by email"
msgstr "ειδοποίηση με email"
-#: js/share.js:434
+#: js/share.js:487
msgid "can edit"
msgstr "δυνατότητα αλλαγής"
-#: js/share.js:436
+#: js/share.js:489
msgid "access control"
msgstr "Îλεγχος Ï€Ïόσβασης"
-#: js/share.js:439
+#: js/share.js:492
msgid "create"
msgstr "δημιουÏγία"
-#: js/share.js:442
+#: js/share.js:495
msgid "update"
msgstr "ενημÎÏωση"
-#: js/share.js:445
+#: js/share.js:498
msgid "delete"
msgstr "διαγÏαφή"
-#: js/share.js:448
+#: js/share.js:501
msgid "share"
msgstr "διαμοιÏασμός"
-#: js/share.js:721
+#: js/share.js:803
msgid "Password protected"
msgstr "Î Ïοστασία με συνθηματικό"
-#: js/share.js:734
+#: js/share.js:822
msgid "Error unsetting expiration date"
msgstr "Σφάλμα κατά την διαγÏαφή της ημ. λήξης"
-#: js/share.js:752
+#: js/share.js:843
msgid "Error setting expiration date"
msgstr "Σφάλμα κατά τον οÏισμό ημ. λήξης"
-#: js/share.js:777
+#: js/share.js:872
msgid "Sending ..."
msgstr "Αποστολή..."
-#: js/share.js:788
+#: js/share.js:883
msgid "Email sent"
msgstr "Το Email απεστάλη "
-#: js/share.js:812
+#: js/share.js:907
msgid "Warning"
msgstr "Î Ïοειδοποίηση"
@@ -466,18 +480,19 @@ msgstr "Σφάλμα φόÏτωσης Ï€ÏοτÏπου διαλόγων: {σφά
msgid "No tags selected for deletion."
msgstr "Καμμία ετικÎτα δεν επιλÎχθηκε για διαγÏαφή."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr "ΕνημÎÏωση του {productName} στην Îκδοση {version}, αυτό μποÏεί να διαÏκÎσει λίγη ÏŽÏα."
+
+#: js/update.js:43
msgid "Please reload the page."
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 "Η ενημÎÏωση ήταν ανεπιτυχής. ΠαÏακαλώ στείλτε αναφοÏά στην <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">κοινότητα ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr "Η ενημÎÏωση δεν ήταν επιτυχής."
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Η ενημÎÏωση ήταν επιτυχής. Μετάβαση στο ownCloud."
@@ -678,6 +693,10 @@ msgstr "Για πληÏοφοÏίες πως να Ïυθμίσετε οÏθά Ï„
msgid "Create an <strong>admin account</strong>"
msgstr "ΔημιουÏγήστε Îναν <strong>λογαÏιασμό διαχειÏιστή</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Συνθηματικό"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Αποθήκευση & βάση δεδομÎνων"
@@ -803,8 +822,27 @@ msgstr "Σας ευχαÏιστοÏμε για την υπομονή σας."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ΕνημεÏώνοντας το ownCloud στην Îκδοση %s,μποÏεί να πάÏει λίγο χÏόνο."
+msgid "%s will be updated to version %s."
+msgstr "Το %s θα ενημεÏωθεί στην Îκδοση %s."
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr "Οι παÏακάτω εφαÏμογÎÏ‚ θα απενεÏγοποιηθοÏν:"
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr "Το θÎμα %s Îχει απενεÏγοποιηθεί."
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr "ΠαÏακαλώ βεβαιωθείτε ότι Îχουν ληψθεί αντίγÏαφα ασφαλείας της βάσης δεδομÎνων, του φακÎλου Ïυθμίσεων και του φακÎλου δεδομÎνων Ï€Ïιν Ï€ÏοχωÏήσετε."
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr "ΈναÏξη ενημÎÏωσης"
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/el/files.po b/l10n/el/files.po
index dc7704037c8c9168433d155c95da976353b43112..6fdac2a362f915998c08147d7fb076ca8cbf2e13 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
-"Last-Translator: ggoniotakis <ioannis.goniotakis@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-27 13:52+0000\n"
+"Last-Translator: pe_ppe <peppe@cs.uoi.gr>\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"
@@ -35,7 +35,7 @@ msgstr "Αδυναμία μετακίνησης του %s - υπάÏχει ήδ
msgid "Could not move %s"
msgstr "Αδυναμία μετακίνησης του %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Το όνομα αÏχείου δεν μποÏεί να είναι κενό."
@@ -44,18 +44,18 @@ msgstr "Το όνομα αÏχείου δεν μποÏεί να είναι κε
msgid "\"%s\" is an invalid file name."
msgstr "Το \"%s\" είναι Îνα μη ÎγκυÏο όνομα αÏχείου."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Μη ÎγκυÏο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτÏÎπονται."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "Ο φάκελος Ï€ÏοοÏÎ¹ÏƒÎ¼Î¿Ï Îχει μετακινηθεί ή διαγÏαφεί."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -131,44 +131,48 @@ msgstr "Λείπει ο Ï€ÏοσωÏινός φάκελος"
msgid "Failed to write to disk"
msgstr "Αποτυχία εγγÏαφής στο δίσκο"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Μη επαÏκής διαθÎσιμος αποθηκευτικός χώÏος"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Η φόÏτωση απÎτυχε. Αδυναμία εÏÏεσης αÏχείου Ï€Ïος φόÏτωση."
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Η φόÏτωση απÎτυχε. Αδυναμία λήψης πληÏοφοÏιών αÏχείων."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Μη ÎγκυÏος φάκελος."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "ΑÏχεία"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Όλα τα αÏχεία"
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "Αδυναμία φόÏτωσης {filename} καθώς είναι κατάλογος αÏχείων ή Îχει 0 bytes"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "Το συνολικό μÎγεθος αÏχείου {size1} υπεÏβαίνει το ÏŒÏιο μεταφόÏτωσης {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Δεν υπάÏχει αÏκετός ελεÏθεÏος χώÏος, μεταφοÏτώνετε μÎγεθος {size1} αλλά υπάÏχει χώÏος μόνο {size2}"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Η αποστολή ακυÏώθηκε."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Αδυναμία λήψης αποτελÎσματος από το διακομιστή."
@@ -181,120 +185,120 @@ msgstr "Η αποστολή του αÏχείου βÏίσκεται σε εξÎ
msgid "URL cannot be empty"
msgstr "Η URL δεν Ï€ÏÎπει να είναι κενή"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1170
msgid "{new_name} already exists"
msgstr "{new_name} υπάÏχει ήδη"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Αδυναμία δημιουÏγίας αÏχείου"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Αδυναμία δημιουÏγίας φακÎλου"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Σφάλμα φόÏτωσης URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "ΔιαμοιÏασμός"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Μόνιμη διαγÏαφή"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Μετονομασία"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Η λήψη Ï€Ïοετοιμάζεται. Αυτό μποÏεί να πάÏει ÏŽÏα εάν τα αÏχεία Îχουν μεγάλο μÎγεθος."
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:596 js/filelist.js:1665
msgid "Pending"
msgstr "ΕκκÏεμεί"
-#: js/filelist.js:916
+#: js/filelist.js:1121
msgid "Error moving file."
-msgstr ""
+msgstr "Σφάλμα κατά τη μετακίνηση του αÏχείου."
-#: js/filelist.js:924
+#: js/filelist.js:1129
msgid "Error moving file"
msgstr "Σφάλμα κατά τη μετακίνηση του αÏχείου"
-#: js/filelist.js:924
+#: js/filelist.js:1129
msgid "Error"
msgstr "Σφάλμα"
-#: js/filelist.js:988
+#: js/filelist.js:1207
msgid "Could not rename file"
msgstr "Αδυναμία μετονομασίας αÏχείου"
-#: js/filelist.js:1122
+#: js/filelist.js:1328
msgid "Error deleting file."
msgstr "Σφάλμα διαγÏαφής αÏχείου."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1431 templates/list.php:62
msgid "Name"
msgstr "Όνομα"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1432 templates/list.php:75
msgid "Size"
msgstr "ÎœÎγεθος"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1433 templates/list.php:78
msgid "Modified"
msgstr "ΤÏοποποιήθηκε"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1443 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n φάκελος"
msgstr[1] "%n φάκελοι"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1449 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n αÏχείο"
msgstr[1] "%n αÏχεία"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1573 js/filelist.js:1612
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "ΑνÎβασμα %n αÏχείου"
msgstr[1] "ΑνÎβασμα %n αÏχείων"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "Το \"{name}\" είναι μη ÎγκυÏο όνομα αÏχείου."
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Ο αποθηκευτικός σας χώÏος είναι γεμάτος, τα αÏχεία δεν μποÏοÏν να ενημεÏωθοÏν ή να συγχÏονιστοÏν πια!"
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ο αποθηκευτικός χώÏος είναι σχεδόν γεμάτος ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Η εφαÏμογή κÏυπτογÏάφησης είναι ενεÏγοποιημÎνη αλλά τα κλειδιά σας δεν Îχουν καταγÏαφεί, παÏακαλώ αποσυνδεθείτε και επανασυνδεθείτε."
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "ΆκυÏο Ï€Ïοσωπικό κλειδί για την εφαÏμογή κÏυπτογÏάφησης. ΠαÏακαλώ ενημεÏώστε τον κωδικό του Ï€ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ¿Ï ÎºÎ»ÎµÎ¹Î´Î¯Î¿Ï… σας στις Ï€ÏοσωπικÎÏ‚ Ïυθμίσεις για να επανακτήσετε Ï€Ïόσβαση στα κÏυπτογÏαφημÎνα σας αÏχεία."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -304,12 +308,12 @@ msgstr "Η κÏυπτογÏάφηση απενεÏγοποιήθηκε, αλλά
msgid "{dirs} and {files}"
msgstr "{Κατάλογοι αÏχείων} και {αÏχεία}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "Αδυναμία μετονομασίας του %s"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "ΔιαμοιÏασμός (max. %s)"
@@ -346,68 +350,75 @@ msgstr "ÎœÎγιστο μÎγεθος για αÏχεία ZIP"
msgid "Save"
msgstr "Αποθήκευση"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "ΧÏησιμοποιήστε αυτήν την διεÏθυνση για να αποκτήσετε <a href=\"%s\" target=\"_blank\">Ï€Ïόσβαση στα αÏχεία σας μÎσω WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "ÎÎο"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "ÎÎο αÏχείο κειμÎνου"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "ΑÏχείο κειμÎνου"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "ÎÎος κατάλογος"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Φάκελος"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Από σÏνδεσμο"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "ΔιαγÏαμμÎνα αÏχεία"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "ΑκÏÏωση αποστολής"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Δεν Îχετε δικαιώματα φόÏτωσης ή δημιουÏγίας αÏχείων εδώ"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Δεν υπάÏχει τίποτα εδώ. Ανεβάστε κάτι!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Λήψη"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "ΔιαγÏαφή"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Î Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ αÏχείο Ï€Ïος αποστολή"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Τα αÏχεία που Ï€Ïοσπαθείτε να ανεβάσετε υπεÏβαίνουν το μÎγιστο μÎγεθος αποστολής αÏχείων σε αυτόν τον διακομιστή."
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Τα αÏχεία σαÏώνονται, παÏακαλώ πεÏιμÎνετε."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "ΤÏÎχουσα ανίχνευση"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index 0398e9756723f7ee010853c11e70fc7816249056..ead19de670f7c5934a39c23496d85c0abe5040eb 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-01 01:55-0400\n"
-"PO-Revision-Date: 2014-03-31 16:30+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 09:15+0000\n"
"Last-Translator: pe_ppe <peppe@cs.uoi.gr>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgstr "Δεν ήταν δυνατό να αποκÏυπτογÏαφηθεί α
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Άγνωστο σφάλμα, παÏακαλώ ελÎγξτε τις Ïυθμίσεις συστήματος ή επικοινωνήστε με τον διαχειÏιστή σας "
+msgstr "Άγνωστο σφάλμα. ΠαÏακαλώ ελÎγξτε τις Ïυθμίσεις του συστήματό σας ή επικοινωνήστε με τον διαχειÏιστή συστημάτων σας"
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -97,7 +97,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "ΠαÏακαλώ επιβεβαιώστε ότι η PHP 5.3.3 ή νεότεÏη είναι εγκατεστημÎνη και ότι το OpenSSL μαζί με το PHP extension είναι ενεÏγοποιήμÎνο και Îχει Ïυθμιστεί σωστά. Î Ïος το παÏόν, η εφαÏμογή κÏυπτογÏάφησης είναι απενεÏγοποιημÎνη."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Οι κάτωθι χÏήστες δεν Îχουν Ïυθμιστεί για κÏυπογÏάφηση:"
@@ -117,91 +117,91 @@ msgstr "Πηγαίνε απευθείας στο "
msgid "personal settings"
msgstr "Ï€ÏοσωπικÎÏ‚ Ïυθμίσεις"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "ΚÏυπτογÏάφηση"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "ΕνεÏγοποίηση ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Î±Î½Î¬ÎºÏ„Î·ÏƒÎ·Ï‚ (επιτÏÎψτε την ανάκτηση αÏχείων χÏηστών σε πεÏίπτωση απώλειας κωδικοÏ):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "ΕπαναφοÏά ÎºÏ‰Î´Î¹ÎºÎ¿Ï ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Επαναλάβετε το κλειδί επαναφοÏάς κωδικοÏ"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "ΕνεÏγοποιημÎνο"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "ΑπενεÏγοποιημÎνο"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Αλλαγή ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï ÎµÏ€Î±Î½Î±Ï†Î¿Ïάς κωδικοÏ:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Παλιό κλειδί επαναφοÏάς κωδικοÏ"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "ÎÎο κλειδί επαναφοÏάς κωδικοÏ"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Επαναλάβετε νÎο κλειδί επαναφοÏάς κωδικοÏ"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Αλλαγή ÎšÏ‰Î´Î¹ÎºÎ¿Ï Î Ïόσβασης"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Ο κωδικός του Ï€ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ¿Ï ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Î´ÎµÎ½ ταιÏιάζει πλÎον με τον κωδικό σÏνδεσής σας:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "ΟÏίστε το παλιό σας Ï€Ïοσωπικό κλειδί ως τον Ï„ÏÎχων κωδικό Ï€Ïόσβασης."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Εάν δεν θυμάστε τον παλιό σας κωδικό μποÏείτε να ζητήσετε από τον διαχειÏιστή σας να επανακτήσει τα αÏχεία σας."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Παλαιό συνθηματικό εισόδου"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "ΤÏÎχον συνθηματικό Ï€Ïόσβασης"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "ΕνημÎÏωση Î ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ¿Ï ÎšÎ»ÎµÎ¹Î´Î¿Ï Î Ïόσβασης"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "ΕνεÏγοποιήστε την ανάκτηση ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Η ενεÏγοποίηση αυτής της επιλογής θα σας επιτÏÎψει να επανακτήσετε Ï€Ïόσβαση στα κÏυπτογÏαφημÎνα σας αÏχεία σε πεÏίπτωση απώλειας του ÎºÏ‰Î´Î¹ÎºÎ¿Ï ÏƒÎ±Ï‚"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Οι Ïυθμίσεις επαναφοÏάς αÏχείων ανανεώθηκαν"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Αποτυχία ενημÎÏωσης ανάκτησης αÏχείων"
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index 3f4e0eff89d29685cc775010bc6cb25798fc5364..2a55c3c105fb0b32619fef0299079f9a84a333f3 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -3,16 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# thea_rad <inactive+thea_rad@transifex.com>, 2014
# ggoniotakis <ioannis.goniotakis@gmail.com>, 2014
# pe_ppe <peppe@cs.uoi.gr>, 2014
+# vkehayas <vkehayas@gmail.com>, 2014
# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2014-04-30 11:30+0000\n"
-"Last-Translator: ggoniotakis <ioannis.goniotakis@gmail.com>\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-25 21:40+0000\n"
+"Last-Translator: vkehayas <vkehayas@gmail.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"
@@ -24,157 +26,161 @@ msgstr ""
msgid "Local"
msgstr "Τοπικός"
-#: appinfo/app.php:36
+#: appinfo/app.php:37
msgid "Location"
msgstr "Τοποθεσία"
-#: appinfo/app.php:39
+#: appinfo/app.php:40
msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
-#: appinfo/app.php:41
+#: appinfo/app.php:43
msgid "Key"
-msgstr ""
+msgstr "Κλειδί"
-#: appinfo/app.php:42
+#: appinfo/app.php:44
msgid "Secret"
-msgstr ""
+msgstr "Μυστικό"
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
msgid "Bucket"
-msgstr ""
+msgstr "Κάδος"
-#: appinfo/app.php:47
+#: appinfo/app.php:49
msgid "Amazon S3 and compliant"
msgstr ""
-#: appinfo/app.php:49
+#: appinfo/app.php:52
msgid "Access Key"
-msgstr ""
+msgstr "Κλειδί Ï€Ïόσβασης"
-#: appinfo/app.php:50
+#: appinfo/app.php:53
msgid "Secret Key"
-msgstr ""
+msgstr "Μυστικό κλειδί"
-#: appinfo/app.php:52
+#: appinfo/app.php:55
msgid "Hostname (optional)"
-msgstr ""
+msgstr "Όνομα μηχανήματος (Ï€ÏοαιÏετικά)"
-#: appinfo/app.php:53
+#: appinfo/app.php:56
msgid "Port (optional)"
-msgstr ""
+msgstr "Î ÏŒÏτα (Ï€ÏοαιÏετικά)"
-#: appinfo/app.php:54
+#: appinfo/app.php:57
msgid "Region (optional)"
-msgstr ""
+msgstr "ΠεÏιοχή (Ï€ÏοαιÏετικά)"
-#: appinfo/app.php:55
+#: appinfo/app.php:58
msgid "Enable SSL"
-msgstr ""
+msgstr "ΕνεÏγοποίηση SSL"
-#: appinfo/app.php:56
+#: appinfo/app.php:59
msgid "Enable Path Style"
-msgstr ""
+msgstr "ΕνεÏγοποίηση μοÏφής διαδÏομής"
-#: appinfo/app.php:63
+#: appinfo/app.php:67
msgid "App key"
-msgstr ""
+msgstr "Κλειδί εφαÏμογής"
-#: appinfo/app.php:64
+#: appinfo/app.php:68
msgid "App secret"
-msgstr ""
+msgstr "Μυστικό εφαÏμογής"
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
+msgid "Host"
+msgstr "Διακομιστής"
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
msgid "Username"
msgstr "Όνομα χÏήστη"
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
msgid "Password"
msgstr "Κωδικός Ï€Ïόσβασης"
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
msgid "Root"
-msgstr ""
+msgstr "Root"
-#: appinfo/app.php:77
+#: appinfo/app.php:82
msgid "Secure ftps://"
-msgstr ""
+msgstr "Ασφαλής ftps://"
-#: appinfo/app.php:84
+#: appinfo/app.php:90
msgid "Client ID"
-msgstr ""
+msgstr "ID πελάτη"
-#: appinfo/app.php:85
+#: appinfo/app.php:91
msgid "Client secret"
-msgstr ""
+msgstr "Μυστικό πελάτη"
-#: appinfo/app.php:92
+#: appinfo/app.php:98
msgid "OpenStack Object Storage"
-msgstr ""
+msgstr "Αποθήκη αντικειμÎνων OpenStack"
-#: appinfo/app.php:94
+#: appinfo/app.php:101
msgid "Username (required)"
msgstr "Όνομα χÏήστη (απαιτείται)"
-#: appinfo/app.php:95
+#: appinfo/app.php:102
msgid "Bucket (required)"
-msgstr ""
+msgstr "Κάδος (απαιτείται)"
-#: appinfo/app.php:96
+#: appinfo/app.php:103
msgid "Region (optional for OpenStack Object Storage)"
-msgstr ""
+msgstr "ΠεÏιοχή (Ï€ÏοαιÏετικά για την αποθήκευση αντικειμÎνων OpenStack)"
-#: appinfo/app.php:97
+#: appinfo/app.php:104
msgid "API Key (required for Rackspace Cloud Files)"
-msgstr ""
+msgstr "Κλειδί API (απαιτείται για αÏχεία Rackspace Cloud)"
-#: appinfo/app.php:98
+#: appinfo/app.php:105
msgid "Tenantname (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:99
+#: appinfo/app.php:106
msgid "Password (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Μυστικός κωδικός (απαιτείται για την αποθήκευση αντικειμÎνων OpenStack)"
-#: appinfo/app.php:100
+#: appinfo/app.php:107
msgid "Service Name (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Όνομα υπηÏεσίας (απαιτείται για την αποθήκευση αντικειμÎνων OpenStack)"
-#: appinfo/app.php:101
+#: appinfo/app.php:108
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "ΔιεÏθυνση URL της ταυτότητας Ï„ÎµÎ»Î¹ÎºÎ¿Ï ÏƒÎ·Î¼ÎµÎ¯Î¿Ï… (απαιτείται για την αποθήκευση αντικειμÎνων OpenStack)"
-#: appinfo/app.php:102
+#: appinfo/app.php:109
msgid "Timeout of HTTP requests in seconds (optional)"
-msgstr ""
+msgstr "ΧÏονικό ÏŒÏιο των αιτήσεων HTTP σε δευτεÏόλεπτα (Ï€ÏοαιÏετικά)"
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
msgid "Share"
msgstr "ΔιαμοιÏάστε"
-#: appinfo/app.php:119
+#: appinfo/app.php:127
msgid "SMB / CIFS using OC login"
-msgstr ""
+msgstr "SMB / CIFS χÏησιμοποιώντας λογαÏιασμό OC"
-#: appinfo/app.php:122
+#: appinfo/app.php:131
msgid "Username as share"
-msgstr ""
+msgstr "Όνομα χÏήστη ως διαμοιÏαζόμενος φάκελος"
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:141 appinfo/app.php:152
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:145 appinfo/app.php:156
msgid "Secure https://"
-msgstr ""
+msgstr "Ασφαλής σÏνδεση https://"
-#: appinfo/app.php:144
+#: appinfo/app.php:155
msgid "Remote subfolder"
-msgstr ""
+msgstr "ΑπομακÏυσμÎνος υποφάκελος"
#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
msgid "Access granted"
@@ -200,34 +206,34 @@ msgstr "Σφάλμα Ïυθμίζωντας αποθήκευση Google Drive "
msgid "Saved"
msgstr "ΑποθηκεÏτηκαν"
-#: lib/config.php:598
+#: lib/config.php:674
msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>Σημείωση:</b> "
-#: lib/config.php:608
+#: lib/config.php:684
msgid " and "
msgstr "και"
-#: lib/config.php:630
+#: lib/config.php:706
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Σημείωση:</b> Η υποστήÏιξη cURL στην PHP δεν είναι ενεÏγοποιημÎνη ή εγκατεστημÎνη. Η Ï€ÏοσάÏτηση του %s δεν είναι δυνατή. ΠαÏακαλώ ζητήστε από τον διαχειÏιστή συστημάτων σας να την εγκαταστήσει."
-#: lib/config.php:632
+#: lib/config.php:708
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Σημείωση:</b> Η υποστήÏιξη FTP στην PHP δεν είναι ενεÏγοποιημÎνη ή εγκατεστημÎνη. Δεν είναι δυνατή η Ï€ÏοσάÏτηση του %s. ΠαÏακαλώ ζητήστε από τον διαχειÏιστή συστημάτων σας να την εγκαταστήσει."
-#: lib/config.php:634
+#: lib/config.php:710
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
" ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Σημείωση:</b> Η επÎκταση \"%s\" δεν είναι εγκατεστημÎνη. Δεν είναι δυνατή η Ï€ÏοσάÏτηση %s. ΠαÏακαλώ ζητήστε από τον διαχειÏιστή συστημάτων σας να την εγκαταστήσει."
#: templates/settings.php:2
msgid "External Storage"
@@ -251,7 +257,7 @@ msgstr "ΕπιλογÎÏ‚"
#: templates/settings.php:12
msgid "Available for"
-msgstr ""
+msgstr "ΔιαθÎσιμο για"
#: templates/settings.php:32
msgid "Add storage"
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 10343be4fc4990c60f067334fe29823a9eea01ba..88dc6d7470a1e45c54cd432e8e22d365a477042b 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,34 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "ΔιαμοιÏάστηκε από τον {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Αυτός ο κοινόχÏηστος φάκελος Ï€ÏοστατεÏεται με κωδικό"
@@ -36,6 +60,14 @@ msgstr "ΕσφαλμÎνος κωδικός Ï€Ïόσβασης. Î Ïοσπαθή
msgid "Password"
msgstr "Κωδικός Ï€Ïόσβασης"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Συγγνώμη, αυτός ο σÏνδεσμος μοιάζει να μην ισχÏει πια."
@@ -64,11 +96,11 @@ msgstr "Για πεÏισσότεÏες πληÏοφοÏίες, παÏακαλώ
msgid "Download"
msgstr "Λήψη"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Λήψη %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Άμεσος σÏνδεσμος"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index c8d33b1aa12e9313260fbdfb676a8ca93e3f0fa1..384bfe32c16dc8f58041f50ebb778c6476d0d993 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -29,38 +29,34 @@ msgstr "ΑδÏνατη η μόνιμη διαγÏαφή του %s"
msgid "Couldn't restore %s"
msgstr "Αδυναμία επαναφοÏάς %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "ΔιαγÏαμμÎνα αÏχεία"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "ΕπαναφοÏά"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Σφάλμα"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "ΔιαγÏαμμÎνα ΑÏχεία"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "επαναφÎÏθηκαν"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Δεν υπάÏχει τίποτα εδώ. Ο κάδος σας είναι άδειος!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Όνομα"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "ΕπαναφοÏά"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "ΔιαγÏαμμÎνα"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "ΔιαγÏαφή"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index b06f6f2a02aca58f076327c56888dd14b4d34564..9dcb724c83605209ba07cc044161e1d762f9727a 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-27 13:52+0000\n"
+"Last-Translator: pe_ppe <peppe@cs.uoi.gr>\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"
@@ -22,16 +22,16 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
-msgstr ""
+msgstr "Η Ï€ÏοσπÎλαση του διακομιστή γίνεται από μη Îμπιστο τομÎα."
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
"example configuration is provided in config/config.sample.php."
-msgstr ""
+msgstr "ΠαÏακαλώ επικοινωνήστε με τον διαχειÏιστή συστημάτων σας. Αν είστε διαχειÏιστής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… στιγμιοτÏπο, Ïυθμίστε το κλειδί \"trusted_domain\" στο αÏχείο config/config.php. Ένα παÏάδειγμα παÏÎχεται στο αÏχείο config/config.sample.php."
#: private/app.php:236
#, php-format
@@ -81,23 +81,23 @@ msgstr "Μη ÎγκυÏη εικόνα"
msgid "web services under your control"
msgstr "υπηÏεσίες δικτÏου υπό τον Îλεγχό σας"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Η λήψη ZIP απενεÏγοποιήθηκε."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Τα αÏχεία Ï€ÏÎπει να ληφθοÏν Îνα-Îνα."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Πίσω στα ΑÏχεία"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Τα επιλεγμÎνα αÏχεία είναι μεγάλα ώστε να δημιουÏγηθεί αÏχείο zip."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -132,29 +132,29 @@ msgstr "Η εφαÏμογή δεν παÏÎχει αÏχείο info.xml"
msgid "App can't be installed because of not allowed code in the App"
msgstr "Η εφαÏμογή δεν μποÏεί να εγκατασταθεί λόγω μη-επιτÏεπόμενου κώδικα μÎσα στην ΕφαÏμογή"
-#: private/installer.php:141
+#: private/installer.php:138
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "Η εφαÏμογή δεν μποÏεί να εγκατασταθεί επειδή δεν είναι συμβατή με αυτή την Îκδοση ownCloud"
-#: private/installer.php:147
+#: private/installer.php:144
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "Η εφαÏμογή δεν μποÏεί να εγκατασταθεί επειδή πεÏιÎχει την ετικÎτα <shipped>σωστή</shipped> που δεν επιτÏÎπεται για μη-ενσωματωμÎνες εφαÏμογÎÏ‚"
-#: private/installer.php:160
+#: private/installer.php:157
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 δεν είναι η ίδια με την Îκδοση που αναφÎÏεται στο κατάστημα εφαÏμογών"
-#: private/installer.php:170
+#: private/installer.php:167
msgid "App directory already exists"
msgstr "Ο κατάλογος εφαÏμογών υπάÏχει ήδη"
-#: private/installer.php:183
+#: private/installer.php:180
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Δεν είναι δυνατόν να δημιουÏγηθεί ο φάκελος εφαÏμογής. ΠαÏακαλώ διοÏθώστε τις άδειες Ï€Ïόσβασης. %s"
@@ -283,127 +283,138 @@ msgstr "Εισάγετε όνομα χÏήστη διαχειÏιστή."
msgid "Set an admin password."
msgstr "Εισάγετε συνθηματικό διαχειÏιστή."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ο διακομιστής σας δεν Îχει Ïυθμιστεί κατάλληλα ώστε να επιτÏÎπει τον συγχÏονισμό αÏχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστÏαμμÎνη."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "ΕλÎγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "Ο %s διαμοιÏάστηκε μαζί σας το »%s«"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
-msgstr ""
+msgstr "Ο διαμοιÏασμός του %s απÎτυχε, γιατί το αÏχείο δεν υπάÏχει"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Δεν επιτÏÎπεται να διαμοιÏάσετε τον πόÏο %s"
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
-msgstr ""
+msgstr "Ο διαμοιÏασμός του %s απÎτυχε, γιατί ο χÏήστης %s είναι ο ιδιοκτήτης του αντικειμÎνου"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
-msgstr ""
+msgstr "Ο διαμοιÏασμός του %s απÎτυχε, γιατί ο χÏήστης %s δεν υπάÏχει"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
-msgstr ""
+msgstr "Ο διαμοιÏασμός του %s απÎτυχε, γιατί ο χÏήστης %s δεν είναι μÎλος καμίας ομάδας στην οποία ο χÏήστης %s είναι μÎλος"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
-msgstr ""
+msgstr "Ο διαμοιÏασμός του %s απÎτυχε, γιατί το αντικείμενο είναι διαμοιÏασμÎνο ήδη με τον χÏήστη %s"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
-msgstr ""
+msgstr "Ο διαμοιÏασμός του %s απÎτυχε, γιατί η ομάδα χÏηστών %s δεν υπάÏχει"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
-msgstr ""
+msgstr "Ο διαμοιÏασμός του %s απÎτυχε, γιατί ο χÏήστης %s δεν είναι μÎλος της ομάδας %s"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Î ÏÎπει να εισάγετε Îναν κωδικό για να δημιουÏγήσετε Îναν δημόσιο σÏνδεσμο. Μόνο Ï€ÏοστατευμÎνοι σÏνδεσμοι επιτÏÎπονται"
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
-msgstr ""
+msgstr "Ο διαμοιÏασμός του %s απÎτυχε, γιατί δεν επιτÏÎπεται ο διαμοιÏασμός με συνδÎσμους"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
-msgstr ""
+msgstr "Ο Ï„Ïπος διαμοιÏÎ±ÏƒÎ¼Î¿Ï %s δεν είναι ÎγκυÏος για το %s"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
-msgstr ""
+msgstr "Ο οÏισμός δικαιωμάτων για το %s απÎτυχε, γιατί τα δικαιώματα υπεÏτεÏοÏν αυτά που είναι οÏισμÎνα για το %s"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
-msgstr ""
+msgstr "Ο οÏισμός δικαιωμάτων για το %s απÎτυχε, γιατί το αντικείμενο δεν βÏÎθηκε"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
-msgstr ""
+msgstr "Το σÏστημα διαμοιÏÎ±ÏƒÎ¼Î¿Ï %s Ï€ÏÎπει να υλοποιεί την διεπαφή OCP\\Share_Backend"
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
-msgstr ""
+msgstr "Το σÏστημα διαμοιÏÎ±ÏƒÎ¼Î¿Ï %s δεν βÏÎθηκε"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
-msgstr ""
+msgstr "Το σÏστημα διαμοιÏÎ±ÏƒÎ¼Î¿Ï Î³Î¹Î± το %s δεν βÏÎθηκε"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
-msgstr ""
+msgstr "Ο διαμοιÏασμός του %s απÎτυχε, γιατί το αντικείμενο είναι διαμοιÏασμÎνο αÏχικά από τον χÏήστη %s"
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
-msgstr ""
+msgstr "Ο διαμοιÏασμός του %s απÎτυχε, γιατί τα δικαιώματα υπεÏτεÏοÏν αυτά που είναι οÏισμÎνα για το %s"
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
-msgstr ""
+msgstr "Ο διαμοιÏασμός του %s απÎτυχε, γιατί δεν επιτÏÎπεται ο επαναδιαμοιÏασμός"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
-msgstr ""
+msgstr "Ο διαμοιÏασμός του %s απÎτυχε, γιατί δεν ήταν δυνατό να εντοπίσει την πηγή το σÏστημα διαμοιÏÎ±ÏƒÎ¼Î¿Ï Î³Î¹Î± το %s "
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
-msgstr ""
+msgstr "Ο διαμοιÏασμός του %s απÎτυχε, γιατί το αÏχείο δεν βÏÎθηκε στην Ï€ÏοσωÏινή αποθήκευση αÏχείων"
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Αδυναμία εÏÏεσης κατηγοÏίας \"%s\""
@@ -460,7 +471,7 @@ msgstr "χÏόνια Ï€Ïιν"
msgid ""
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
"\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "Μόνο οι παÏακάτων χαÏακτήÏες επιτÏÎπονται σε Îνα όνομα χÏήστη: \"a-z\", \"A-Z\", \"0-9\" και \"_.@-\""
#: private/user/manager.php:237
msgid "A valid username must be provided"
@@ -472,4 +483,4 @@ msgstr "Î ÏÎπει να δοθεί ÎγκυÏο συνθηματικό"
#: private/user/manager.php:246
msgid "The username is already being used"
-msgstr ""
+msgstr "Το όνομα χÏήστη είναι κατειλημμÎνο"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 72773b070cdae0b1ebb348f385dfac08be31a5bc..b91cdc50e8e75a2841d710790c8e91b9289145c9 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -56,15 +56,15 @@ msgstr "Το Email απεστάλη "
msgid "You need to set your user email before being able to send test emails."
msgstr "Î ÏÎπει να οÏίσετε το email του χÏήστη Ï€Ïιν να είστε σε θÎση να στείλετε δοκιμαστικά emails."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Κατάσταση αποστολής"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "ΚÏυπτογÏάφηση"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "ÎœÎθοδος πιστοποίησης"
@@ -95,17 +95,27 @@ msgstr "Αδυναμία Ï€Ïοσθήκης ομάδας"
#: ajax/decryptall.php:31
msgid "Files decrypted successfully"
-msgstr ""
+msgstr "Τα αÏχεία αποκÏυπτογÏαφήθηκαν με επιτυχία"
#: ajax/decryptall.php:33
msgid ""
"Couldn't decrypt your files, please check your owncloud.log or ask your "
"administrator"
-msgstr ""
+msgstr "Δεν ήταν δυνατή η αποκÏυπτογÏάφηση των αÏχείων, παÏακαλώ ελÎγξτε το owncloud.log ή ενημεÏωθείτε από τον διαχειÏιστή συστημάτων σας"
#: ajax/decryptall.php:36
msgid "Couldn't decrypt your files, check your password and try again"
-msgstr ""
+msgstr "Δεν ήταν δυνατή η αποκÏυπτογÏάφηση των αÏχείων σας, ελÎγξτε τον κωδικό Ï€Ïόσβασής σας και δοκιμάστε πάλι"
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Τα κλειδιά κÏυπτογÏάφησης αφαιÏÎθηκαν οÏιστικά"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Δεν ήταν δυνατή η οÏιστική διαγÏαφή των κλειδιών κÏυπτογÏάφησής σας, παÏακαλώ ελÎγξτε το owncloud.log ή επικοινωνήστε με τον διαχειÏιστή σας"
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -123,6 +133,16 @@ msgstr "Αδυναμία διαγÏαφής ομάδας"
msgid "Unable to delete user"
msgstr "Αδυναμία διαγÏαφής χÏήστη"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Η επαναφοÏά αντιγÏάφων ασφαλείας Îγινε με επιτυχία"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Δεν ήταν δυνατή η επαναφοÏά των κλειδιών κÏυπτογÏάφησής σας, παÏακαλώ ελÎγξτε το owncloud.log ή επικοινωνήστε με τον διαχειÏιστή σας"
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Η γλώσσα άλλαξε"
@@ -178,7 +198,7 @@ msgstr "Το βασικό πλαίσιο δεν υποστηÏίζει αλλα
msgid "Unable to change password"
msgstr "Αδυναμία αλλαγής συνθηματικοÏ"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "ΑποστÎλεται..."
@@ -234,34 +254,42 @@ msgstr "ΕνημÎÏωση"
msgid "Updated"
msgstr "ΕνημεÏώθηκε"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Επιλογή εικόνας Ï€Ïοφίλ"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Î Î¿Î»Ï Î±Î´Ïναμο συνθηματικό"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "ΑδÏναμο συνθηματικό"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "ÎœÎÏ„Ïιο συνθηματικό"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Καλό συνθηματικό"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Δυνατό συνθηματικό"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "ΑποκÏυπτογÏάφηση αÏχείων... ΠαÏακαλώ πεÏιμÎνετε, αυτό μποÏεί να πάÏει κάποιο χÏόνο."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "ΟÏιστική διαγÏαφή των κλειδιων κÏυπτογÏάφησης."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "ΕπαναφοÏά των κλειδιών κÏυπτογÏάφησης."
+
#: js/users.js:47
msgid "deleted"
msgstr "διαγÏάφηκε"
@@ -274,8 +302,8 @@ msgstr "αναίÏεση"
msgid "Unable to remove user"
msgstr "Αδυναμία αφαίÏεση χÏήστη"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Ομάδες"
@@ -307,7 +335,7 @@ msgstr "Î ÏÎπει να δοθεί ÎγκυÏο συνθηματικό"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Î Ïοειδοποίηση: Ο μητÏικός κατάλογος του χÏήστη \"{user}\" υπάÏχει ήδη"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__όνομα_γλώσσας__"
@@ -375,7 +403,7 @@ msgid ""
"root."
msgstr "Ο κατάλογος δεδομÎνων και τα αÏχεία σας πιθανόν να είναι διαθÎσιμα στο διαδίκτυο. Το αÏχείο .htaccess δεν δουλεÏει. Σας Ï€Ïοτείνουμε ανεπιφÏλακτα να Ïυθμίσετε το διακομιστή σας με Ï„Îτοιο Ï„Ïόπο ώστε ο κατάλογος δεδομÎνων να μην είναι πλÎον Ï€Ïοσβάσιμος ή να μετακινήσετε τον κατάλογο δεδομÎνων Îξω από τη Ïίζα του καταλόγου του διακομιστή."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "ΡÏθμιση Î Ïοειδοποίησης"
@@ -390,53 +418,65 @@ msgstr "Ο διακομιστής σας δεν Îχει Ïυθμιστεί κα
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "ΕλÎγξτε ξανά τις <a href=\"%s\">οδηγίες εγκατάστασης</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Η ενοτητα 'fileinfo' λειπει"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "Η PHP ενοτητα 'fileinfo' λειπει. Σας συνιστοÏμε να ενεÏγοποιήσετε αυτή την ενότητα για να Îχετε καλÏτεÏα αποτελÎσματα με τον εντοπισμό Ï„Ïπου MIME. "
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Η Îκδοση PHP είναι απαÏχαιωμÎνη"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Η Îκδοση PHP είναι απαÏχαιωμÎνη. ΣυνιστοÏμε ανεπιφÏλακτα να ενημεÏώσετε στην 5.3.8 ή νεώτεÏη καθώς παλαιότεÏες εκδόσεις είναι γνωστό πως πεÏιÎχουν σφάλματα. Είναι πιθανόν ότι αυτή η εγκατάσταση δεν λειτουÏγεί σωστά."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Η μετάφÏαση δεν δουλεÏει"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Οι Ïυθμίσεις τοποθεσίας συστήματος δεν μποÏοÏν να οÏιστοÏν σε κάποιες που δεν υποστηÏίζουν UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Αυτό σημαίνει ότι μποÏεί να υπάÏχουν Ï€Ïοβλήματα με κάποιους χαÏακτήÏες στα ονόματα αÏχείων."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "ΣυνιστοÏμε σοβαÏά να εγκαταστήσετε τα απαιτοÏμενα πακÎτα στο σÏστημά σας ώστε να υποστηÏίζεται μια από τις ακόλουθες Ïυθμίσεις τοποθεσίας: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Η σÏνδεση στο διαδίκτυο δεν δουλεÏει"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -445,198 +485,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Αυτός ο διακομιστής δεν Îχει ενεÏγή σÏνδεση στο διαδίκτυο. Αυτό σημαίνει ότι κάποιες υπηÏεσίες όπως η σÏνδεση με εξωτεÏικοÏÏ‚ αποθηκευτικοÏÏ‚ χώÏους, ειδοποιήσεις πεÏί ενημεÏώσεων ή η εγκατάσταση 3ων εφαÏμογών δεν θα είναι διαθÎσιμες. Η Ï€Ïόσβαση απομακÏυσμÎνων αÏχείων και η αποστολή ειδοποιήσεων μÎσω ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου μποÏεί επίσης να μην είναι διαθÎσιμες. Î Ïοτείνουμε να ενεÏγοποιήσετε την Ï€Ïόσβαση στο διαδίκτυο για αυτόν το διακομιστή εάν θÎλετε να χÏησιμοποιήσετε όλες τις υπηÏεσίες."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "Η τελευταία εκτÎλεση του cron ήταν στις %s"
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "Η τελευταία εκτÎλεση του cron ήταν στις %s. Αυτό είναι πάνω από μια ÏŽÏα Ï€Ïιν, ίσως κάτι δεν πάει καλά."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "Η διεÏγασία cron δεν Îχει εκτελεστεί ακόμα!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Εκτελεί μια διεÏγασία κάθε φοÏά που φοÏτώνεται μια σελίδα"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "Το cron.php είναι καταχωÏημÎνο σε μια υπηÏεσία webcron ώστε να καλεί το cron.php κάθε 15 λεπτά μÎσω http."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "ΧÏήση της υπηÏεσίας cron του συστήματος για να καλεστεί το αÏχείο cron.php κάθε 15 λεπτά."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "ΔιαμοιÏασμός"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "ΕνεÏγοποίηση API διαμοιÏασμοÏ"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "ΕπιτÏÎπει την χÏήση του API διαμοιÏÎ±ÏƒÎ¼Î¿Ï ÏƒÎµ εφαÏμογÎÏ‚ "
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "ΕπιτÏÎπονται οι σÏνδεσμοι"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "ΕπιτÏÎπει τους χÏήστες να διαμοιÏάζουν δημόσια με συνδÎσμους"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr "Επιβολή Ï€Ïοστασίας με κωδικό"
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "ΕπιτÏÎπεται το κοινόχÏηστο ανÎβασμα"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "ΕπιτÏÎπει τους χÏήστες να καθιστοÏν άλλους χÏήστες ικανοÏÏ‚ να ανεβάζουν στους κοινόχÏηστους φακÎλους τους"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "ΟÏισμός εÏήμην ημεÏομηνίας λήξης"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Λήξη μετά από"
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "ημÎÏες"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Επιβολή της ημεÏομηνίας λήξης"
-#: templates/admin.php:235
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "ΕπιτÏÎπει τους χÏήστες να διαμοιÏάζουν δημόσια με συνδÎσμους"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "ΕπιτÏÎπεται ο επαναδιαμοιÏασμός"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "ΕπιτÏÎπει στους χÏήστες να διαμοιÏάζουν ότι τους Îχει διαμοιÏαστεί"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "ΕπιτÏÎπεται στους χÏήστες ο διαμοιÏασμός με οποιονδήποτε"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "ΕπιτÏÎπεται στους χÏήστες ο διαμοιÏασμός μόνο με χÏήστες της ίδιας ομάδας"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "ΕπιτÏÎπονται ειδοποιήσεις ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
+msgstr "ΕπιτÏÎψτε στους χÏήστες να στÎλνουν ειδοποιήσεις μÎσω ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου για κοινόχÏηστα αÏχεία"
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr "ΕξαίÏεση ομάδων από τον διαμοιÏασμό"
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "ΑυτÎÏ‚ οι ομάδες θα συνεχίσουν να λαμβάνουν διαμοιÏασμοÏÏ‚, αλλά δεν θα είναι δυνατό να τους δημιουÏγήσουν."
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Ασφάλεια"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Επιβολή χÏήσης HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Επιβάλλει τους πελάτες να συνδÎονται στο %s μÎσω κÏυπτογÏαφημÎνης σÏνδεσης."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "ΠαÏακαλώ συνδεθείτε στο %s σας μÎσω HTTPS για να ενεÏγοποιήσετε ή να απενεÏγοποιήσετε την επιβολή του SSL."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Διακομιστής Email"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "ΧÏησιμοποιείται για αποστολή ειδοποιήσεων."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Από τη διεÏθυνση"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Απαιτείται πιστοποίηση"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "ΔιεÏθυνση διακομιστή"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "ΘÏÏα"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Πιστοποιητικά"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "Όνομα χÏήστη SMTP"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "Συνθηματικό SMTP"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Δοκιμή Ïυθμίσεων email"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Αποστολή email"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "ΚαταγÏαφÎÏ‚"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Επίπεδο καταγÏαφής"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "ΠεÏισσότεÏα"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "ΛιγότεÏα"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Έκδοση"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -789,29 +837,33 @@ msgstr "Γλώσσα"
msgid "Help translate"
msgstr "Βοηθήστε στη μετάφÏαση"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "ΧÏησιμοποιήστε αυτήν την διεÏθυνση για να αποκτήσετε <a href=\"%s\" target=\"_blank\">Ï€Ïόσβαση στα αÏχεία σας μÎσω WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "Η εφαÏμογή κÏυπτογÏάφησης δεν είναι πλÎον ενεÏγοποιημÎνη, παÏακαλώ αποκÏυπτογÏαφήστε όλα τα αÏχεία σας"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Συνθηματικό εισόδου"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "ΑποκÏυπτογÏάφηση όλων των ΑÏχείων"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Τα κλειδιά κÏυπτογÏάφησής σας μεταφÎÏονται σε θÎση αντιγÏάφου ασφαλείας. Αν κάτι πάει στÏαβά, μποÏείτε να τα επαναφÎÏετε. ΔιαγÏάψτε τα οÏιστικά μόνο αν είστε βÎβαιοι ότι όλα τα αÏχεία αποκÏυπτογÏαφήθηκαν σωστά."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "ΕπαναφοÏά κλειδιών κÏυπτογÏάφησης"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "ΔιαγÏαφή κλειδιών κÏυπτογÏάφησης"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Όνομα ΣÏνδεσης"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 17250f70babc0b9d44ed2579c3317a0a3f4bc33c..2408402962acbba28d2e056423ac117e1386422f 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 09:15+0000\n"
+"Last-Translator: pe_ppe <peppe@cs.uoi.gr>\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"
@@ -73,6 +73,10 @@ msgstr "ΠάÏτε πάνω από τις Ï€Ïόσφατες Ïυθμίσεις
msgid "Keep settings?"
msgstr "ΔιατήÏηση Ïυθμίσεων;"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Αδυναμία Ï€Ïοσθήκης Ïυθμίσεων διακομιστή"
@@ -89,6 +93,18 @@ msgstr "Επιτυχία"
msgid "Error"
msgstr "Σφάλμα"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "ΠαÏακαλώ οÏίστε Îνα βασικό ΔιακεκÏιμÎνο Όνομα"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Δεν ήταν δυνατό να καθοÏιστεί το βασικό ΔιακεκÏιμÎνο Όνομα"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "ΠαÏακαλώ οÏίστε την θÏÏα"
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Η διαμόÏφωση είναι εντάξει"
@@ -129,28 +145,44 @@ msgstr "ΘÎλετε να διαγÏάψετε τις Ï„ÏÎχουσες Ïυθ
msgid "Confirm Deletion"
msgstr "Επιβεβαίωση ΔιαγÏαφής"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s ομάδα βÏÎθηκε"
msgstr[1] "%s ομάδες βÏÎθηκαν"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s χÏήστης βÏÎθηκε"
msgstr[1] "%s χÏήστες βÏÎθηκαν"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "ΆκυÏος εξυπηÏετητής"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Αδυναμία εÏÏεσης επιθυμητου χαÏακτηÏιστικοÏ"
+#: settings.php:52
+msgid "Server"
+msgstr "Διακομιστής"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "ΦίλτÏο χÏηστών"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Group Filter"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Αποθήκευση"
@@ -223,10 +255,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "ΟÏίζει το φίλτÏο που θα εφαÏμοστεί, όταν επιχειÏιθεί σÏνδεση. Το %%uid αντικαθιστά το όνομα χÏήστη κατά τη σÏνδεση. ΠαÏάδειγμα: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Διακομιστής"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Î Ïοσθήκη Ρυθμίσεων Διακομιστή"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Απαλοιφή Ïυθμίσεων"
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Διακομιστής"
@@ -290,6 +335,14 @@ msgstr "ΕπιστÏοφή"
msgid "Continue"
msgstr "ΣυνÎχεια"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Για Ï€ÏοχωÏημÎνους"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
@@ -339,7 +392,7 @@ msgstr "ΣÏνδεση μόνο με το διακομιστή-αντίγÏαφ
#: templates/settings.php:26
msgid "Case insensitive LDAP server (Windows)"
-msgstr ""
+msgstr "Διακομιστής LDAP με διάκÏιση πεζών-κεφαλαίων (Windows)"
#: templates/settings.php:27
msgid "Turn off SSL certificate validation."
@@ -420,18 +473,18 @@ msgstr "ΦωλιασμÎνες ομάδες"
msgid ""
"When switched on, groups that contain groups are supported. (Only works if "
"the group member attribute contains DNs.)"
-msgstr ""
+msgstr "Όταν ενεÏγοποιηθεί, οι ομάδες που πεÏιÎχουν ομάδες υποστηÏίζονται. (ΛειτουÏγεί μόνο αν το χαÏακτηÏιστικό μÎλους ομάδες πεÏιÎχει ΔιακεκÏιμÎνα Ονόματα.)"
#: templates/settings.php:40
msgid "Paging chunksize"
-msgstr ""
+msgstr "ÎœÎγεθος σελιδοποίησης"
#: templates/settings.php:40
msgid ""
"Chunksize used for paged LDAP searches that may return bulky results like "
"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
"those situations.)"
-msgstr ""
+msgstr "ÎœÎγεθος τμήματος που χÏησιμοποιείται για την σελιδοποίηση αναζητήσεων LDAP που μποÏεί να επιστÏÎψουν πολλά δεδομÎνα, όπως απαÏίθμηση χÏηστών ή ομάδων. (Η τιμή 0 απενεÏγοποιεί την σελιδοποίηση των αναζητήσεων LDAP σε αυτÎÏ‚ τις πεÏιπτώσεις.)"
#: templates/settings.php:42
msgid "Special Attributes"
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 451338c41403e0775c2e639d0e50d93c7e50a615..5b28fd39c64f4792aed9a0d43851d1a6ef0660d1 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: en@pirate\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -59,207 +64,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -291,140 +296,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passcode"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -456,18 +470,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -668,6 +683,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passcode"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -793,7 +812,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index fb845644ff7e9831a625dd2219a15688223107e2..0480be0b676bce82cf9c0e01f4249c4c9e8b645d 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Download"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/en@pirate/files_encryption.po b/l10n/en@pirate/files_encryption.po
index 1716bac96c661be7c4d796ad33abdcdc4bf6b54f..c3d4fb140b65d27c8baa58517b8a9966df58f666 100644
--- a/l10n/en@pirate/files_encryption.po
+++ b/l10n/en@pirate/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/en@pirate/files_external.po b/l10n/en@pirate/files_external.po
index 2b68139e501c5f42a10974938e96b5f393510022..99e7c3708d6c0fe79d79b9bc52673dd6e5006704 100644
--- a/l10n/en@pirate/files_external.po
+++ b/l10n/en@pirate/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index 1a0792dafc6cf0d05274cd94f77b9a3f0b92480c..02f8de7e1d3ac6bb31a9f125f12c4e453789d211 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: en@pirate\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -34,6 +58,14 @@ msgstr ""
msgid "Password"
msgstr "Secret Code"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -62,11 +94,11 @@ msgstr ""
msgid "Download"
msgstr "Download"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/en@pirate/files_trashbin.po b/l10n/en@pirate/files_trashbin.po
index 09c83d1aa96a0398e230c099feeef05de86a6d62..8b36a8c34e87241695c5bf81fd5d7d5425c2cdd3 100644
--- a/l10n/en@pirate/files_trashbin.po
+++ b/l10n/en@pirate/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/en@pirate/lib.po b/l10n/en@pirate/lib.po
index 586990c278543b04c39ff392273f81c119939e02..411e050decb303c00b2a0f62c183fe598d604a96 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: en@pirate\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr "web services under your control"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po
index 249e5c1756f9f971195e122834b58a62fd26772c..c821fb32335001c5d1e5874d9fff569493b9d2e9 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
index d009ac6f533de6e3264ca72583539fc5072a070f..f66399696630937eaaeafc9036a9f01a9fd15edd 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr ""
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index 293b14da5c36223848aaeb2ccbc7c101e922fa66..0dbfe73cdd84cfce8f3b4146e98339fb31b97e3a 100644
--- a/l10n/en_GB/core.po
+++ b/l10n/en_GB/core.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 11:31+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"
@@ -18,11 +18,11 @@ msgstr ""
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "Expiration date is in the past."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Couldn't send mail to following users: %s "
@@ -39,6 +39,11 @@ msgstr "Turned off maintenance mode"
msgid "Updated database"
msgstr "Updated database"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr "Disabled incompatible apps: %s"
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "No image or file provided"
@@ -59,207 +64,207 @@ msgstr "No temporary profile picture available, try again"
msgid "No crop data provided"
msgstr "No crop data provided"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sunday"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Monday"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Tuesday"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Wednesday"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Thursday"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Friday"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Saturday"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "January"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "February"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "March"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "May"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "June"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "July"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "October"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "December"
-#: js/js.js:483
+#: js/js.js:496
msgid "Settings"
msgstr "Settings"
-#: js/js.js:583
+#: js/js.js:596
msgid "Saving..."
msgstr "Saving..."
-#: js/js.js:1240
+#: js/js.js:1220
msgid "seconds ago"
msgstr "seconds ago"
-#: js/js.js:1241
+#: js/js.js:1221
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minute ago"
msgstr[1] "%n minutes ago"
-#: js/js.js:1242
+#: js/js.js:1222
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n hour ago"
msgstr[1] "%n hours ago"
-#: js/js.js:1243
+#: js/js.js:1223
msgid "today"
msgstr "today"
-#: js/js.js:1244
+#: js/js.js:1224
msgid "yesterday"
msgstr "yesterday"
-#: js/js.js:1245
+#: js/js.js:1225
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n day ago"
msgstr[1] "%n days ago"
-#: js/js.js:1246
+#: js/js.js:1226
msgid "last month"
msgstr "last month"
-#: js/js.js:1247
+#: js/js.js:1227
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n month ago"
msgstr[1] "%n months ago"
-#: js/js.js:1248
+#: js/js.js:1228
msgid "last year"
msgstr "last year"
-#: js/js.js:1249
+#: js/js.js:1229
msgid "years ago"
msgstr "years ago"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Choose"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Error loading file picker template: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Yes"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Choose"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Error loading file picker template: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Error loading message template: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} file conflict"
msgstr[1] "{count} file conflicts"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "One file conflict"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "New Files"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Already existing files"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Which files do you wish to keep?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
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:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancel"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continue"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(all selected)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} selected)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Error loading file exists template"
@@ -283,148 +288,157 @@ msgstr "Good password"
msgid "Strong password"
msgstr "Strong password"
-#: js/share.js:51 js/share.js:66 js/share.js:106
+#: js/share.js:69 js/share.js:84 js/share.js:127
msgid "Shared"
msgstr "Shared"
-#: js/share.js:109
+#: js/share.js:130
msgid "Share"
msgstr "Share"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:195 js/share.js:208 js/share.js:215 js/share.js:822
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:197 js/share.js:885
msgid "Error while sharing"
msgstr "Error whilst sharing"
-#: js/share.js:171
+#: js/share.js:208
msgid "Error while unsharing"
msgstr "Error whilst unsharing"
-#: js/share.js:178
+#: js/share.js:215
msgid "Error while changing permissions"
msgstr "Error whilst changing permissions"
-#: js/share.js:188
+#: js/share.js:225
msgid "Shared with you and the group {group} by {owner}"
msgstr "Shared with you and the group {group} by {owner}"
-#: js/share.js:190
+#: js/share.js:227
msgid "Shared with you by {owner}"
msgstr "Shared with you by {owner}"
-#: js/share.js:214
+#: js/share.js:251
msgid "Share with user or group …"
msgstr "Share with user or group …"
-#: js/share.js:220
+#: js/share.js:257
msgid "Share link"
msgstr "Share link"
-#: js/share.js:223
+#: js/share.js:263
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "The public link will expire no later than {days} days after it is created"
+
+#: js/share.js:265
+msgid "By default the public link will expire after {days} days"
+msgstr "By default the public link will expire after {days} days"
+
+#: js/share.js:270
msgid "Password protect"
msgstr "Password protect"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Password"
+#: js/share.js:272
+msgid "Choose a password for the public link"
+msgstr "Choose a password for the public link"
-#: js/share.js:230
+#: js/share.js:278
msgid "Allow Public Upload"
msgstr "Allow Public Upload"
-#: js/share.js:234
+#: js/share.js:282
msgid "Email link to person"
msgstr "Email link to person"
-#: js/share.js:235
+#: js/share.js:283
msgid "Send"
msgstr "Send"
-#: js/share.js:240
+#: js/share.js:288
msgid "Set expiration date"
msgstr "Set expiration date"
-#: js/share.js:241
+#: js/share.js:289
msgid "Expiration date"
msgstr "Expiration date"
-#: js/share.js:277
+#: js/share.js:326
msgid "Share via email:"
msgstr "Share via email:"
-#: js/share.js:280
+#: js/share.js:329
msgid "No people found"
msgstr "No people found"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:377 js/share.js:438
msgid "group"
msgstr "group"
-#: js/share.js:357
+#: js/share.js:410
msgid "Resharing is not allowed"
msgstr "Resharing is not allowed"
-#: js/share.js:401
+#: js/share.js:454
msgid "Shared in {item} with {user}"
msgstr "Shared in {item} with {user}"
-#: js/share.js:423
+#: js/share.js:476
msgid "Unshare"
msgstr "Unshare"
-#: js/share.js:431
+#: js/share.js:484
msgid "notify by email"
msgstr "notify by email"
-#: js/share.js:434
+#: js/share.js:487
msgid "can edit"
msgstr "can edit"
-#: js/share.js:436
+#: js/share.js:489
msgid "access control"
msgstr "access control"
-#: js/share.js:439
+#: js/share.js:492
msgid "create"
msgstr "create"
-#: js/share.js:442
+#: js/share.js:495
msgid "update"
msgstr "update"
-#: js/share.js:445
+#: js/share.js:498
msgid "delete"
msgstr "delete"
-#: js/share.js:448
+#: js/share.js:501
msgid "share"
msgstr "share"
-#: js/share.js:721
+#: js/share.js:803
msgid "Password protected"
msgstr "Password protected"
-#: js/share.js:734
+#: js/share.js:822
msgid "Error unsetting expiration date"
msgstr "Error unsetting expiration date"
-#: js/share.js:752
+#: js/share.js:843
msgid "Error setting expiration date"
msgstr "Error setting expiration date"
-#: js/share.js:777
+#: js/share.js:872
msgid "Sending ..."
msgstr "Sending ..."
-#: js/share.js:788
+#: js/share.js:883
msgid "Email sent"
msgstr "Email sent"
-#: js/share.js:812
+#: js/share.js:907
msgid "Warning"
msgstr "Warning"
@@ -456,18 +470,19 @@ msgstr "Error loading dialog template: {error}"
msgid "No tags selected for deletion."
msgstr "No tags selected for deletion."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr "Updating {productName} to version {version}, this may take a while."
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Please reload the page."
-#: 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:52
+msgid "The update was unsuccessful."
+msgstr "The update was unsuccessful."
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "The update was successful. Redirecting you to ownCloud now."
@@ -668,6 +683,10 @@ msgstr "For information how to properly configure your server, please see the <a
msgid "Create an <strong>admin account</strong>"
msgstr "Create an <strong>admin account</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Password"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Storage & database"
@@ -793,8 +812,27 @@ msgstr "Thank you for your patience."
#: templates/update.admin.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."
+msgid "%s will be updated to version %s."
+msgstr "%s will be updated to version %s."
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr "The following apps will be disabled:"
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr "The theme %s has been disabled."
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr "Please make sure that the database, the config folder and the data folder have been backed up before proceeding."
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr "Start update"
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po
index f76c3ebaf6ed98184d567b1cabac1ed305a87bbb..6cd519e176fd667296ec07f879896da46208a5eb 100644
--- a/l10n/en_GB/files.po
+++ b/l10n/en_GB/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-27 12:03+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"
@@ -28,7 +28,7 @@ msgstr "Could not move %s - File with this name already exists"
msgid "Could not move %s"
msgstr "Could not move %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "File name cannot be empty."
@@ -37,18 +37,18 @@ msgstr "File name cannot be empty."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" is an invalid file name."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "The target folder has been moved or deleted."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -124,44 +124,48 @@ msgstr "Missing a temporary folder"
msgid "Failed to write to disk"
msgstr "Failed to write to disk"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Not enough storage available"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Upload failed. Could not find uploaded file"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Upload failed. Could not get file info."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Invalid directory."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Files"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "All files"
+
+#: js/file-upload.js:257
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:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "Total file size {size1} exceeds upload limit {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Not enough free space, you are uploading {size1} but only {size2} is left"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Upload cancelled."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Could not get result from server."
@@ -174,120 +178,120 @@ msgstr "File upload is in progress. Leaving the page now will cancel the upload.
msgid "URL cannot be empty"
msgstr "URL cannot be empty"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1170
msgid "{new_name} already exists"
msgstr "{new_name} already exists"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Could not create file"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Could not create folder"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Error fetching URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Share"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Delete permanently"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Rename"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:596 js/filelist.js:1665
msgid "Pending"
msgstr "Pending"
-#: js/filelist.js:916
+#: js/filelist.js:1121
msgid "Error moving file."
msgstr "Error moving file."
-#: js/filelist.js:924
+#: js/filelist.js:1129
msgid "Error moving file"
msgstr "Error moving file"
-#: js/filelist.js:924
+#: js/filelist.js:1129
msgid "Error"
msgstr "Error"
-#: js/filelist.js:988
+#: js/filelist.js:1207
msgid "Could not rename file"
msgstr "Could not rename file"
-#: js/filelist.js:1122
+#: js/filelist.js:1328
msgid "Error deleting file."
msgstr "Error deleting file."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1431 templates/list.php:62
msgid "Name"
msgstr "Name"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1432 templates/list.php:75
msgid "Size"
msgstr "Size"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1433 templates/list.php:78
msgid "Modified"
msgstr "Modified"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1443 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n folder"
msgstr[1] "%n folders"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1449 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n file"
msgstr[1] "%n files"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1573 js/filelist.js:1612
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Uploading %n file"
msgstr[1] "Uploading %n files"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" is an invalid file name."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Your storage is almost full ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Encryption App is enabled but your keys are not initialised, please log-out and log-in again"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -297,12 +301,12 @@ msgstr "Encryption was disabled but your files are still encrypted. Please go to
msgid "{dirs} and {files}"
msgstr "{dirs} and {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s could not be renamed"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Upload (max. %s)"
@@ -339,68 +343,75 @@ msgstr "Maximum input size for ZIP files"
msgid "Save"
msgstr "Save"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "New"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "New text file"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Text file"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "New folder"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Folder"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "From link"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Deleted files"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Cancel upload"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "You don’t have permission to upload or create files here"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Nothing in here. Upload something!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Download"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Delete"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Upload too large"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Files are being scanned, please wait."
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr "Currently scanning"
diff --git a/l10n/en_GB/files_encryption.po b/l10n/en_GB/files_encryption.po
index 11aed8c6424fb8288f441b9a11d863139be47da0..01f80e66e62096abbd532949c0e0c85db3e39fbd 100644
--- a/l10n/en_GB/files_encryption.po
+++ b/l10n/en_GB/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 12:10+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 16:07+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"
@@ -77,7 +77,7 @@ msgstr "Cannot decrypt this file, which is probably a shared file. Please ask th
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr "Unknown error. Please check your system settings or contact your administrator"
@@ -92,7 +92,7 @@ msgid ""
" 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:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Following users are not set up for encryption:"
@@ -112,91 +112,91 @@ msgstr "Go directly to your "
msgid "personal settings"
msgstr "personal settings"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Encryption"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
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:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Recovery key password"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Repeat recovery key password"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Enabled"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Disabled"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Change recovery key password:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Old recovery key password"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "New recovery key password"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Repeat new recovery key password"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Change Password"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Your private key password no longer matches your login password:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
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:14
+#: templates/settings-personal.php:13
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:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Old login password"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Current login password"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Update Private Key Password"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Enable password recovery:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
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:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "File recovery settings updated"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
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
index f809cd6fec83dc459c9b9d0eef0d2d7806d83809..985090d95ea43cf9127784d87d3595554526d37b 100644
--- a/l10n/en_GB/files_external.po
+++ b/l10n/en_GB/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 17:30+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 12:02+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"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr "App secret"
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,6 +166,10 @@ msgstr "SMB / CIFS using OC login"
msgid "Username as share"
msgstr "Username as share"
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr "Secure https://"
@@ -198,29 +202,29 @@ msgstr "Error configuring Google Drive storage"
msgid "Saved"
msgstr "Saved"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr "<b>Note:</b> "
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr " and "
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it."
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it."
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po
index a64162837a56e350518d6ae7d86331a361bb7403..1b9f0132beb5503629afa684c035fecc6eed0354 100644
--- a/l10n/en_GB/files_sharing.po
+++ b/l10n/en_GB/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Shared by {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "This share is password-protected"
@@ -34,6 +58,14 @@ msgstr "The password is wrong. Try again."
msgid "Password"
msgstr "Password"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: 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."
@@ -62,11 +94,11 @@ msgstr "For more info, please ask the person who sent this link."
msgid "Download"
msgstr "Download"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Download %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Direct link"
diff --git a/l10n/en_GB/files_trashbin.po b/l10n/en_GB/files_trashbin.po
index ed08368d3767f35f3b5b099a503fe0e684011257..ea8eac1083a08a7785a24b7d5b67546385d363c2 100644
--- a/l10n/en_GB/files_trashbin.po
+++ b/l10n/en_GB/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -28,38 +28,34 @@ msgstr "Couldn't delete %s permanently"
msgid "Couldn't restore %s"
msgstr "Couldn't restore %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Deleted files"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Restore"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Error"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Deleted Files"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "restored"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Nothing in here. Your recycle bin is empty!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Name"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Restore"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Deleted"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Delete"
diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po
index d3b60d7f7e301c98bc7702249a859c0652696363..3760eaad007bdbd730571045237ca39369de3f1a 100644
--- a/l10n/en_GB/lib.po
+++ b/l10n/en_GB/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 10:10+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-27 12:03+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"
@@ -18,11 +18,11 @@ msgstr ""
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:712
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr "You are accessing the server from an untrusted domain."
-#: base.php:713
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -77,23 +77,23 @@ msgstr "Invalid image"
msgid "web services under your control"
msgstr "web services under your control"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP download is turned off."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Files need to be downloaded one by one."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Back to Files"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Selected files too large to generate zip file."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -128,29 +128,29 @@ msgstr "App does not provide an info.xml file"
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"
-#: private/installer.php:141
+#: private/installer.php:138
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"
-#: private/installer.php:147
+#: private/installer.php:144
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"
-#: private/installer.php:160
+#: private/installer.php:157
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"
-#: private/installer.php:170
+#: private/installer.php:167
msgid "App directory already exists"
msgstr "App directory already exists"
-#: private/installer.php:183
+#: private/installer.php:180
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Can't create app folder. Please fix permissions. %s"
@@ -290,116 +290,127 @@ msgstr "Your web server is not yet properly setup to allow files synchronisation
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Please double check the <a href='%s'>installation guides</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s shared \"%s\" with you"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr "Sharing %s failed, because the file does not exist"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "You are not allowed to share %s"
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "Sharing %s failed, because the user %s is the item owner"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "Sharing %s failed, because the user %s does not exist"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "Sharing %s failed, because this item is already shared with %s"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "Sharing %s failed, because the group %s does not exist"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "Sharing %s failed, because %s is not a member of the group %s"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "You need to provide a password to create a public link, only protected links are allowed"
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "Sharing %s failed, because sharing with links is not allowed"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr "Share type %s is not valid for %s"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr "Setting permissions for %s failed, because the permissions exceed permissions granted to %s"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "Setting permissions for %s failed, because the item was not found"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr "Sharing backend %s must implement the interface OCP\\Share_Backend"
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr "Sharing backend %s not found"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr "Sharing backend for %s not found"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr "Sharing %s failed, because the user %s is the original sharer"
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr "Sharing %s failed, because the permissions exceed permissions granted to %s"
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr "Sharing %s failed, because resharing is not allowed"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr "Sharing %s failed, because the sharing backend for %s could not find its source"
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr "Sharing %s failed, because the file could not be found in the file cache"
-#: private/tags.php:193
+#: private/tags.php:183
#, 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
index d1cd7905e2060f91831aedadeb2b5d85310f449f..0c9247da485bc25488488a7b68af0fd7e13062dc 100644
--- a/l10n/en_GB/settings.po
+++ b/l10n/en_GB/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -48,15 +48,15 @@ msgstr "Email sent"
msgid "You need to set your user email before being able to send test emails."
msgstr "You need to set your user email before being able to send test emails."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Send mode"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Encryption"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Authentication method"
@@ -99,6 +99,16 @@ msgstr "Couldn't decrypt your files, please check your owncloud.log or ask your
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "Couldn't decrypt your files, check your password and try again"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Encryption keys deleted permanently"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator"
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Email saved"
@@ -115,6 +125,16 @@ msgstr "Unable to delete group"
msgid "Unable to delete user"
msgstr "Unable to delete user"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Backups restored successfully"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator"
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Language changed"
@@ -170,7 +190,7 @@ msgstr "Back-end doesn't support password change, but the user's encryption key
msgid "Unable to change password"
msgstr "Unable to change password"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Sending..."
@@ -226,34 +246,42 @@ msgstr "Update"
msgid "Updated"
msgstr "Updated"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Select a profile picture"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Very weak password"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Weak password"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "So-so password"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Good password"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Strong password"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Delete encryption keys permanently."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Restore encryption keys."
+
#: js/users.js:47
msgid "deleted"
msgstr "deleted"
@@ -266,8 +294,8 @@ msgstr "undo"
msgid "Unable to remove user"
msgstr "Unable to remove user"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Groups"
@@ -299,7 +327,7 @@ msgstr "A valid password must be provided"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Warning: Home directory for user \"{user}\" already exists"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "English (British English)"
@@ -367,7 +395,7 @@ msgid ""
"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:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Setup Warning"
@@ -382,53 +410,65 @@ msgstr "Your web server is not yet properly setup to allow files synchronisation
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:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Module 'fileinfo' missing"
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Your PHP version is outdated"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Locale not working"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "System locale can not be set to a one which supports UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "This means that there might be problems with certain characters in file names."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "We strongly suggest installing the required packages on your system to support one of the following locales: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Internet connection not working"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -437,198 +477,206 @@ msgid ""
"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:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "Last cron was executed at %s."
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "Last cron was executed at %s. This is more than an hour ago, something seems wrong."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "Cron was not executed yet!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Execute one task with each page loaded"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php is registered at a webcron service to call cron.php every 15 minutes over http."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Use system's cron service to call the cron.php file every 15 minutes."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Sharing"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Enable Share API"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Allow apps to use the Share API"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Allow links"
-#: templates/admin.php:220
-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:238
+msgid "Enforce password protection"
+msgstr "Enforce password protection"
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Allow public uploads"
-#: templates/admin.php:228
-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:245
+msgid "Set default expiration date"
+msgstr "Set default expiry date"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Expire after "
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "days"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Enforce expiry date"
+
+#: templates/admin.php:257
+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:235
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Allow resharing"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Allow users to share items shared with them again"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Allow users to share with anyone"
-#: templates/admin.php:246
+#: templates/admin.php:275
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:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Allow mail notification"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Allow users to send mail notification for shared files"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr "Set default expiry date"
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Expire after "
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr "Exclude groups from sharing"
-#: templates/admin.php:266
-msgid "days"
-msgstr "days"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr "Enforce expiry date"
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "These groups will still be able to receive shares, but not to initiate them."
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Security"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Enforce HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, 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:299
+#: templates/admin.php:329
#, 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:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Email Server"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "This is used for sending out notifications."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "From address"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr "mail"
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Authentication required"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Server address"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Port"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Credentials"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "SMTP Username"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "SMTP Password"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Test email settings"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Send email"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Log"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Log level"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "More"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Less"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Version"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +829,33 @@ msgstr "Language"
msgid "Help translate"
msgstr "Help translate"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "The encryption app is no longer enabled, please decrypt all your files"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Log-in password"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Decrypt all Files"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Restore Encryption Keys"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Delete Encryption Keys"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Login Name"
diff --git a/l10n/en_GB/user_ldap.po b/l10n/en_GB/user_ldap.po
index 77f55301f80b4efdcb254a285f05f3c194116529..e1463545a959e72c80c7bf72163c39236a44c817 100644
--- a/l10n/en_GB/user_ldap.po
+++ b/l10n/en_GB/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 16:07+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"
@@ -71,6 +71,10 @@ msgstr "Take over settings from recent server configuration?"
msgid "Keep settings?"
msgstr "Keep settings?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Server"
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Cannot add server configuration"
@@ -87,6 +91,18 @@ msgstr "Success"
msgid "Error"
msgstr "Error"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Please specify a Base DN"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Could not determine Base DN"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Please specify the port"
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Configuration OK"
@@ -127,28 +143,44 @@ msgstr "Do you really want to delete the current Server Configuration?"
msgid "Confirm Deletion"
msgstr "Confirm Deletion"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s group found"
msgstr[1] "%s groups found"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s user found"
msgstr[1] "%s users found"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Invalid Host"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Could not find the desired feature"
+#: settings.php:52
+msgid "Server"
+msgstr "Server"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "User Filter"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Login Filter"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Group Filter"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Save"
@@ -221,10 +253,23 @@ msgid ""
"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/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Server"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Server:"
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Add Server Configuration"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Delete Configuration"
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Host"
@@ -288,6 +333,14 @@ msgstr "Back"
msgid "Continue"
msgstr "Continue"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Expert"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Advanced"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/en_NZ/core.po b/l10n/en_NZ/core.po
index baf9502416de5dbc8b4e3a3741eb3a0e95db3740..74520feaf1dd3e5dcb20fa64d02cb33e39358ca8 100644
--- a/l10n/en_NZ/core.po
+++ b/l10n/en_NZ/core.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: en_NZ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/en_NZ/files.po b/l10n/en_NZ/files.po
index 0a6b95409106566e47c4574b9c92b4c21bf8d667..3d4f558dbbe29b418e008bcec19ff91f936345f8 100644
--- a/l10n/en_NZ/files.po
+++ b/l10n/en_NZ/files.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/en_NZ/files_encryption.po b/l10n/en_NZ/files_encryption.po
index 39470573e4d43803e1ded6a15094e891cce08e9d..9e85125170e5bf7093f7bf826250db10c015e021 100644
--- a/l10n/en_NZ/files_encryption.po
+++ b/l10n/en_NZ/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/en_NZ/files_external.po b/l10n/en_NZ/files_external.po
index e75381e21c9a222fb1aa471b8bd1b27fc4e3b204..dca47c9c29ba507f754f5708612cbdb579b8fc07 100644
--- a/l10n/en_NZ/files_external.po
+++ b/l10n/en_NZ/files_external.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/en_NZ/files_sharing.po b/l10n/en_NZ/files_sharing.po
index 0e4ed143576155987ddf7cda7087d6fac26ec9a3..df24267f1793ff9d831f1b6c681875c0aecbf8a6 100644
--- a/l10n/en_NZ/files_sharing.po
+++ b/l10n/en_NZ/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: en_NZ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/en_NZ/files_trashbin.po b/l10n/en_NZ/files_trashbin.po
index 0e9e75a3db5550b4de841688f1b17d9469de6ba8..b0d50546f7b73589721a4b63e9874621525d6c8d 100644
--- a/l10n/en_NZ/files_trashbin.po
+++ b/l10n/en_NZ/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/filelist.js:88 js/filelist.js:132 js/filelist.js:181
-msgid "Error"
-msgstr ""
-
-#: js/trash.js:48 templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
msgid "Restore"
msgstr ""
-#: js/trash.js:107
-msgid "Deleted Files"
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
msgstr ""
#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
diff --git a/l10n/en_NZ/lib.po b/l10n/en_NZ/lib.po
index a27d8b61f65c4e326516352fa46b2a20de9bd6e3..2a6df55c2844bb971c1889a495de52e0643c121f 100644
--- a/l10n/en_NZ/lib.po
+++ b/l10n/en_NZ/lib.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: en_NZ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:712
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:713
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -289,116 +289,127 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/en_NZ/settings.po b/l10n/en_NZ/settings.po
index 2d4a57c17eace436ae5d089468abce8831ccd860..c14d80e4eb9782558674ca49816020a556cebd63 100644
--- a/l10n/en_NZ/settings.po
+++ b/l10n/en_NZ/settings.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/en_NZ/user_ldap.po b/l10n/en_NZ/user_ldap.po
index 346e6243aee13f640f8ff2087f3c69be68b265a4..9d46e9625794f45fdaa4622c7a7897c86017def3 100644
--- a/l10n/en_NZ/user_ldap.po
+++ b/l10n/en_NZ/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr ""
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 87c2fbf530d8c6aa3d4cf7e1c28ad0a66785e99c..320a932b4f21263240042b3aae48954ac186a196 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -40,6 +40,11 @@ msgstr ""
msgid "Updated database"
msgstr "ÄœisdatiÄis datumbazo"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -60,229 +65,229 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "dimanĉo"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "lundo"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "mardo"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "merkredo"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "ĵaÅdo"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "vendredo"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "sabato"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januaro"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februaro"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marto"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Aprilo"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Majo"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Junio"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Julio"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "AÅgusto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Septembro"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktobro"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Novembro"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Decembro"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Agordo"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Konservante..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "sekundoj antaÅe"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "antaÅ %n minuto"
msgstr[1] "antaÅ %n minutoj"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "antaÅ %n horo"
msgstr[1] "antaÅ %n horoj"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "hodiaÅ"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "hieraÅ"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "antaÅ %n tago"
msgstr[1] "antaÅ %n tagoj"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "lastamonate"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "antaÅ %n monato"
msgstr[1] "antaÅ %n monatoj"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "lastajare"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "jaroj antaÅe"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Elekti"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Jes"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Elekti"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Akcepti"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} dosierkonflikto"
msgstr[1] "{count} dosierkonfliktoj"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Unu dosierkonflikto"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Novaj dosieroj"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Kiujn dosierojn vi volas konservi?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Se vi elektos ambaÅ eldonojn, la kopiota dosiero havos numeron aldonitan al sia nomo."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Nuligi"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(ĉiuj elektitas)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} elektitas)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
#: js/setup.js:84
msgid "Very weak password"
-msgstr ""
+msgstr "Tre malforta pasvorto"
#: js/setup.js:85
msgid "Weak password"
-msgstr ""
+msgstr "Malforta pasvorto"
#: js/setup.js:86
msgid "So-so password"
-msgstr ""
+msgstr "Mezaĉa pasvorto"
#: js/setup.js:87
msgid "Good password"
-msgstr ""
+msgstr "Bona pasvorto"
#: js/setup.js:88
msgid "Strong password"
-msgstr ""
+msgstr "Forta pasvorto"
#: js/share.js:51 js/share.js:66 js/share.js:106
msgid "Shared"
@@ -292,140 +297,149 @@ msgstr "Dividita"
msgid "Share"
msgstr "Kunhavigi"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Eraro"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Eraro dum kunhavigo"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Eraro dum malkunhavigo"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Eraro dum ÅanÄo de permesoj"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Kunhavigita kun vi kaj la grupo {group} de {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Kunhavigita kun vi de {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "Kunhavigi kun uzanto aÅ grupo..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Konhavigi ligilon"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Protekti per pasvorto"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Pasvorto"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "RetpoÅti la ligilon al ulo"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Sendi"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Agordi limdaton"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Limdato"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Kunhavigi per retpoÅto:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Ne troviÄis gento"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "grupo"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Rekunhavigo ne permesatas"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Kunhavigita en {item} kun {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Malkunhavigi"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "avizi per retpoÅto"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "povas redakti"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "alirkontrolo"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "krei"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "Äisdatigi"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "forigi"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "kunhavigi"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Protektita per pasvorto"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Eraro dum malagordado de limdato"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Eraro dum agordado de limdato"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Sendante..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "La retpoÅtaĵo sendiÄis"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Averto"
@@ -457,18 +471,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr "Neniu etikedo elektitas por forigo."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Bonvolu reÅargi la paÄon."
-#: 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 "La Äisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouda komunumo</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La Äisdatigo estis sukcesa. Alidirektante nun al ownCloud."
@@ -669,6 +684,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Krei <strong>administran konton</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Pasvorto"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -794,8 +813,27 @@ msgstr "Dankon pro via pacienco."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud ÄisdatiÄas al eldono %s, tio ĉi povas daÅri je iom da tempo."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index d27d9a664654b168cf6a64b80c6692b607903f78..e514619abe72e95006c0580275015f2fc73db000 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr "Ne eblis movi %s: dosiero kun ĉi tiu nomo jam ekzistas"
msgid "Could not move %s"
msgstr "Ne eblis movi %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Dosiernomo devas ne malpleni."
@@ -37,18 +37,18 @@ msgstr "Dosiernomo devas ne malpleni."
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nevalida nomo: “\\â€, “/â€, “<â€, “>â€, “:â€, “\"â€, “|â€, “?†kaj “*†ne permesatas."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -124,44 +124,48 @@ msgstr "Mankas provizora dosierujo."
msgid "Failed to write to disk"
msgstr "Malsukcesis skribo al disko"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Ne haveblas sufiĉa memoro"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "La alÅuto malsukcesis. Ne troviÄis alÅutota dosiero."
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "La alÅuto malsukcesis. Ne povis ekhaviÄi informo pri dosiero."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Nevalida dosierujo."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Dosieroj"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "Ne povis alÅutiÄi {filename} ĉar Äi estas dosierujo aÅ Äi havas 0 duumokojn"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "La alÅuto nuliÄis."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Ne povis ekhaviÄi rezulto el la servilo."
@@ -174,120 +178,120 @@ msgstr "DosieralÅuto plenumiÄas. Lasi la paÄon nun nuligus la alÅuton."
msgid "URL cannot be empty"
msgstr "La URL ne povas malpleni"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} jam ekzistas"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Ne povis kreiÄi dosiero"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Ne povis kreiÄi dosierujo"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Kunhavigi"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Forigi por ĉiam"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Alinomigi"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Traktotaj"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Eraris movo de dosiero"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Eraro"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Ne povis alinomiÄi dosiero"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Nomo"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Grando"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Modifita"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n dosierujo"
msgstr[1] "%n dosierujoj"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n dosiero"
msgstr[1] "%n dosieroj"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "AlÅutatas %n dosiero"
msgstr[1] "AlÅutatas %n dosieroj"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Via memoro preskaÅ plenas ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -297,12 +301,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr "{dirs} kaj {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s ne povis alinomiÄi"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -339,68 +343,75 @@ msgstr "Maksimuma enirgrando por ZIP-dosieroj"
msgid "Save"
msgstr "Konservi"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "Nova"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Tekstodosiero"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Nova dosierujo"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Dosierujo"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "El ligilo"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Forigitaj dosieroj"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Nuligi alÅuton"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Vi ne havas permeson alÅuti aÅ krei dosierojn ĉi tie"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Nenio estas ĉi tie. AlÅutu ion!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "ElÅuti"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Forigi"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "AlÅuto tro larÄa"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Dosieroj estas skanataj, bonvolu atendi."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Nuna skano"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index 7fcbd73bde2b7da41f2ff11134211eed9288b94f..8f21087f100af461caa5207d23f03d19624fc7ac 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -92,7 +92,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -112,91 +112,91 @@ msgstr "Iri direkte al via"
msgid "personal settings"
msgstr "persona agordo"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Ĉifrado"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Kapabligita"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Malkapabligita"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "ÅœarÄi pasvorton"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "La pasvorto de via malpublika klavo ne plu kongruas kun via ensaluta pasvorto:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Malnova ensaluta pasvorto"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Nuna ensaluta pasvorto"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Äœisdatigi la pasvorton de la malpublika klavo"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index 8f19c66f9dbe7173a8ba0ea2a1c09f65e75775d4..1ef9fae4fe5aa0b5a0c3c31dde0bfa917ca5d0b5 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-25 21:53+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,159 +20,163 @@ msgstr ""
#: appinfo/app.php:34
msgid "Local"
-msgstr ""
+msgstr "Loka"
-#: appinfo/app.php:36
+#: appinfo/app.php:37
msgid "Location"
msgstr "Loko"
-#: appinfo/app.php:39
+#: appinfo/app.php:40
msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
-#: appinfo/app.php:41
+#: appinfo/app.php:43
msgid "Key"
-msgstr ""
+msgstr "Klavo"
-#: appinfo/app.php:42
+#: appinfo/app.php:44
msgid "Secret"
-msgstr ""
+msgstr "Sekreto"
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
msgid "Bucket"
msgstr ""
-#: appinfo/app.php:47
+#: appinfo/app.php:49
msgid "Amazon S3 and compliant"
msgstr ""
-#: appinfo/app.php:49
+#: appinfo/app.php:52
msgid "Access Key"
-msgstr ""
+msgstr "Aliroklavo"
-#: appinfo/app.php:50
+#: appinfo/app.php:53
msgid "Secret Key"
-msgstr ""
+msgstr "Sekretoklavo"
-#: appinfo/app.php:52
+#: appinfo/app.php:55
msgid "Hostname (optional)"
-msgstr ""
+msgstr "Gastigonomo (malnepra)"
-#: appinfo/app.php:53
+#: appinfo/app.php:56
msgid "Port (optional)"
-msgstr ""
+msgstr "Pordo (malnepra)"
-#: appinfo/app.php:54
+#: appinfo/app.php:57
msgid "Region (optional)"
-msgstr ""
+msgstr "Regiono (malnepra)"
-#: appinfo/app.php:55
+#: appinfo/app.php:58
msgid "Enable SSL"
-msgstr ""
+msgstr "Kapabligi SSL-on"
-#: appinfo/app.php:56
+#: appinfo/app.php:59
msgid "Enable Path Style"
msgstr ""
-#: appinfo/app.php:63
+#: appinfo/app.php:67
msgid "App key"
-msgstr ""
+msgstr "Aplikaĵoklavo"
-#: appinfo/app.php:64
+#: appinfo/app.php:68
msgid "App secret"
-msgstr ""
+msgstr "Aplikaĵosekreto"
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
+msgid "Host"
+msgstr "Gastigo"
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
msgid "Username"
msgstr "Uzantonomo"
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
msgid "Password"
msgstr "Pasvorto"
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
msgid "Root"
-msgstr ""
+msgstr "Radiko"
-#: appinfo/app.php:77
+#: appinfo/app.php:82
msgid "Secure ftps://"
-msgstr ""
+msgstr "Sekura ftps://"
-#: appinfo/app.php:84
+#: appinfo/app.php:90
msgid "Client ID"
-msgstr ""
+msgstr "Klientidentigilo"
-#: appinfo/app.php:85
+#: appinfo/app.php:91
msgid "Client secret"
-msgstr ""
+msgstr "Klientosekreto"
-#: appinfo/app.php:92
+#: appinfo/app.php:98
msgid "OpenStack Object Storage"
-msgstr ""
+msgstr "OpenStack Object Storage"
-#: appinfo/app.php:94
+#: appinfo/app.php:101
msgid "Username (required)"
-msgstr ""
+msgstr "Uzantonomo (nepra)"
-#: appinfo/app.php:95
+#: appinfo/app.php:102
msgid "Bucket (required)"
msgstr ""
-#: appinfo/app.php:96
+#: appinfo/app.php:103
msgid "Region (optional for OpenStack Object Storage)"
-msgstr ""
+msgstr "Regiono (malnepra por OpenStack Object Storage)"
-#: appinfo/app.php:97
+#: appinfo/app.php:104
msgid "API Key (required for Rackspace Cloud Files)"
-msgstr ""
+msgstr "API-klavo (nepra por Rackspace Cloud Files)"
-#: appinfo/app.php:98
+#: appinfo/app.php:105
msgid "Tenantname (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:99
+#: appinfo/app.php:106
msgid "Password (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Pasvorto (nepra por OpenStack Object Storage)"
-#: appinfo/app.php:100
+#: appinfo/app.php:107
msgid "Service Name (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Servonomo (nepra por OpenStack Object Storage)"
-#: appinfo/app.php:101
+#: appinfo/app.php:108
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:102
+#: appinfo/app.php:109
msgid "Timeout of HTTP requests in seconds (optional)"
msgstr ""
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
msgid "Share"
msgstr "Kunhavigi"
-#: appinfo/app.php:119
+#: appinfo/app.php:127
msgid "SMB / CIFS using OC login"
msgstr ""
-#: appinfo/app.php:122
+#: appinfo/app.php:131
msgid "Username as share"
msgstr ""
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:141 appinfo/app.php:152
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:145 appinfo/app.php:156
msgid "Secure https://"
-msgstr ""
+msgstr "Sekura https://"
-#: appinfo/app.php:144
+#: appinfo/app.php:155
msgid "Remote subfolder"
-msgstr ""
+msgstr "Malloka subdosierujo"
#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
msgid "Access granted"
@@ -195,31 +200,31 @@ msgstr "Eraro dum agordado de la memorservo Google Drive"
#: js/settings.js:318 js/settings.js:325
msgid "Saved"
-msgstr ""
+msgstr "Konservita"
-#: lib/config.php:598
+#: lib/config.php:674
msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>Noto:</b>"
-#: lib/config.php:608
+#: lib/config.php:684
msgid " and "
-msgstr ""
+msgstr "kaj"
-#: lib/config.php:630
+#: lib/config.php:706
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:708
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:710
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -236,7 +241,7 @@ msgstr "Dosierujnomo"
#: templates/settings.php:9
msgid "External storage"
-msgstr ""
+msgstr "Malena memorilo"
#: templates/settings.php:10
msgid "Configuration"
@@ -248,15 +253,15 @@ msgstr "Malneproj"
#: templates/settings.php:12
msgid "Available for"
-msgstr ""
+msgstr "Disponebla por"
#: templates/settings.php:32
msgid "Add storage"
-msgstr ""
+msgstr "Aldoni memorilon"
#: templates/settings.php:92
msgid "No user or group"
-msgstr ""
+msgstr "Neniu uzanto aÅ grupo"
#: templates/settings.php:95
msgid "All Users"
@@ -281,7 +286,7 @@ msgstr "Kapabligi malenan memorilon de uzanto"
#: templates/settings.php:135
msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "Permesi uzantojn munti la jenajn malenajn memorilojn"
#: templates/settings.php:150
msgid "SSL root certificates"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index b2c7e207da637988abc6ab9ae27b5ef69bcd2925..8487a5ae723b8df5f7835a0ee49fefa12c2a82fd 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Kunhavigita de {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Ĉi tiu kunhavigo estas protektata per pasvorto"
@@ -34,6 +58,14 @@ msgstr ""
msgid "Password"
msgstr "Pasvorto"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Pardonu, ĉi tiu ligilo Åajne ne plu funkcias."
@@ -62,11 +94,11 @@ msgstr "Por plia informo, bonvolu peti al la persono, kiu sendis ĉi tiun ligilo
msgid "Download"
msgstr "ElÅuti"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Direkta ligilo"
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index 93392a0cd3443e7c4db4ac0ecaf6a7e06ce1232e..1717979aa2c105aaace929efcfe3f23afd0481c7 100644
--- a/l10n/eo/files_trashbin.po
+++ b/l10n/eo/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "Ne povis foriÄi %s por ĉiam"
msgid "Couldn't restore %s"
msgstr "Ne povis restaÅriÄi %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Forigitaj dosieroj"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "RestaÅri"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Eraro"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Forigitaj dosieroj"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "restaÅrita"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Nenio estas ĉi tie. Via rubujo malplenas!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nomo"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "RestaÅri"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Forigita"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Forigi"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 9fb13c7a18dc7d7625cf70a15f2a2f81ad050c5a..68371a751d632e4837d533136df75ab821ea4fd8 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Mariano <mstreet@kde.org.ar>, 2013
+# Mariano <mstreet@kde.org.ar>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-25 22:41+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -77,23 +77,23 @@ msgstr "Ne validas bildo"
msgid "web services under your control"
msgstr "TTT-servoj regataj de vi"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP-elÅuto estas malkapabligita."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Dosieroj devas elÅutiÄi unuope."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Reen al la dosieroj"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "La elektitaj dosieroj tro grandas por genero de ZIP-dosiero."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -211,7 +211,7 @@ msgstr ""
#: private/setup/mysql.php:12
msgid "MySQL/MariaDB username and/or password not valid"
-msgstr ""
+msgstr "La MySQL/MariaDB-uzantonomo kajaÅ pasvorto ne validas."
#: private/setup/mysql.php:67 private/setup/oci.php:54
#: private/setup/oci.php:121 private/setup/oci.php:144
@@ -239,7 +239,7 @@ msgstr ""
#: private/setup/mysql.php:85
#, php-format
msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "La MySQL/MariaDB-uzanto '%s'@'localhost' jam ekzistas."
#: private/setup/mysql.php:86
msgid "Drop this user from MySQL/MariaDB"
@@ -248,7 +248,7 @@ msgstr ""
#: private/setup/mysql.php:91
#, php-format
msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "La MySQL/MariaDB-uzanto '%s'@'%%' jam ekzistas"
#: private/setup/mysql.php:92
msgid "Drop this user from MySQL/MariaDB."
@@ -279,127 +279,138 @@ msgstr "Starigi administran uzantonomon."
msgid "Set an admin password."
msgstr "Starigi administran pasvorton."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Via TTT-servilo ankoraÅ ne Äuste agordiÄis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco Åajnas rompita."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s kunhavigis “%s†kun vi"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Vi ne permesatas kunhavigi %s"
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Ne troviÄis kategorio “%sâ€"
@@ -456,16 +467,16 @@ msgstr "jaroj antaÅe"
msgid ""
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
"\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "Nur la jenaj signoj permesatas en uzantonomo: «a-z», «A-Z», «0-9» kaj «_.@-»"
#: private/user/manager.php:237
msgid "A valid username must be provided"
-msgstr ""
+msgstr "Valida uzantonomo devas proviziÄi"
#: private/user/manager.php:241
msgid "A valid password must be provided"
-msgstr ""
+msgstr "Valida pasvorto devas proviziÄi"
#: private/user/manager.php:246
msgid "The username is already being used"
-msgstr ""
+msgstr "La uzantonomo jam uzatas"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 4e36b0057b4eaf8d609caaec49d89a66ed0b924b..8404d9e2ee7261ac311d008a60b520d6318e288c 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Mariano <mstreet@kde.org.ar>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -24,7 +25,7 @@ msgstr ""
#: admin/controller.php:73
msgid "Saved"
-msgstr ""
+msgstr "Konservita"
#: admin/controller.php:90
msgid "test email settings"
@@ -47,17 +48,17 @@ msgstr "La retpoÅtaĵo sendiÄis"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
-msgstr ""
+msgstr "Sendi pli"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Ĉifrado"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
-msgstr ""
+msgstr "AÅtentiga metodo"
#: ajax/apps/ocs.php:20
msgid "Unable to load list from App Store"
@@ -70,11 +71,11 @@ msgstr "AÅtentiga eraro"
#: ajax/changedisplayname.php:31
msgid "Your full name has been changed."
-msgstr ""
+msgstr "Via plena nomo ÅanÄitas."
#: ajax/changedisplayname.php:34
msgid "Unable to change full name"
-msgstr ""
+msgstr "Ne eblis ÅanÄi la plenan nomon"
#: ajax/creategroup.php:10
msgid "Group already exists"
@@ -86,7 +87,7 @@ msgstr "Ne eblis aldoni la grupon"
#: ajax/decryptall.php:31
msgid "Files decrypted successfully"
-msgstr ""
+msgstr "La dosieroj malĉifriÄis sukcese"
#: ajax/decryptall.php:33
msgid ""
@@ -98,6 +99,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "La ĉifroklavojn foriÄis por ĉiam."
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "La retpoÅtadreso konserviÄis"
@@ -114,6 +125,16 @@ msgstr "Ne eblis forigi la grupon"
msgid "Unable to delete user"
msgstr "Ne eblis forigi la uzanton"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "La savokopioj restaÅriÄis sukcese"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "La lingvo estas ÅanÄita"
@@ -138,11 +159,11 @@ msgstr "Ne eblis forigi la uzantan el la grupo %s"
#: ajax/updateapp.php:14
msgid "Couldn't update app."
-msgstr ""
+msgstr "Ne eblis Äisdatigi la aplikaĵon."
#: changepassword/controller.php:17
msgid "Wrong password"
-msgstr ""
+msgstr "MalÄusta pasvorto"
#: changepassword/controller.php:36
msgid "No user supplied"
@@ -167,11 +188,11 @@ msgstr ""
#: changepassword/controller.php:86 changepassword/controller.php:97
msgid "Unable to change password"
-msgstr ""
+msgstr "Ne eblis ÅanÄi la pasvorton"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
-msgstr ""
+msgstr "Sendante..."
#: js/apps.js:45 templates/help.php:4
msgid "User Documentation"
@@ -179,11 +200,11 @@ msgstr "Dokumentaro por uzantoj"
#: js/apps.js:50
msgid "Admin Documentation"
-msgstr ""
+msgstr "Administra dokumentaro"
#: js/apps.js:67
msgid "Update to {appversion}"
-msgstr ""
+msgstr "Äœisdatigi al {appversion}"
#: js/apps.js:73 js/apps.js:106 js/apps.js:134
msgid "Disable"
@@ -195,7 +216,7 @@ msgstr "Kapabligi"
#: js/apps.js:95
msgid "Please wait...."
-msgstr ""
+msgstr "Bonvolu atendi..."
#: js/apps.js:103 js/apps.js:104 js/apps.js:125
msgid "Error while disabling app"
@@ -207,11 +228,11 @@ msgstr ""
#: js/apps.js:149
msgid "Updating...."
-msgstr ""
+msgstr "Äœisdatigata..."
#: js/apps.js:152
msgid "Error while updating app"
-msgstr ""
+msgstr "Eraris Äisdatigo de la aplikaĵo"
#: js/apps.js:152
msgid "Error"
@@ -223,36 +244,44 @@ msgstr "Äœisdatigi"
#: js/apps.js:156
msgid "Updated"
-msgstr ""
+msgstr "Äœisdatigita"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
-msgstr ""
+msgstr "Elekti profilan bildon"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
-msgstr ""
+msgstr "Tre malforta pasvorto"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
-msgstr ""
+msgstr "Malforta pasvorto"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
-msgstr ""
+msgstr "Mezaĉa pasvorto"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
-msgstr ""
+msgstr "Bona pasvorto"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
-msgstr ""
+msgstr "Forta pasvorto"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Forigi ĉifroklavojn por ĉiam."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "RestaÅri ĉifroklavojn."
+
#: js/users.js:47
msgid "deleted"
msgstr "forigita"
@@ -263,10 +292,10 @@ msgstr "malfari"
#: js/users.js:79
msgid "Unable to remove user"
-msgstr ""
+msgstr "Ne eblis forigi la uzanton"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupoj"
@@ -280,25 +309,25 @@ msgstr "Forigi"
#: js/users.js:310
msgid "add group"
-msgstr ""
+msgstr "aldoni grupon"
#: js/users.js:486
msgid "A valid username must be provided"
-msgstr ""
+msgstr "Valida uzantonomo devas proviziÄi"
#: js/users.js:487 js/users.js:493 js/users.js:508
msgid "Error creating user"
-msgstr ""
+msgstr "Eraris kreo de uzanto"
#: js/users.js:492
msgid "A valid password must be provided"
-msgstr ""
+msgstr "Valida pasvorto devas proviziÄi"
#: js/users.js:516
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Esperanto"
@@ -340,11 +369,11 @@ msgstr ""
#: templates/admin.php:24
msgid "SSL"
-msgstr ""
+msgstr "SSL"
#: templates/admin.php:25
msgid "TLS"
-msgstr ""
+msgstr "TLS"
#: templates/admin.php:47 templates/admin.php:61
msgid "Security Warning"
@@ -366,7 +395,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +410,65 @@ 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 ""
-#: templates/admin.php:90
-msgid "Module 'fileinfo' missing"
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
+msgid "Module 'fileinfo' missing"
+msgstr "La modulo «fileinfo» mankas"
+
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
-msgstr ""
+msgstr "La lokaĵaro ne funkcias"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +477,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Kunhavigo"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Kapabligi API-on por Kunhavigo"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Kapabligi ligilojn"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
+msgstr "Permesi publikajn alÅutojn"
+
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:250
+msgid "days"
+msgstr "tagoj"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Kapabligi rekunhavigon"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Kapabligi uzantojn kunhavigi kun ĉiu ajn"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
-msgstr ""
+msgstr "Permesi retpoÅtan sciigon"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
-msgstr ""
+msgstr "Sekuro"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
-msgstr ""
+msgstr "RetpoÅtoservilo"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
+msgstr "El adreso"
+
+#: templates/admin.php:375
+msgid "mail"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:396
msgid "Authentication required"
-msgstr ""
+msgstr "AÅtentiÄo nepras"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Servila adreso"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Pordo"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "AÅtentigiloj"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
-msgstr ""
+msgstr "SMTP-uzantonomo"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
-msgstr ""
+msgstr "SMTP-pasvorto"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
-msgstr ""
+msgstr "Sendi retpoÅton"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Protokolo"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Registronivelo"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Pli"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Malpli"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Eldono"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -651,7 +700,7 @@ msgstr "Elekti aplikaĵon"
#: templates/apps.php:43
msgid "Documentation:"
-msgstr ""
+msgstr "Dokumentaro:"
#: templates/apps.php:49
msgid "See application page at apps.owncloud.com"
@@ -659,7 +708,7 @@ msgstr "Vidu la paÄon pri aplikaĵoj ĉe apps.owncloud.com"
#: templates/apps.php:51
msgid "See application website"
-msgstr ""
+msgstr "Vidi la TTT-ejon de la aplikaĵo"
#: templates/apps.php:53
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
@@ -696,7 +745,7 @@ msgstr ""
#: templates/personal.php:27
#, php-format
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>"
+msgstr "Vi uzas <strong>%s</strong> el la disponeblaj <strong>%s</strong>"
#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
msgid "Password"
@@ -724,7 +773,7 @@ msgstr "ÅœanÄi la pasvorton"
#: templates/personal.php:61 templates/users.php:86
msgid "Full Name"
-msgstr ""
+msgstr "Plena nomo"
#: templates/personal.php:76
msgid "Email"
@@ -746,15 +795,15 @@ msgstr "Profila bildo"
#: templates/personal.php:94
msgid "Upload new"
-msgstr ""
+msgstr "AlÅuti novan"
#: templates/personal.php:96
msgid "Select new from Files"
-msgstr ""
+msgstr "Elekti novan el dosieroj"
#: templates/personal.php:97
msgid "Remove image"
-msgstr ""
+msgstr "Forigi bildon"
#: templates/personal.php:98
msgid "Either png or jpg. Ideally square but you will be able to crop it."
@@ -770,7 +819,7 @@ msgstr "Nuligi"
#: templates/personal.php:105
msgid "Choose as profile image"
-msgstr ""
+msgstr "Elekti kiel profilan bildon"
#: templates/personal.php:111 templates/personal.php:112
msgid "Language"
@@ -780,28 +829,32 @@ msgstr "Lingvo"
msgid "Help translate"
msgstr "Helpu traduki"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr ""
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
-msgstr ""
+msgstr "Ensaluta pasvorto"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
-msgstr ""
+msgstr "Malĉifri ĉiujn dosierojn"
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Viaj ĉifroklavoj moviÄis al savokopia loko. Se io malsukcesas, vi povas restaÅri la klavojn. Nur forigu ilin porĉiame se vi certas, ke ĉiuj dosieroj malĉifriÄis korekte."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "RestaÅri ĉifroklavojn"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Forigi ĉifroklavojn"
#: templates/users.php:19
msgid "Login Name"
@@ -847,11 +900,11 @@ msgstr "Konservejo"
#: templates/users.php:106
msgid "change full name"
-msgstr ""
+msgstr "ÅanÄi plenan nomon"
#: templates/users.php:110
msgid "set new password"
-msgstr ""
+msgstr "agordi novan pasvorton"
#: templates/users.php:141
msgid "Default"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index d26b55c540062c521555b52882e2d73870fac763..76b653c7cc641df19945f380f13d792e59baa1ec 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr ""
msgid "Keep settings?"
msgstr "Ĉu daÅrigi la agordon?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Ne eblas aldoni agordon de servilo"
@@ -87,6 +91,18 @@ msgstr "Sukceso"
msgid "Error"
msgstr "Eraro"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -127,28 +143,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr "Konfirmi forigon"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s grupo troviÄis"
msgstr[1] "%s grupoj troviÄis"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s uzanto troviÄis"
msgstr[1] "%s uzanto troviÄis"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Nevalida gastigo"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtrilo de grupo"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Konservi"
@@ -221,10 +253,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Aldoni agordon de servilo"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Gastigo"
@@ -288,6 +333,14 @@ msgstr "AntaÅen"
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Progresinta"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 992ba029446cf0fc3b5fe88f2ad26f5b6b616f70..362db619609f63946e148150c3762c687bfd232f 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -6,10 +6,11 @@
# Art O. Pal <artopal@fastmail.fm>, 2013-2014
# ggam <ggam@brainleakage.com>, 2013
# I Robot, 2013
-# juanman <juanma@kde.org.ar>, 2013
+# juanman <juanma@kde.org.ar>, 2013-2014
# msoko <sokolovitch@yahoo.com>, 2013
+# mario.arranz <mario.arranz@gmail.com>, 2014
# pablomillaquen <pablomillaquen@gmail.com>, 2013
-# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013-2014
# Rubén del Campo <yo@rubendelcampo.es>, 2013
# saskarip <saskarip@gmail.com>, 2013
# saskarip <saskarip@gmail.com>, 2013
@@ -21,8 +22,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -31,11 +32,11 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "Ha pasado la fecha de caducidad"
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "No se pudo enviar el mensaje a los siguientes usuarios: %s"
@@ -52,6 +53,11 @@ msgstr "Modo mantenimiento desactivado"
msgid "Updated database"
msgstr "Base de datos actualizada"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "No se especificó ningún archivo o imagen"
@@ -72,207 +78,207 @@ msgstr "No hay disponible una imagen temporal de perfil, pruebe de nuevo"
msgid "No crop data provided"
msgstr "No se proporcionó datos del recorte"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Domingo"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Lunes"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Martes"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Miércoles"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Jueves"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Viernes"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sábado"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Enero"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Febrero"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marzo"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mayo"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Junio"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Julio"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Agosto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Septiembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Octubre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Noviembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Diciembre"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Guardando..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
-msgstr "segundos antes"
+msgstr "hace segundos"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Hace %n minuto"
-msgstr[1] "Hace %n minutos"
+msgstr[1] "hace %n minutos"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Hace %n hora"
-msgstr[1] "Hace %n horas"
+msgstr[1] "hace %n horas"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "hoy"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Hace %n dÃa"
-msgstr[1] "Hace %n dÃas"
+msgstr[1] "hace %n dÃas"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Hace %n mes"
-msgstr[1] "Hace %n meses"
+msgstr[1] "hace %n meses"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
-msgstr "años antes"
-
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Seleccionar"
+msgstr "hace años"
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Error cargando plantilla del seleccionador de archivos: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "SÃ"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Seleccionar"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Error cargando plantilla del seleccionador de archivos: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Aceptar"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Error cargando plantilla del mensaje: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflicto de archivo"
msgstr[1] "{count} conflictos de archivo"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "On conflicto de archivo"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nuevos Archivos"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Archivos ya existentes"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "¿Que archivos deseas mantener?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(seleccionados todos)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Error cargando plantilla de archivo existente"
@@ -304,140 +310,149 @@ msgstr "Compartido"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Error al compartir"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Error al dejar de compartir"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Error al cambiar permisos"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartido contigo y el grupo {group} por {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Compartido contigo por {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "Compartido con el usuario o con el grupo ..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Enlace compartido"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "El link publico no expirará antes de {days} desde que fué creado"
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr "El link publico expirará por defecto pasados {days} dias"
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Protección con contraseña"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Contraseña"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr "Elija una contraseña para el enlace publico"
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Permitir Subida Pública"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Enviar enlace por correo electrónico a una persona"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Enviar"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Establecer fecha de caducidad"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Fecha de caducidad"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Compartir por correo electrónico:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "No se encontró gente"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "grupo"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "No se permite compartir de nuevo"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Dejar de compartir"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "notificar por correo electrónico"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "puede editar"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "crear"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "actualizar"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "eliminar"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "compartir"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Protegido con contraseña"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Error eliminando fecha de caducidad"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Error estableciendo fecha de caducidad"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Enviando..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Correo electrónico enviado"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Precaución"
@@ -469,18 +484,19 @@ msgstr "Error cargando plantilla de diálogo: {error}"
msgid "No tags selected for deletion."
msgstr "No hay etiquetas seleccionadas para borrar."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Recargue/Actualice la página"
-#: 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 "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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora."
@@ -681,6 +697,10 @@ msgstr "Para información de cómo configurar apropiadamente su servidor, por fa
msgid "Create an <strong>admin account</strong>"
msgstr "Crear una <strong>cuenta de administrador</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Contraseña"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Almacenamiento y base de datos"
@@ -806,8 +826,27 @@ msgstr "Gracias por su paciencia."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 5e0f81e387a4e7366f99e754d58ad334822ceb05..bd75b3b991f12eac8a9073e8f76e6bb8a5461189 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -6,10 +6,11 @@
# Art O. Pal <artopal@fastmail.fm>, 2013-2014
# ggam <ggam@brainleakage.com>, 2013
# japaol <japaol@gmail.com>, 2013
+# joses <jose_mari_s@hotmail.com>, 2014
# juanman <juanma@kde.org.ar>, 2013
# mikelanabitarte <inactive+mikelanabitarte@transifex.com>, 2013
# plaguna <laguna.sanchez@gmail.com>, 2014
-# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013-2014
# qdneren <renanqd@yahoo.com.mx>, 2013
# Rubén del Campo <yo@rubendelcampo.es>, 2013
# saskarip <saskarip@gmail.com>, 2013
@@ -18,9 +19,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
-"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 07:51+0000\n"
+"Last-Translator: joses <jose_mari_s@hotmail.com>\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"
@@ -38,7 +39,7 @@ msgstr "No se pudo mover %s - Ya existe un archivo con ese nombre."
msgid "Could not move %s"
msgstr "No se pudo mover %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "El nombre de archivo no puede estar vacÃo."
@@ -47,18 +48,18 @@ msgstr "El nombre de archivo no puede estar vacÃo."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" es un nombre de archivo inválido."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos "
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "La carpeta destino fue movida o eliminada."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -134,44 +135,48 @@ msgstr "Falta la carpeta temporal"
msgid "Failed to write to disk"
msgstr "Falló al escribir al disco"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "No hay suficiente espacio disponible"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Actualización fallida. No se pudo encontrar el archivo subido"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Actualización fallida. No se pudo obtener información del archivo."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Directorio inválido."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Archivos"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Todos los archivos"
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "El tamaño total del archivo {size1} excede el lÃmite {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Subida cancelada."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "No se pudo obtener respuesta del servidor."
@@ -184,120 +189,120 @@ msgstr "La subida del archivo está en proceso. Si sale de la página ahora, la
msgid "URL cannot be empty"
msgstr "La dirección URL no puede estar vacÃa"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} ya existe"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "No se pudo crear el archivo"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "No se pudo crear la carpeta"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Error al descargar URL."
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Compartir"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Renombrar"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Su descarga está siendo preparada. Esto podrÃa tardar algo de tiempo si los archivos son grandes."
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Pendiente"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr "Error al mover el archivo."
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Error moviendo archivo"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Error"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "No se pudo renombrar el archivo"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Error al borrar el archivo"
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Nombre"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Tamaño"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Modificado"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n carpeta"
msgstr[1] "%n carpetas"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n archivo"
msgstr[1] "%n archivos"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Subiendo %n archivo"
msgstr[1] "Subiendo %n archivos"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" es un nombre de archivo inválido."
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!"
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "La app de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo."
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "La clave privada no es válida para la app de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -307,12 +312,12 @@ msgstr "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados.
msgid "{dirs} and {files}"
msgstr "{dirs} y {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s no pudo ser renombrado"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Subida (máx. %s)"
@@ -349,68 +354,75 @@ msgstr "Tamaño máximo para archivos ZIP de entrada"
msgid "Save"
msgstr "Guardar"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Use esta URL <a href=\"%s\" target=\"_blank\">para acceder via WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Nuevo"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Nuevo archivo de texto"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Archivo de texto"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Nueva carpeta"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Carpeta"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Desde enlace"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Archivos eliminados"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Cancelar subida"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "No tienes permisos para subir o crear archivos aquÃ."
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "No hay nada aquÃ. ¡Suba algo!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Descargar"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Eliminar"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Subida demasido grande"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Los archivos están siendo escaneados, por favor espere."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Escaneo actual"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr "Escaneando en este momento"
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index 50f8edbd476820ee174b9d0320b31def2fadeb61..edbbeea53759cc791442d97b0816073d943dd128 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -5,11 +5,11 @@
# Translators:
# Art O. Pal <artopal@fastmail.fm>, 2013-2014
# asaez <asaez@asaez.eu>, 2013
-# gmoriello <gmoriello@gmail.com>, 2013
+# gmoriello <inactive+gmoriello@transifex.com>, 2013
# japaol <japaol@gmail.com>, 2013
# juanman <juanma@kde.org.ar>, 2013
# Maenso <balero_arana@hotmail.com>, 2013
-# mikelanabitarte <mikelanabitarte@gmail.com>, 2013
+# mikelanabitarte <inactive+mikelanabitarte@transifex.com>, 2013
# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
# Rubén del Campo <yo@rubendelcampo.es>, 2013
# saskarip <saskarip@gmail.com>, 2013
@@ -19,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 15:20+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 16:42+0000\n"
"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -88,9 +88,9 @@ msgstr "No fue posible descifrar este archivo, probablemente se trate de un arch
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Error desconocido. Verifique la configuración de su sistema o póngase en contacto con su administrador"
+msgstr "Error desconocido. Revise la configuración de su sistema o contacte a su administrador"
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -103,7 +103,7 @@ msgid ""
" the encryption app has been disabled."
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:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Los siguientes usuarios no han sido configurados para el cifrado:"
@@ -123,91 +123,91 @@ msgstr "Ir directamente a su"
msgid "personal settings"
msgstr "opciones personales"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Cifrado"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Contraseña de clave de recuperación"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Repite la contraseña de clave de recuperación"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Habilitar"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Deshabilitado"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Cambiar la contraseña de la clave de recuperación"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Antigua clave de recuperación"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Nueva clave de recuperación"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Repetir la nueva clave de recuperación"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Cambiar contraseña"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Su contraseña de clave privada ya no coincide con su contraseña de acceso:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Establecer la contraseña de su antigua clave privada a su contraseña actual de acceso."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Contraseña de acceso antigua"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Contraseña de acceso actual"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Actualizar Contraseña de Clave Privada"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Habilitar la recuperación de contraseña:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Opciones de recuperación de archivos actualizada"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "No se pudo actualizar la recuperación de archivos"
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index 69ff3f8d78d4bd7074d8483c0126e1a5059826f0..bd37a3740cc20481e82e1c22ba2fb690e38bf1d6 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2014-04-30 11:50+0000\n"
-"Last-Translator: mreyesca <mreyesca@luthcueit.onmicrosoft.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: I Robot\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"
@@ -85,9 +85,9 @@ msgid "App secret"
msgstr "App secreta"
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Servidor"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -168,6 +168,10 @@ msgstr "SMB / CIFS usando acceso OC"
msgid "Username as share"
msgstr "Nombre de Usuario como compartir"
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr "Secure https://"
@@ -200,29 +204,29 @@ msgstr "Error configurando el almacenamiento de Google Drive"
msgid "Saved"
msgstr "Guardado"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr "<b>Nota:</b> "
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr "y"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Nota:</b> El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. PÃdale al administrador de sistema que lo instale."
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Nota:</b> El soporte de FTP en PHP no está activado o instalado. No se puede montar %s. PÃdale al administrador de sistema que lo instale."
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index 1d9b8f9f779cceddb065a5fe8a9476a6ca0f6953..e03cf952b8773b49804ba6767dd2de2c77f3a257 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -21,10 +21,34 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Compartido por {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Este elemento compartido esta protegido por contraseña"
@@ -37,6 +61,14 @@ msgstr "La contraseña introducida es errónea. Inténtelo de nuevo."
msgid "Password"
msgstr "Contraseña"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Vaya, este enlace parece que no volverá a funcionar."
@@ -65,11 +97,11 @@ msgstr "Para mayor información, contacte a la persona que le envió el enlace."
msgid "Download"
msgstr "Descargar"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Descargar %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Enlace directo"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index 47dd8c8dbee6443c651a90b308ceacb9dcd1666a..8159e08530f0435fcc56999072ca07f107452e6f 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: victormce <victormce@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\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,38 +29,34 @@ msgstr "No se puede eliminar %s permanentemente"
msgid "Couldn't restore %s"
msgstr "No se puede restaurar %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Archivos eliminados"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Recuperar"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Error"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Archivos Eliminados"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "recuperado"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "No hay nada aquÃ. ¡Tu papelera esta vacÃa!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nombre"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Recuperar"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Eliminado"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Eliminar"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index ee9073a531a1195910816cb98af218019e631529..c459ab8be75b84fe7e34267909a8d2681234ed6a 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -6,9 +6,10 @@
# Art O. Pal <artopal@fastmail.fm>, 2014
# Dharth <emilpg@gmail.com>, 2013
# inye <j.contrerasferrada@gmail.com>, 2014
+# joses <jose_mari_s@hotmail.com>, 2014
# mreyesca <mreyesca@luthcueit.onmicrosoft.com>, 2014
# pablomillaquen <pablomillaquen@gmail.com>, 2013
-# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013-2014
# Rubén del Campo <yo@rubendelcampo.es>, 2013
# victormce <victormce@gmail.com>, 2014
# xhiena <xhiena@gmail.com>, 2013
@@ -16,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2014-04-30 11:30+0000\n"
-"Last-Translator: mreyesca <mreyesca@luthcueit.onmicrosoft.com>\n"
+"POT-Creation-Date: 2014-05-25 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 06:11+0000\n"
+"Last-Translator: joses <jose_mari_s@hotmail.com>\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"
@@ -26,11 +27,11 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:712
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr "Está accediendo al servidor desde un dominio inseguro."
-#: base.php:713
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -85,23 +86,23 @@ msgstr "Imagen inválida"
msgid "web services under your control"
msgstr "Servicios web bajo su control"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "La descarga en ZIP está desactivada."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Los archivos deben ser descargados uno por uno."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Volver a Archivos"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -298,116 +299,127 @@ 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>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s ha compatido »%s« contigo"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr "No se pudo compartir %s porque el archivo no existe"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Usted no está autorizado para compartir %s"
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "Compartiendo %s ha fallado, ya que el usuario %s es el dueño del elemento"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "Compartiendo %s ha fallado, ya que el usuario %s no existe"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr "Compartiendo %s ha fallado, ya que el usuario %s no es miembro de algún grupo que %s es miembro"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "Compartiendo %s ha fallado, ya que este elemento ya está compartido con %s"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "Compartiendo %s ha fallado, ya que el grupo %s no existe"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "Compartiendo %s ha fallado, ya que %s no es miembro del grupo %s"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Es necesario definir una contraseña para crear un enlace publico. Solo los enlaces protegidos están permitidos"
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "Compartiendo %s ha fallado, ya que compartir con enlaces no está permitido"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr "Compartir tipo %s no es válido para %s"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr "Configuración de permisos para %s ha fallado, ya que los permisos superan los permisos dados a %s"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "Configuración de permisos para %s ha fallado, ya que el elemento no fue encontrado"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr "El motor compartido %s debe implementar la interfaz OCP\\Share_Backend"
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr "El motor compartido %s no se ha encontrado"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr "Motor compartido para %s no encontrado"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr "Compartiendo %s ha fallado, ya que el usuario %s es el compartidor original"
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr "Compartiendo %s ha fallado, ya que los permisos superan los permisos otorgados a %s"
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr "Compartiendo %s ha fallado, ya que volver a compartir no está permitido"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr "Compartir %s falló porque el motor compartido para %s podrÃa no encontrar su origen"
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr "Compartiendo %s ha fallado, ya que el archivo no pudo ser encontrado en el cache de archivo"
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "No puede encontrar la categoria \"%s\""
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 75eb846abd871442fdb4bdf92468863b346b8c2e..41d9c102cf75d0c568152ad25e075e241acab55b 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -9,10 +9,12 @@
# ggam <ggam@brainleakage.com>, 2013
# japaol <japaol@gmail.com>, 2013
# Jose Luis Tirado <joseluis.tirado@gmail.com>, 2014
+# joses <jose_mari_s@hotmail.com>, 2014
# juanman <juanma@kde.org.ar>, 2013-2014
+# mario.arranz <mario.arranz@gmail.com>, 2014
# plaguna <laguna.sanchez@gmail.com>, 2014
# pablomillaquen <pablomillaquen@gmail.com>, 2013
-# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013-2014
# qdneren <renanqd@yahoo.com.mx>, 2013
# Rubén del Campo <yo@rubendelcampo.es>, 2013
# saskarip <saskarip@gmail.com>, 2013
@@ -22,9 +24,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -62,15 +64,15 @@ msgstr "Correo electrónico enviado"
msgid "You need to set your user email before being able to send test emails."
msgstr "Tiene que configurar su dirección de correo electrónico antes de poder enviar mensajes de prueba."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Modo de envÃo"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Cifrado"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Método de autenticación"
@@ -113,6 +115,16 @@ msgstr "No se pudo descifrar sus archivos. Revise el owncloud.log o consulte con
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de nuevo"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Claves de cifrado eliminadas permanentemente"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "No se pudieron eliminar permanentemente sus claves de cifrado. Revise owncloud.log o consulte con su administrador."
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Correo electrónico guardado"
@@ -129,6 +141,16 @@ msgstr "No se pudo eliminar el grupo"
msgid "Unable to delete user"
msgstr "No se pudo eliminar el usuario"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Copia de seguridad restaurada"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "No se pudieron restarurar sus claves de cifrado. Revise owncloud.log o consulte con su administrador."
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Idioma cambiado"
@@ -184,7 +206,7 @@ msgstr "El back-end no soporta cambios de contraseña, pero la clave de cifrado
msgid "Unable to change password"
msgstr "No se ha podido cambiar la contraseña"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Enviando..."
@@ -240,34 +262,42 @@ msgstr "Actualizar"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Seleccionar una imagen de perfil"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Contraseña muy débil"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Contraseña débil"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Contraseña pasable"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Contraseña buena"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Contraseña muy buena"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Eliminar claves de cifrado permanentemente."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Restaurar claves de cifrado."
+
#: js/users.js:47
msgid "deleted"
msgstr "eliminado"
@@ -280,8 +310,8 @@ msgstr "deshacer"
msgid "Unable to remove user"
msgstr "Imposible eliminar al usuario"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupos"
@@ -313,7 +343,7 @@ msgstr "Se debe proporcionar una contraseña válida"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Atención: el directorio de inicio para el usuario \"{user}\" ya existe."
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Castellano"
@@ -381,7 +411,7 @@ msgid ""
"root."
msgstr "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raÃz de documentos del servidor web."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Advertencia de configuración"
@@ -396,53 +426,65 @@ msgstr "Su servidor web aún no está configurado adecuadamente para permitir la
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>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "No se ha encontrado el módulo \"fileinfo\""
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
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 de tipos MIME."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Su versión de PHP no está actualizada"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Su versión de PHP ha caducado. Le sugerimos encarecidamente que la actualize a 5.3.8 o a una más nueva porque normalmente las versiones antiguas no funcionan bien. Puede ser que esta instalación no esté funcionando bien por ello."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "La configuración regional no está funcionando"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "No se puede escoger una configuración regional que soporte UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. "
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "La conexión a Internet no está funcionando"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -451,198 +493,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Este servidor no tiene conexión a Internet. Esto significa que algunas de las caracterÃsticas no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envÃo de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "Cron fue ejecutado por última vez a las %s."
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "Cron fue ejecutado por última vez a las %s. Esto fue hace más de una hora, algo anda mal."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "¡Cron aún no ha sido ejecutado!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Ejecutar una tarea con cada página cargada"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Utiliza el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Compartiendo"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Activar API de Compartición"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Permitir a las aplicaciones utilizar la API de Compartición"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Permitir enlaces"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permitir a los usuarios compartir elementos con el público mediante enlaces"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr "Mejora la protección por contraseña."
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Permitir subidas públicas"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "Establecer fecha de caducidad predeterminada"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Caduca luego de"
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "dÃas"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Imponer fecha de caducidad"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Permitir a los usuarios compartir elementos con el público mediante enlaces"
-#: templates/admin.php:235
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Permitir re-compartición"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Permitir a los usuarios compartir de nuevo elementos ya compartidos"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Permitir a los usuarios compartir con cualquier persona"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Permitir a los usuarios compartir sólo con los usuarios en sus grupos"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Permitir notificaciones por correo electrónico"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr "Establecer fecha de caducidad predeterminada"
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Caduca luego de"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr "Excluye grupos de compartir"
-#: templates/admin.php:266
-msgid "days"
-msgstr "dÃas"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr "Imponer fecha de caducidad"
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Archivos compartidos caducan luego de N dÃas"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Estos grupos aún podrán recibir contenidos compartidos, pero no podrán, pero no podrán iniciarlos."
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Seguridad"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Forzar HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Servidor de correo electrónico"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "Esto se usa para enviar notificaciones."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Desde la dirección"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr "correo electrónico"
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Se necesita autenticación"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Dirección del servidor"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Puerto"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Credenciales"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "Nombre de usuario SMTP"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "Contraseña SMTP"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Probar configuración de correo electrónico"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Enviar mensaje"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Registro"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Nivel de registro"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Más"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -795,29 +845,33 @@ msgstr "Idioma"
msgid "Help translate"
msgstr "Ayúdanos a traducir"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" 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:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "La aplicación de cifrado ya no está activada, descifre todos sus archivos"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Contraseña de acceso"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Descifrar archivos"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Sus claves de cifrado se archivarán en una localización segura. Asà en caso de que algo fuese mal podrá recuperan sus claves. Borre sus claves de cifrado permanentemente solamente si esta seguro de que sus archivos han sido descifrados correctamente."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Restaurar claves de cifrado"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Eliminar claves de cifrado"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Nombre de usuario"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index d0356c5d21a08613defb2ed61c4dc4af9d70b168..c86b31b2a93199e12825f256c20671625d049e3a 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -6,6 +6,7 @@
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
# Art O. Pal <artopal@fastmail.fm>, 2014
# Jose Luis Tirado <joseluis.tirado@gmail.com>, 2014
+# joses <jose_mari_s@hotmail.com>, 2014
# Maenso <balero_arana@hotmail.com>, 2013
# plaguna <laguna.sanchez@gmail.com>, 2014
# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
@@ -18,9 +19,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: plaguna <laguna.sanchez@gmail.com>\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 17:24+0000\n"
+"Last-Translator: Art O. Pal <artopal@fastmail.fm>\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"
@@ -81,6 +82,10 @@ msgstr "¿Asumir los ajustes actuales de la configuración del servidor?"
msgid "Keep settings?"
msgstr "¿Mantener la configuración?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Servidor"
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "No se puede añadir la configuración del servidor"
@@ -97,6 +102,18 @@ msgstr "Éxito"
msgid "Error"
msgstr "Error"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Especifique un DN base"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "No se pudo determinar un DN base"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Especifique el puerto"
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Configuración Correcta"
@@ -137,28 +154,44 @@ msgstr "¿Realmente desea eliminar la configuración actual del servidor?"
msgid "Confirm Deletion"
msgstr "Confirmar eliminación"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "Grupo %s encontrado"
msgstr[1] "Grupos %s encontrados"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "Usuario %s encontrado"
msgstr[1] "Usuarios %s encontrados"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Host inválido"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "No se puede encontrar la función deseada."
+#: settings.php:52
+msgid "Server"
+msgstr "Servidor"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Filtro de Usuario"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Filtro de Login"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtro de grupo"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Guardar"
@@ -231,10 +264,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
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/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Servidor"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Servidor:"
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Agregar configuracion del servidor"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Borrar Configuración"
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Servidor"
@@ -298,6 +344,14 @@ msgstr "Atrás"
msgid "Continue"
msgstr "Continuar"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Experto"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avanzado"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 6686176077b7ced4e4767e810d4689774081aa77..ddef316c485856c18f98ed58d406898a1abf6805 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "No se pudieron mandar correos a los siguientes usuarios: %s"
@@ -40,6 +40,11 @@ msgstr "Modo de mantenimiento desactivado"
msgid "Updated database"
msgstr "Base de datos actualizada"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "No se ha proveÃdo de una imágen o archivo."
@@ -60,207 +65,207 @@ msgstr "No hay una imágen temporal del perfil disponible, intente de nuevo"
msgid "No crop data provided"
msgstr "No se proveyeron datos de recorte"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Domingo"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Lunes"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Martes"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Miércoles"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Jueves"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Viernes"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sábado"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "enero"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "febrero"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "marzo"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "mayo"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "junio"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "julio"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "agosto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "septiembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "octubre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "noviembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "diciembre"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Configuración"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Guardando..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Hace %n minuto"
msgstr[1] "Hace %n minutos"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Hace %n hora"
msgstr[1] "Hace %n horas"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "hoy"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Hace %n dÃa"
msgstr[1] "Hace %n dÃas"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Hace %n mes"
msgstr[1] "Hace %n meses"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "años atrás"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Elegir"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Error cargando la plantilla del selector de archivo: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "SÃ"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Elegir"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Error cargando la plantilla del selector de archivo: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Aceptar"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Error cargando la plantilla del mensaje: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "un archivo en conflicto"
msgstr[1] "{count} archivos en conflicto"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Un archivo en conflicto"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nuevos archivos"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "¿Qué archivos deseas retener?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si tu seleccionas ambas versiones, el archivo copiado tendrá un número agregado a su nombre."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(todos están seleccionados)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Error cargando la plantilla de archivo existente"
@@ -292,140 +297,149 @@ msgstr "Compartido"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Error al compartir"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Error en al dejar de compartir"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Error al cambiar permisos"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartido con vos y el grupo {group} por {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Compartido con vos por {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "Compartir con usuario o grupo ..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Compartir vÃnculo"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Proteger con contraseña "
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Contraseña"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Permitir Subida Pública"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Enviar el enlace por e-mail."
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Mandar"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Asignar fecha de vencimiento"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Fecha de vencimiento"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Compartir a través de e-mail:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "No se encontraron usuarios"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "grupo"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "No se permite volver a compartir"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Dejar de compartir"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "notificar por correo"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "podés editar"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "crear"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "actualizar"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "borrar"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "compartir"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Protegido por contraseña"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Error al remover la fecha de vencimiento"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Error al asignar fecha de vencimiento"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Mandando..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "e-mail mandado"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Atención"
@@ -457,18 +471,19 @@ msgstr "Error cargando la plantilla de dialogo: {error}"
msgid "No tags selected for deletion."
msgstr "No se han seleccionado etiquetas para eliminar."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Por favor, recargue la página."
-#: 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 "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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La actualización fue exitosa. Estás siendo redirigido a ownCloud."
@@ -669,6 +684,10 @@ msgstr "Para información sobre cómo configurar apropiadamente tu servidor, por
msgid "Create an <strong>admin account</strong>"
msgstr "Crear una <strong>cuenta de administrador</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Contraseña"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -794,8 +813,27 @@ msgstr "Gracias por su paciencia."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Actualizando ownCloud a la versión %s, puede demorar un rato."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 05a5d472fb11d39784dba3078072a6443a996f29..511d480baaa4fe31b412dec6e22743b6db2bb972 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr "No se pudo mover %s - Un archivo con este nombre ya existe"
msgid "Could not move %s"
msgstr "No se pudo mover %s "
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "El nombre del archivo no puede quedar vacÃo."
@@ -40,18 +40,18 @@ msgstr "El nombre del archivo no puede quedar vacÃo."
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -127,44 +127,48 @@ msgstr "Falta un directorio temporal"
msgid "Failed to write to disk"
msgstr "Error al escribir en el disco"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "No hay suficiente almacenamiento"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Falló la carga. No se pudo encontrar el archivo subido."
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Falló la carga. No se pudo obtener la información del archivo."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Directorio inválido."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Archivos"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "Imposible cargar {filename} puesto que es un directoro o tiene 0 bytes."
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "La subida fue cancelada"
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "No se pudo obtener resultados del servidor."
@@ -177,120 +181,120 @@ msgstr "La subida del archivo está en proceso. Si salÃs de la página ahora, l
msgid "URL cannot be empty"
msgstr "La URL no puede estar vacÃa"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} ya existe"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "No se pudo crear el archivo"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "No se pudo crear el directorio"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Error al obtener la URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Compartir"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Borrar permanentemente"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Cambiar nombre"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Pendientes"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Error moviendo el archivo"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Error"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "No se pudo renombrar el archivo"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Error al borrar el archivo."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Nombre"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Tamaño"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Modificado"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n carpeta"
msgstr[1] "%n carpetas"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n archivo"
msgstr[1] "%n archivos"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Subiendo %n archivo"
msgstr[1] "Subiendo %n archivos"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "El almacenamiento está casi lleno ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Llave privada inválida para la aplicación de encriptación. Por favor actualice la clave de la llave privada en las configuraciones personales para recobrar el acceso a sus archivos encriptados."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -300,12 +304,12 @@ msgstr "El proceso de cifrado se ha desactivado, pero los archivos aún están e
msgid "{dirs} and {files}"
msgstr "{carpetas} y {archivos}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "No se pudo renombrar %s"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -342,68 +346,75 @@ msgstr "Tamaño máximo para archivos ZIP de entrada"
msgid "Save"
msgstr "Guardar"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vÃa WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Nuevo"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Nuevo archivo de texto"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Archivo de texto"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Nueva Carpeta"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Carpeta"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Desde enlace"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Archivos borrados"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Cancelar subida"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "No tienes permisos para subir o crear archivos aquÃ"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "No hay nada. ¡Subà contenido!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Descargar"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Borrar"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "El tamaño del archivo que querés subir es demasiado grande"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Se están escaneando los archivos, por favor esperá."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Escaneo actual"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index 27285a233d681506cba63086ce4b83f5425e8b75..cce58153d8983e3b73153fb293d22c962eba2dcc 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 19:50+0000\n"
-"Last-Translator: Javier Victor Mariano Bruno <koryyyy@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -79,9 +79,9 @@ msgstr "No se puede descibrar este archivo, probablemente sea un archivo compart
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Error desconocido, por favor chequea la configuración de tu sistema o contacte a su administrador"
+msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
" the encryption app has been disabled."
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:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Los siguientes usuarios no fueron configurados para encriptar:"
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index c6c11a01dcbd489a8e760dc95fbaa05f3a15e723..8d900e6f127266514b9c27e2f7a4fc33f58611a8 100644
--- a/l10n/es_AR/files_external.po
+++ b/l10n/es_AR/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Servidor"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,6 +166,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -198,29 +202,29 @@ msgstr "Error al configurar el almacenamiento de Google Drive"
msgid "Saved"
msgstr "Guardado"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index fb4a0b5bf373f156c87633fed388b99b9955fef7..b1ff6419c4e9aa6dc288f58bbadf27b3ff503a5b 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,34 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Compartido por {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Esto está protegido por contraseña"
@@ -35,6 +59,14 @@ msgstr "La contraseña no es correcta. Probá de nuevo."
msgid "Password"
msgstr "Contraseña"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Perdón, este enlace parece no funcionar más."
@@ -63,11 +95,11 @@ msgstr "Para mayor información, contactá a la persona que te mandó el enlace.
msgid "Download"
msgstr "Descargar"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "VÃnculo directo"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index 2ee0526ef0125aa1f7fabdf917785605e942dd06..e23903ca582cb7df5a27e678fc05c4410e49e97e 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_AR/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "No fue posible borrar %s de manera permanente"
msgid "Couldn't restore %s"
msgstr "No se pudo restaurar %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Archivos borrados"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Recuperar"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Error"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Archivos eliminados"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "recuperado"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "No hay nada acá. ¡La papelera está vacÃa!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nombre"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Recuperar"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Borrado"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Borrar"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index 635ef391bcd22e4bdb7de75dace1722c7c65fb77..dc27d072b2ee6d66cf5ad6db360cd9f5af30e3ec 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -78,23 +78,23 @@ msgstr "Imagen inválida"
msgid "web services under your control"
msgstr "servicios web sobre los que tenés control"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "La descarga en ZIP está desactivada."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Los archivos deben ser descargados de a uno."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Volver a Archivos"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -280,127 +280,138 @@ msgstr "Configurar un nombre de administrador."
msgid "Set an admin password."
msgstr "Configurar una contraseña de administrador."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Tu servidor web no está configurado todavÃa para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
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>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s compartió \"%s\" con vos"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "No fue posible encontrar la categorÃa \"%s\""
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 5ba85ed739964c19118992e79d61249ff2ce33fd..cedde818340c403f520b580f738a4b29a06cac65 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -51,15 +51,15 @@ msgstr "e-mail mandado"
msgid "You need to set your user email before being able to send test emails."
msgstr "Necesita especificar el usuario de correo electrónico antes de poder enviar correos electrónicos de prueba."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Modo de envio"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Encriptación"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Método de autenticación"
@@ -102,6 +102,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "e-mail guardado"
@@ -118,6 +128,16 @@ msgstr "No fue posible borrar el grupo"
msgid "Unable to delete user"
msgstr "No fue posible borrar el usuario"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Idioma cambiado"
@@ -173,7 +193,7 @@ msgstr "El back-end no soporta cambios de contraseña, pero las claves de encrip
msgid "Unable to change password"
msgstr "Imposible cambiar la contraseña"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Enviando..."
@@ -229,34 +249,42 @@ msgstr "Actualizar"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Seleccionar una imágen de perfil"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Contraseña muy débil."
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Contraseña débil."
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Contraseña de nivel medio. "
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Buena contraseña. "
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Contraseña fuerte."
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Desencriptando archivos... Por favor espere, esto puede tardar."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "borrado"
@@ -269,8 +297,8 @@ msgstr "deshacer"
msgid "Unable to remove user"
msgstr "Imposible borrar usuario"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupos"
@@ -302,7 +330,7 @@ msgstr "Debe ingresar una contraseña válida"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Advertencia: El directorio Home del usuario \"{user}\" ya existe"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Castellano (Argentina)"
@@ -370,7 +398,7 @@ msgid ""
"root."
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:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Alerta de Configuración"
@@ -385,53 +413,65 @@ 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, cheque bien la <a href=\"%s\">guÃa de instalación</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "El módulo 'fileinfo' no existe"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "El módulo PHP 'fileinfo' no existe. Es recomendable que actives este módulo para obtener mejores resultados con la detección mime-type"
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Su versión de PHP está fuera de término"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Su versión de PHP está fuera de término. Recomendamos fuertemente actualizar a 5.3.8 o a una más nueva porque se sabe que versiones anteriores están falladas. Es posible que esta instalación no funcione adecuadamente."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "\"Locale\" no está funcionando"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "La localización del sistema no puede cambiarse a una que soporta UTF-8"
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivos."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Se sugiere fuertemente instalar los paquetes requeridos en su sistema para soportar uno de las siguientes localizaciones: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "La conexión a Internet no esta funcionando. "
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -440,198 +480,206 @@ msgid ""
"internet connection for this server if you want to have all features."
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:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Ejecutá una tarea con cada pagina cargada."
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php está registrado en el servicio webcron para llamarlo cada 15 minutos usando http."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Compartiendo"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Habilitar Share API"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Permitir a las aplicaciones usar la Share API"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Permitir enlaces"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permitir a los usuarios compartir enlaces públicos"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Permitir subidas públicas"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permitir que los usuarios autoricen a otros a subir archivos en sus directorios públicos compartidos"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Permitir a los usuarios compartir enlaces públicos"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Permitir Re-Compartir"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Permite a los usuarios volver a compartir items que les fueron compartidos"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Permitir a los usuarios compartir con cualquiera."
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Permitir a los usuarios compartir sólo con los de sus mismos grupos"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Permitir notificaciones por correo"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Habilitar a los usuarios para enviar notificaciones por correo para archivos compartidos"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Seguridad"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Forzar HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la caracterÃstica SSL"
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Servidor de correo electrónico"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "Esto es usado para enviar notificaciones."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Dirección remitente"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Autentificación requerida"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Dirección del servidor"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Puerto"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Credenciales"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "Nombre de usuario SMTP"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "Contraseña SMTP"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Configuracion de correo de prueba."
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Enviar correo"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Log"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Nivel de Log"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Más"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -784,29 +832,33 @@ msgstr "Idioma"
msgid "Help translate"
msgstr "Ayudanos a traducir"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vÃa WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos."
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Clave de acceso"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Desencriptar todos los archivos"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Nombre de Usuario"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 530a107a14167e95fe6dedc0e70975a550169dbd..fa212935d5198daef90c837f8aa1f52a39342632 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: Javier Victor Mariano Bruno <koryyyy@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -73,6 +73,10 @@ msgstr "Tomar los valores de la anterior configuración de servidor?"
msgid "Keep settings?"
msgstr "¿Mantener preferencias?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "No se pudo añadir la configuración del servidor"
@@ -89,6 +93,18 @@ msgstr "Éxito"
msgid "Error"
msgstr "Error"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Configuración válida"
@@ -129,28 +145,44 @@ msgstr "¿Realmente desea borrar la configuración actual del servidor?"
msgid "Confirm Deletion"
msgstr "Confirmar borrado"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s grupo encontrado"
msgstr[1] "%s grupos encontrados"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s usuario encontrado"
msgstr[1] "%s usuarios encontrados"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Host inválido"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "No se pudo encontrar la caracterÃstica deseada"
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtro de grupo"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Guardar"
@@ -223,10 +255,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
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/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Añadir Configuración del Servidor"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Servidor"
@@ -290,6 +335,14 @@ msgstr "Volver"
msgid "Continue"
msgstr "Continuar"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avanzado"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/es_BO/core.po b/l10n/es_BO/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..f7bb109e7159bc0ab1ecf784108cd9352e24fc77
--- /dev/null
+++ b/l10n/es_BO/core.po
@@ -0,0 +1,843 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:10
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:13
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:16
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+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:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:487
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:587
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1211
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1212
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1213
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1214
+msgid "today"
+msgstr ""
+
+#: js/js.js:1215
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1216
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1217
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1218
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1219
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1220
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr ""
+
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:175 js/share.js:863
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:186
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:193
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:203
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:229
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:235
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:256
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:260
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:261
+msgid "Send"
+msgstr ""
+
+#: js/share.js:266
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:267
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:304
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:307
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:355 js/share.js:416
+msgid "group"
+msgstr ""
+
+#: js/share.js:388
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:432
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:454
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:462
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:465
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:467
+msgid "access control"
+msgstr ""
+
+#: js/share.js:470
+msgid "create"
+msgstr ""
+
+#: js/share.js:473
+msgid "update"
+msgstr ""
+
+#: js/share.js:476
+msgid "delete"
+msgstr ""
+
+#: js/share.js:479
+msgid "share"
+msgstr ""
+
+#: js/share.js:781
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:800
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:821
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:850
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:861
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:885
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:264
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
+
+#: js/update.js:61
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php: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 ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+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:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "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 ""
+
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+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"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+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:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, 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:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation. "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+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:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/es_BO/files.po b/l10n/es_BO/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..d767b06445ec4351127ee808290382a08f56a7bc
--- /dev/null
+++ b/l10n/es_BO/files.po
@@ -0,0 +1,416 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:15
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:25 ajax/move.php:28
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:58 js/files.js:103
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:146
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:57
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:85
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:86
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:87
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:88
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:89
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:109
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:171
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:181
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:196
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1671
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1213
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1334
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1437 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1579 js/filelist.js:1618
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+msgstr ""
+
+#: templates/admin.php:4
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:6
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:16
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:21
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "Save"
+msgstr ""
+
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/es_BO/files_encryption.po b/l10n/es_BO/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..53817bb58db351e31ea44045e1f6df7653fff583
--- /dev/null
+++ b/l10n/es_BO/files_encryption.po
@@ -0,0 +1,201 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\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:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error. Please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+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:299
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:5
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:12
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:38
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:45
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:56
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:8
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:13
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:21
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:32
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:41
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:43
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:59
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/es_BO/files_external.po b/l10n/es_BO/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..404b32bb20f16f2175bd6b3c4c1816c239b01a99
--- /dev/null
+++ b/l10n/es_BO/files_external.po
@@ -0,0 +1,296 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, php-format
+msgid ""
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:623
+#, php-format
+msgid ""
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:625
+#, php-format
+msgid ""
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:27
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:97
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:132
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:150
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:168
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/es_BO/files_sharing.po b/l10n/es_BO/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..a454fc401a3b52d7300d11fa2b0ee9772e4e8e33
--- /dev/null
+++ b/l10n/es_BO/files_sharing.po
@@ -0,0 +1,103 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+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:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:52
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/es_BO/files_trashbin.po b/l10n/es_BO/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..45636e70b7dc5b06c76408d6030b078bb3943cec
--- /dev/null
+++ b/l10n/es_BO/files_trashbin.po
@@ -0,0 +1,60 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/es_BO/files_versions.po b/l10n/es_BO/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..85f9f1ec38764512ebefb8bf58b55c49f84659ce
--- /dev/null
+++ b/l10n/es_BO/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:39
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:61
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:88
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:126
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:156
+msgid "Restore"
+msgstr ""
diff --git a/l10n/es_BO/lib.po b/l10n/es_BO/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..9d9bf3c56832af13f6044232815c1e5ce3b3bdc1
--- /dev/null
+++ b/l10n/es_BO/lib.po
@@ -0,0 +1,481 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:695
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:696
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:880
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+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 ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:144
+#: private/setup/oci.php:151 private/setup/oci.php:162
+#: private/setup/oci.php:169 private/setup/oci.php:178
+#: private/setup/oci.php:186 private/setup/oci.php:195
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:145
+#: private/setup/oci.php:152 private/setup/oci.php:163
+#: private/setup/oci.php:179 private/setup/oci.php:187
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:164
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:494
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:532
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:541
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:554 private/share/share.php:582
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:562
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:569
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:648
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:787
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:848
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:959
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:966
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:972
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1388
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1397
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1413
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1425
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1439
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/es_BO/settings.po b/l10n/es_BO/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..0fdb3ebc1a0f31e1b173c329bd98f9f4779f0c90
--- /dev/null
+++ b/l10n/es_BO/settings.po
@@ -0,0 +1,910 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:346
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:383
+msgid "Authentication method"
+msgstr ""
+
+#: 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:49
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+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/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+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:17
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:36
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:68
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:73
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:81
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:86 changepassword/controller.php:97
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:126
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:55
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+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:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:50 personal.php:51
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:50
+#, php-format
+msgid ""
+"You are accessing %s via HTTP. We strongly suggest you configure your server"
+" to require using HTTPS instead."
+msgstr ""
+
+#: templates/admin.php:64
+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:75 templates/admin.php:90
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:78
+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:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:108
+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:119
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: templates/admin.php:122
+msgid ""
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
+"newer because older versions are known to be broken. It is possible that "
+"this installation is not working correctly."
+msgstr ""
+
+#: templates/admin.php:133
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:138
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:142
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: templates/admin.php:146
+#, php-format
+msgid ""
+"We strongly suggest to install the required packages on your system to "
+"support one of the following locales: %s."
+msgstr ""
+
+#: templates/admin.php:158
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:161
+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:175
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:182
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:185
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:189
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:199
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:207
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:215
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:220
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:227
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:234
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:241
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:264
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:282
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:321
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:323
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:329
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:341
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:343
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:374
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:400
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:404
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:410
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:413
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:417
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:418
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:423
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:424
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:456
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:457
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:463 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:467 templates/personal.php:199
+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:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:38
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:49
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:51
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:53
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+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:38 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:49
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:61 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:78
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:81
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:100
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:111 templates/personal.php:112
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:131
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/es_BO/user_ldap.po b/l10n/es_BO/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..f586d9e0c6df04dda79e6eccacf95c279c1bde2b
--- /dev/null
+++ b/l10n/es_BO/user_ldap.po
@@ -0,0 +1,587 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\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:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:83 lib/wizard.php:97
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:130
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:825 lib/wizard.php:837
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:1025
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, 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/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+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/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
+#: templates/settings.php:11
+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:14
+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:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitive LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, 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:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:47
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:54
+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:55
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:57
+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:58
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+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:62
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/es_BO/user_webdavauth.po b/l10n/es_BO/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..5af85b322f148e1a32db7353bfa3a082c5f588eb
--- /dev/null
+++ b/l10n/es_BO/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_BO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:2
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:6
+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/es_CL/core.po b/l10n/es_CL/core.po
index 7db6df1ddba2e5ca919277d32056b7341c9965af..a33adea14fa874b3c15fa257c915355121b8ec28 100644
--- a/l10n/es_CL/core.po
+++ b/l10n/es_CL/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: es_CL\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -59,207 +64,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Domingo"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Lunes"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Martes"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Miércoles"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Jueves"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Viernes"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sábado"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Enero"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Febrero"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marzo"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mayo"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Junio"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Julio"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Agosto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Septiembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Octubre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Noviembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Diciembre"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Configuración"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "segundos antes"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "hoy"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "mes anterior"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "último año"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "años anteriores"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Choose"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Si"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Choose"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -291,140 +296,149 @@ msgstr "Compartido"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Ocurrió un error mientras compartÃa"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Ocurrió un error mientras dejaba de compartir"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Ocurrió un error mientras se cambiaban los permisos"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Clave"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -456,18 +470,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -668,6 +683,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Clave"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -793,7 +812,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/es_CL/files.po b/l10n/es_CL/files.po
index 266d97ede5e2449c10e36412ee5e90b18f48ca09..5e4f223ef01440df0afe734a19f43f501cbf0694 100644
--- a/l10n/es_CL/files.po
+++ b/l10n/es_CL/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Archivos"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Compartir"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Renombrar"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Error"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Nuevo directorio"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
-msgstr ""
+msgstr "cancelar subida"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Descargar"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/es_CL/files_encryption.po b/l10n/es_CL/files_encryption.po
index cd2c88e3ae80bcb126d0b344af47d01c19b1f57c..c0c59be9f2b0957b335d06665004d69eaa1ed9fb 100644
--- a/l10n/es_CL/files_encryption.po
+++ b/l10n/es_CL/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/es_CL/files_external.po b/l10n/es_CL/files_external.po
index 280c18107411280423a7ae267db91942bd660807..9f16e37512f0613f285a4148cb2d6f9ba76df61a 100644
--- a/l10n/es_CL/files_external.po
+++ b/l10n/es_CL/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/es_CL/files_sharing.po b/l10n/es_CL/files_sharing.po
index e29e7d54feb754b0556900877854ceb7c1b64cbe..601afbb9edd554bd6267a2d556b7a7c8d1c114e7 100644
--- a/l10n/es_CL/files_sharing.po
+++ b/l10n/es_CL/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: es_CL\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "Clave"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "Descargar"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/es_CL/files_trashbin.po b/l10n/es_CL/files_trashbin.po
index b63a2d60db4478e6c0bae2cee047630682052506..5c5859e10bd71271fd021e710620e5702f470f3d 100644
--- a/l10n/es_CL/files_trashbin.po
+++ b/l10n/es_CL/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Error"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
diff --git a/l10n/es_CL/lib.po b/l10n/es_CL/lib.po
index dbd05f5652cb92ebf0d8d4ac16756f05c263d32f..cf621bc0feafa8d708f7f6211d7961399b293bdb 100644
--- a/l10n/es_CL/lib.po
+++ b/l10n/es_CL/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: es_CL\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/es_CL/settings.po b/l10n/es_CL/settings.po
index cdd91a9d5cf00bdb02e28d4521e93623b9e7d568..6fb98b90242e048c2d3e758a547b2591b6e51a5f 100644
--- a/l10n/es_CL/settings.po
+++ b/l10n/es_CL/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/es_CL/user_ldap.po b/l10n/es_CL/user_ldap.po
index 69d9e8ceab294ff2872decbc79e7939616ec0120..5ce3709b1336e3fd4b103dd36d1b40b039a4c21e 100644
--- a/l10n/es_CL/user_ldap.po
+++ b/l10n/es_CL/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "Error"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/es_CO/core.po b/l10n/es_CO/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..c07defe82075aec5e0dd99d4a0f88ade550a15d5
--- /dev/null
+++ b/l10n/es_CO/core.po
@@ -0,0 +1,843 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:10
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:13
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:16
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+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:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:487
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:587
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1211
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1212
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1213
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1214
+msgid "today"
+msgstr ""
+
+#: js/js.js:1215
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1216
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1217
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1218
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1219
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1220
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr ""
+
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:175 js/share.js:863
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:186
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:193
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:203
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:229
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:235
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:256
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:260
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:261
+msgid "Send"
+msgstr ""
+
+#: js/share.js:266
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:267
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:304
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:307
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:355 js/share.js:416
+msgid "group"
+msgstr ""
+
+#: js/share.js:388
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:432
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:454
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:462
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:465
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:467
+msgid "access control"
+msgstr ""
+
+#: js/share.js:470
+msgid "create"
+msgstr ""
+
+#: js/share.js:473
+msgid "update"
+msgstr ""
+
+#: js/share.js:476
+msgid "delete"
+msgstr ""
+
+#: js/share.js:479
+msgid "share"
+msgstr ""
+
+#: js/share.js:781
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:800
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:821
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:850
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:861
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:885
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:264
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
+
+#: js/update.js:61
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php: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 ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+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:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "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 ""
+
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+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"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+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:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, 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:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation. "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+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:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/es_CO/files.po b/l10n/es_CO/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..4e0fc6e92d0d9dc36de098b70267d7e307083106
--- /dev/null
+++ b/l10n/es_CO/files.po
@@ -0,0 +1,416 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:15
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:25 ajax/move.php:28
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:58 js/files.js:103
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:146
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:57
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:85
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:86
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:87
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:88
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:89
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:109
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:171
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:181
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:196
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1671
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1213
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1334
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1437 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1579 js/filelist.js:1618
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+msgstr ""
+
+#: templates/admin.php:4
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:6
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:16
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:21
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "Save"
+msgstr ""
+
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/es_CO/files_encryption.po b/l10n/es_CO/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..97a316f655076b2650aa0eb77c899679f89efebe
--- /dev/null
+++ b/l10n/es_CO/files_encryption.po
@@ -0,0 +1,201 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\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:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error. Please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+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:299
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:5
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:12
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:38
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:45
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:56
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:8
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:13
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:21
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:32
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:41
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:43
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:59
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/es_CO/files_external.po b/l10n/es_CO/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..9283400210990417ad7d8f3ca9f9e107d2f25ec4
--- /dev/null
+++ b/l10n/es_CO/files_external.po
@@ -0,0 +1,296 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, php-format
+msgid ""
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:623
+#, php-format
+msgid ""
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:625
+#, php-format
+msgid ""
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:27
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:97
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:132
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:150
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:168
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/es_CO/files_sharing.po b/l10n/es_CO/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..485aa21d5a7a72d73faaf27931c1941258148f25
--- /dev/null
+++ b/l10n/es_CO/files_sharing.po
@@ -0,0 +1,103 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+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:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:52
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/es_CO/files_trashbin.po b/l10n/es_CO/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..c365643a98e706f03e3d1bfb318e75722a77c4e3
--- /dev/null
+++ b/l10n/es_CO/files_trashbin.po
@@ -0,0 +1,60 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/es_CO/files_versions.po b/l10n/es_CO/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..d050fb2f15ce90ebe49b6d8b5dfa61ee7b812462
--- /dev/null
+++ b/l10n/es_CO/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:39
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:61
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:88
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:126
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:156
+msgid "Restore"
+msgstr ""
diff --git a/l10n/es_CO/lib.po b/l10n/es_CO/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..1a807991d5782055d2806ae6122ec3f7a6fb3508
--- /dev/null
+++ b/l10n/es_CO/lib.po
@@ -0,0 +1,481 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:695
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:696
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:880
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+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 ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:144
+#: private/setup/oci.php:151 private/setup/oci.php:162
+#: private/setup/oci.php:169 private/setup/oci.php:178
+#: private/setup/oci.php:186 private/setup/oci.php:195
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:145
+#: private/setup/oci.php:152 private/setup/oci.php:163
+#: private/setup/oci.php:179 private/setup/oci.php:187
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:164
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:494
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:532
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:541
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:554 private/share/share.php:582
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:562
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:569
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:648
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:787
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:848
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:959
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:966
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:972
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1388
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1397
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1413
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1425
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1439
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/es_CO/settings.po b/l10n/es_CO/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..7602c2a56ad9377d65c6f09b7e7d74cc2ef89e5d
--- /dev/null
+++ b/l10n/es_CO/settings.po
@@ -0,0 +1,910 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:346
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:383
+msgid "Authentication method"
+msgstr ""
+
+#: 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:49
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+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/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+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:17
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:36
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:68
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:73
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:81
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:86 changepassword/controller.php:97
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:126
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:55
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+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:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:50 personal.php:51
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:50
+#, php-format
+msgid ""
+"You are accessing %s via HTTP. We strongly suggest you configure your server"
+" to require using HTTPS instead."
+msgstr ""
+
+#: templates/admin.php:64
+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:75 templates/admin.php:90
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:78
+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:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:108
+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:119
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: templates/admin.php:122
+msgid ""
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
+"newer because older versions are known to be broken. It is possible that "
+"this installation is not working correctly."
+msgstr ""
+
+#: templates/admin.php:133
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:138
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:142
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: templates/admin.php:146
+#, php-format
+msgid ""
+"We strongly suggest to install the required packages on your system to "
+"support one of the following locales: %s."
+msgstr ""
+
+#: templates/admin.php:158
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:161
+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:175
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:182
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:185
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:189
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:199
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:207
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:215
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:220
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:227
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:234
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:241
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:264
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:282
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:321
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:323
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:329
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:341
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:343
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:374
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:400
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:404
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:410
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:413
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:417
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:418
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:423
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:424
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:456
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:457
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:463 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:467 templates/personal.php:199
+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:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:38
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:49
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:51
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:53
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+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:38 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:49
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:61 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:78
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:81
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:100
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:111 templates/personal.php:112
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:131
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/es_CO/user_ldap.po b/l10n/es_CO/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..c315475988c0c7a33d53a9218bdab6b0c3d2eb74
--- /dev/null
+++ b/l10n/es_CO/user_ldap.po
@@ -0,0 +1,587 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\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:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:83 lib/wizard.php:97
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:130
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:825 lib/wizard.php:837
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:1025
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, 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/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+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/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
+#: templates/settings.php:11
+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:14
+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:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitive LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, 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:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:47
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:54
+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:55
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:57
+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:58
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+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:62
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/es_CO/user_webdavauth.po b/l10n/es_CO/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..71497a4268da7cebb922a431a890702882e2f9d3
--- /dev/null
+++ b/l10n/es_CO/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-10 01:55-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:2
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:6
+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/es_CR/core.po b/l10n/es_CR/core.po
index bc873a1313627f9f6b43ae846269704fb2582c6d..8084e0607cd5def7464d8d095a8701df6fe3f6a1 100644
--- a/l10n/es_CR/core.po
+++ b/l10n/es_CR/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: es_CR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/es_CR/files.po b/l10n/es_CR/files.po
index 82baa46ffc7077abdb4087cb59153ddfe3a7bddd..ccd91da4dbaeea9002de42e2cce88643f80ef280 100644
--- a/l10n/es_CR/files.po
+++ b/l10n/es_CR/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/es_CR/files_encryption.po b/l10n/es_CR/files_encryption.po
index c2e3a2ba8c62c0724bf06078313b321751f8b796..70c16ce697fa86413537a754a7480b51aae2ab36 100644
--- a/l10n/es_CR/files_encryption.po
+++ b/l10n/es_CR/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 22:45+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/es_CR/files_external.po b/l10n/es_CR/files_external.po
index 6df873254818618805609726070b0a5319adc747..29cb37c29d7eb3d6ebe78290805e1047d15dfd4e 100644
--- a/l10n/es_CR/files_external.po
+++ b/l10n/es_CR/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/es_CR/files_sharing.po b/l10n/es_CR/files_sharing.po
index f13bac5cf843abf732788150f07904f1e6b746dc..60076b7a37391776966e95a900dc0518aa2c140f 100644
--- a/l10n/es_CR/files_sharing.po
+++ b/l10n/es_CR/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: es_CR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/es_CR/files_trashbin.po b/l10n/es_CR/files_trashbin.po
index 4b692737a29602a61833770e54399b1180098f57..166ec3406faaf9d260dc0a6512473accc240aba7 100644
--- a/l10n/es_CR/files_trashbin.po
+++ b/l10n/es_CR/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 22:45+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr ""
-
-#: js/trash.js:62 templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
msgid "Restore"
msgstr ""
-#: js/trash.js:264
-msgid "Deleted Files"
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
msgstr ""
#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
diff --git a/l10n/es_CR/lib.po b/l10n/es_CR/lib.po
index 696b6787446962a4940a04af910f742ab050cbfe..d95942229ac31a8a2a3a9bbfc91b52430bfd2e35 100644
--- a/l10n/es_CR/lib.po
+++ b/l10n/es_CR/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: es_CR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/es_CR/settings.po b/l10n/es_CR/settings.po
index 2720f5506347a840428f37697471f8c4eb6ad1f3..4b827fd107047f96c6a54340e2570119c2aa0def 100644
--- a/l10n/es_CR/settings.po
+++ b/l10n/es_CR/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/es_CR/user_ldap.po b/l10n/es_CR/user_ldap.po
index 851e23536febc90555a687fcb455051948e9a833..384eb229fdcfaa90e88c06448e6dd803cc0849ac 100644
--- a/l10n/es_CR/user_ldap.po
+++ b/l10n/es_CR/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 22:45+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/es_EC/core.po b/l10n/es_EC/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..e512fe9d9ce0dfc05eb45bce2d98ad991079cbc5
--- /dev/null
+++ b/l10n/es_EC/core.po
@@ -0,0 +1,843 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:10
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:13
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:16
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+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:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:487
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:587
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1211
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1212
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1213
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1214
+msgid "today"
+msgstr ""
+
+#: js/js.js:1215
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1216
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1217
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1218
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1219
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1220
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr ""
+
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:175 js/share.js:863
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:186
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:193
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:203
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:229
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:235
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:256
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:260
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:261
+msgid "Send"
+msgstr ""
+
+#: js/share.js:266
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:267
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:304
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:307
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:355 js/share.js:416
+msgid "group"
+msgstr ""
+
+#: js/share.js:388
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:432
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:454
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:462
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:465
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:467
+msgid "access control"
+msgstr ""
+
+#: js/share.js:470
+msgid "create"
+msgstr ""
+
+#: js/share.js:473
+msgid "update"
+msgstr ""
+
+#: js/share.js:476
+msgid "delete"
+msgstr ""
+
+#: js/share.js:479
+msgid "share"
+msgstr ""
+
+#: js/share.js:781
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:800
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:821
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:850
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:861
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:885
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:264
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
+
+#: js/update.js:61
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php: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 ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+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:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "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 ""
+
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+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"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+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:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, 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:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation. "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+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:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/es_EC/files.po b/l10n/es_EC/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..45c7f44436b25e80d56a1ad3f8e38ba413341cb5
--- /dev/null
+++ b/l10n/es_EC/files.po
@@ -0,0 +1,416 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:15
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:25 ajax/move.php:28
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:58 js/files.js:103
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:146
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:57
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:85
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:86
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:87
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:88
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:89
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:109
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:171
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:181
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:196
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1671
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1213
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1334
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1437 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1579 js/filelist.js:1618
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+msgstr ""
+
+#: templates/admin.php:4
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:6
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:16
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:21
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "Save"
+msgstr ""
+
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/es_EC/files_encryption.po b/l10n/es_EC/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..074a070c2a1483164ffaae5953377b8ec9f1c506
--- /dev/null
+++ b/l10n/es_EC/files_encryption.po
@@ -0,0 +1,201 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\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:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error. Please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+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:299
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:5
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:12
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:38
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:45
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:56
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:8
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:13
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:21
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:32
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:41
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:43
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:59
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/es_EC/files_external.po b/l10n/es_EC/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..fedf842aa15c31cd88496426871986745b6960d0
--- /dev/null
+++ b/l10n/es_EC/files_external.po
@@ -0,0 +1,296 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, php-format
+msgid ""
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:623
+#, php-format
+msgid ""
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:625
+#, php-format
+msgid ""
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:27
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:97
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:132
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:150
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:168
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/es_EC/files_sharing.po b/l10n/es_EC/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..eec6b301b71bcb12baae07f99d039d08dcfeeb30
--- /dev/null
+++ b/l10n/es_EC/files_sharing.po
@@ -0,0 +1,103 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+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:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:52
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/es_EC/files_trashbin.po b/l10n/es_EC/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..fdf0281b7ea2c1d1a11f2e41ad367aa4a2ea67c5
--- /dev/null
+++ b/l10n/es_EC/files_trashbin.po
@@ -0,0 +1,60 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/es_EC/files_versions.po b/l10n/es_EC/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..1aedfd7f793779e318c38500099e324fd9b3ce11
--- /dev/null
+++ b/l10n/es_EC/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:39
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:61
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:88
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:126
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:156
+msgid "Restore"
+msgstr ""
diff --git a/l10n/es_EC/lib.po b/l10n/es_EC/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..ec7e3c010a21c85bc11c02876072aca5ee19fa23
--- /dev/null
+++ b/l10n/es_EC/lib.po
@@ -0,0 +1,481 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:695
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:696
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:880
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+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 ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:144
+#: private/setup/oci.php:151 private/setup/oci.php:162
+#: private/setup/oci.php:169 private/setup/oci.php:178
+#: private/setup/oci.php:186 private/setup/oci.php:195
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:145
+#: private/setup/oci.php:152 private/setup/oci.php:163
+#: private/setup/oci.php:179 private/setup/oci.php:187
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:164
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:494
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:532
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:541
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:554 private/share/share.php:582
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:562
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:569
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:648
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:787
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:848
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:959
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:966
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:972
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1388
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1397
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1413
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1425
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1439
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/es_EC/settings.po b/l10n/es_EC/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..268a8d744f6cc962d95be959e26d91112de21583
--- /dev/null
+++ b/l10n/es_EC/settings.po
@@ -0,0 +1,910 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:346
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:383
+msgid "Authentication method"
+msgstr ""
+
+#: 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:49
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+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/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+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:17
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:36
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:68
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:73
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:81
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:86 changepassword/controller.php:97
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:126
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:55
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+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:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:50 personal.php:51
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:50
+#, php-format
+msgid ""
+"You are accessing %s via HTTP. We strongly suggest you configure your server"
+" to require using HTTPS instead."
+msgstr ""
+
+#: templates/admin.php:64
+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:75 templates/admin.php:90
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:78
+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:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:108
+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:119
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: templates/admin.php:122
+msgid ""
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
+"newer because older versions are known to be broken. It is possible that "
+"this installation is not working correctly."
+msgstr ""
+
+#: templates/admin.php:133
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:138
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:142
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: templates/admin.php:146
+#, php-format
+msgid ""
+"We strongly suggest to install the required packages on your system to "
+"support one of the following locales: %s."
+msgstr ""
+
+#: templates/admin.php:158
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:161
+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:175
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:182
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:185
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:189
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:199
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:207
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:215
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:220
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:227
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:234
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:241
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:264
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:282
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:321
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:323
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:329
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:341
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:343
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:374
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:400
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:404
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:410
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:413
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:417
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:418
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:423
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:424
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:456
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:457
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:463 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:467 templates/personal.php:199
+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:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:38
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:49
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:51
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:53
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+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:38 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:49
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:61 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:78
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:81
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:100
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:111 templates/personal.php:112
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:131
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/es_EC/user_ldap.po b/l10n/es_EC/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..239768079e9f161810d1e1fbe849f7b04d3660b1
--- /dev/null
+++ b/l10n/es_EC/user_ldap.po
@@ -0,0 +1,587 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\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:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:83 lib/wizard.php:97
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:130
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:825 lib/wizard.php:837
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:1025
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, 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/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+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/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
+#: templates/settings.php:11
+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:14
+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:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitive LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, 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:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:47
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:54
+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:55
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:57
+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:58
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+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:62
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/es_EC/user_webdavauth.po b/l10n/es_EC/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..a92cd9987b43d3ef89b7b1707f2ec15d47872763
--- /dev/null
+++ b/l10n/es_EC/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-10 01:55-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_EC\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:2
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:6
+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/es_MX/core.po b/l10n/es_MX/core.po
index a9031a00f0363552b09d56e475339ef8aec72bed..54e63d16aec12ef3c54147cf9d755e53bfb80756 100644
--- a/l10n/es_MX/core.po
+++ b/l10n/es_MX/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: es_MX\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "No se pudo enviar el mensaje a los siguientes usuarios: %s"
@@ -38,6 +38,11 @@ msgstr "Modo mantenimiento desactivado"
msgid "Updated database"
msgstr "Base de datos actualizada"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "No se especificó ningún archivo o imagen"
@@ -58,207 +63,207 @@ msgstr "No hay disponible una imagen temporal de perfil, pruebe de nuevo"
msgid "No crop data provided"
msgstr "No se proporcionó datos del recorte"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Domingo"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Lunes"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Martes"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Miércoles"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Jueves"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Viernes"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sábado"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Enero"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Febrero"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marzo"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mayo"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Junio"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Julio"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Agosto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Septiembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Octubre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Noviembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Diciembre"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Guardando..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "segundos antes"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Hace %n minuto"
msgstr[1] "Hace %n minutos"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Hace %n hora"
msgstr[1] "Hace %n horas"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "hoy"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Hace %n dÃa"
msgstr[1] "Hace %n dÃas"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Hace %n mes"
msgstr[1] "Hace %n meses"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "años antes"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Seleccionar"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Error cargando plantilla del seleccionador de archivos: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "SÃ"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Seleccionar"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Error cargando plantilla del seleccionador de archivos: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Aceptar"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Error cargando plantilla del mensaje: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflicto de archivo"
msgstr[1] "{count} conflictos de archivo"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Un conflicto de archivo"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "¿Que archivos deseas mantener?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(todos seleccionados)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Error cargando plantilla de archivo existente"
@@ -290,140 +295,149 @@ msgstr "Compartido"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Error al compartir"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Error al dejar de compartir"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Error al cambiar permisos"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartido contigo y el grupo {group} por {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Compartido contigo por {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "Compartido con el usuario o con el grupo …"
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Enlace compartido"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Protección con contraseña"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Contraseña"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Permitir Subida Pública"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Enviar enlace por correo electrónico a una persona"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Enviar"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Establecer fecha de caducidad"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Fecha de caducidad"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Compartir por correo electrónico:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "No se encontró gente"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "grupo"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "No se permite compartir de nuevo"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Dejar de compartir"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "notificar al usuario por correo electrónico"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "puede editar"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "crear"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "actualizar"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "eliminar"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "compartir"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Protegido con contraseña"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Error eliminando fecha de caducidad"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Error estableciendo fecha de caducidad"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Enviando..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Correo electrónico enviado"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Precaución"
@@ -455,18 +469,19 @@ msgstr "Error cargando plantilla de diálogo: {error}"
msgid "No tags selected for deletion."
msgstr "No hay etiquetas seleccionadas para borrar."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Vuelva a cargar la página."
-#: 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 "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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora."
@@ -667,6 +682,10 @@ msgstr "Para información de cómo configurar apropiadamente su servidor, por fa
msgid "Create an <strong>admin account</strong>"
msgstr "Crear una <strong>cuenta de administrador</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Contraseña"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,8 +811,27 @@ msgstr "Gracias por su paciencia."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/es_MX/files.po b/l10n/es_MX/files.po
index 0257d90866d7366acf3c9d3525bced353e75fd0e..fae8f9552db79eb1bd31897b9f0aaf8ec90f325e 100644
--- a/l10n/es_MX/files.po
+++ b/l10n/es_MX/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr "No se pudo mover %s - Ya existe un archivo con ese nombre."
msgid "Could not move %s"
msgstr "No se pudo mover %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "El nombre de archivo no puede estar vacÃo."
@@ -36,18 +36,18 @@ msgstr "El nombre de archivo no puede estar vacÃo."
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos "
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr "Falta la carpeta temporal"
msgid "Failed to write to disk"
msgstr "Falló al escribir al disco"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "No hay suficiente espacio disponible"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Actualización fallida. No se pudo encontrar el archivo subido"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Actualización fallida. No se pudo obtener información del archivo."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Directorio inválido."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Archivos"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Subida cancelada."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "No se pudo obtener respuesta del servidor."
@@ -173,120 +177,120 @@ msgstr "La subida del archivo está en proceso. Si sale de la página ahora, la
msgid "URL cannot be empty"
msgstr "La dirección URL no puede estar vacÃa"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} ya existe"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "No se pudo crear el archivo"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "No se pudo crear la carpeta"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Error al descargar URL."
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Compartir"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Renombrar"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Su descarga está siendo preparada. Esto podrÃa tardar algo de tiempo si los archivos son grandes."
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Pendiente"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Error moviendo archivo"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Error"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "No se pudo renombrar el archivo"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Error borrando el archivo."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Nombre"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Tamaño"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Modificado"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n carpeta"
msgstr[1] "%n carpetas"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n archivo"
msgstr[1] "%n archivos"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Subiendo %n archivo"
msgstr[1] "Subiendo %n archivos"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!"
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo."
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "La clave privada no es válida para la aplicación de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados.
msgid "{dirs} and {files}"
msgstr "{dirs} y {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s no pudo ser renombrado"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr "Tamaño máximo para archivos ZIP de entrada"
msgid "Save"
msgstr "Guardar"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vÃa WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Nuevo"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Nuevo archivo de texto"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Archivo de texto"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Nueva carpeta"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Carpeta"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Desde enlace"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Archivos eliminados"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Cancelar subida"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "No tienes permisos para subir o crear archivos aquÃ."
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "No hay nada aquÃ. ¡Suba algo!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Descargar"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Eliminar"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Subida demasido grande"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Los archivos están siendo escaneados, por favor espere."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Escaneo actual"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/es_MX/files_encryption.po b/l10n/es_MX/files_encryption.po
index 50a52b5503a0e7b7e6113365aacf4e627681d1ac..325369852cee9253101dbc48a49d97a11575c7fd 100644
--- a/l10n/es_MX/files_encryption.po
+++ b/l10n/es_MX/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -76,9 +76,9 @@ msgstr "No fue posible descifrar este archivo, probablemente se trate de un arch
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Error desconocido. Verifique la configuración de su sistema o póngase en contacto con su administrador"
+msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
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:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Los siguientes usuarios no han sido configurados para el cifrado:"
@@ -111,91 +111,91 @@ msgstr "Ir directamente a su"
msgid "personal settings"
msgstr "opciones personales"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Cifrado"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Habilitar la clave de recuperación (permite recuperar los archivos del usuario en caso de pérdida de la contraseña);"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Contraseña de clave de recuperación"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Repite la contraseña de clave de recuperación"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Habilitar"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Deshabilitado"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Cambiar la contraseña de la clave de recuperación"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Antigua clave de recuperación"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Nueva clave de recuperación"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Repetir la nueva clave de recuperación"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Cambiar contraseña"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Su contraseña de clave privada ya no coincide con su contraseña de acceso:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Establecer la contraseña de su antigua clave privada a su contraseña actual de acceso."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus archivos."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Contraseña de acceso antigua"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Contraseña de acceso actual"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Actualizar Contraseña de Clave Privada"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Habilitar la recuperación de contraseña:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Habilitar esta opción le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Opciones de recuperación de archivos actualizada"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "No se pudo actualizar la recuperación de archivos"
diff --git a/l10n/es_MX/files_external.po b/l10n/es_MX/files_external.po
index 78ec228d90e5d1240d3dd0159d44adf4dbb4066e..7d2d571babf18e6b5d56824fc729f92aec6317e9 100644
--- a/l10n/es_MX/files_external.po
+++ b/l10n/es_MX/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Servidor"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr "Error configurando el almacenamiento de Google Drive"
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/es_MX/files_sharing.po b/l10n/es_MX/files_sharing.po
index 6b0ac7a443f36e7962489a4efd3c67e9bbb37c55..873d6ffd2af77dd46756f0f211987a73afcb4e6e 100644
--- a/l10n/es_MX/files_sharing.po
+++ b/l10n/es_MX/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: es_MX\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Compartido por {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Este elemento compartido esta protegido por contraseña"
@@ -33,6 +57,14 @@ msgstr "La contraseña introducida es errónea. Inténtelo de nuevo."
msgid "Password"
msgstr "Contraseña"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Lo siento, este enlace al parecer ya no funciona."
@@ -61,11 +93,11 @@ msgstr "Para mayor información, contacte a la persona que le envió el enlace."
msgid "Download"
msgstr "Descargar"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Enlace directo"
diff --git a/l10n/es_MX/files_trashbin.po b/l10n/es_MX/files_trashbin.po
index ba1c8ca747eb6fe9e99f3c34a76562ad2c405a4c..c5657a3c58abcf92f8c854cddfd22345008f8e72 100644
--- a/l10n/es_MX/files_trashbin.po
+++ b/l10n/es_MX/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:55+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr "No se puede eliminar %s permanentemente"
msgid "Couldn't restore %s"
msgstr "No se puede restaurar %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Archivos eliminados"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Recuperar"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Error"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Archivos Eliminados"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "recuperado"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "No hay nada aquÃ. ¡Tu papelera esta vacÃa!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nombre"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Recuperar"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Eliminado"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Eliminar"
diff --git a/l10n/es_MX/lib.po b/l10n/es_MX/lib.po
index 47e189c96ce40099c61694f99a1efb007e0ec26f..060bb19bab5302534f85efbf8e617f9b49ede68f 100644
--- a/l10n/es_MX/lib.po
+++ b/l10n/es_MX/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: es_MX\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr "Imagen inválida"
msgid "web services under your control"
msgstr "Servicios web bajo su control"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "La descarga en ZIP está desactivada."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Los archivos deben ser descargados uno por uno."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Volver a Archivos"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr "Configurar un nombre de usuario del administrador"
msgid "Set an admin password."
msgstr "Configurar la contraseña del administrador."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
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>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s ha compartido »%s« contigo"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "No puede encontrar la categoria \"%s\""
diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po
index 12b609a997092f68815876985cce4c570d06ec02..604116b5909aa5ce02128f436d3ccd43201505a7 100644
--- a/l10n/es_MX/settings.po
+++ b/l10n/es_MX/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "Correo electrónico enviado"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Cifrado"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Correo electrónico guardado"
@@ -114,6 +124,16 @@ msgstr "No se pudo eliminar el grupo"
msgid "Unable to delete user"
msgstr "No se pudo eliminar el usuario"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Idioma cambiado"
@@ -169,7 +189,7 @@ msgstr "El back-end no soporta cambios de contraseña, pero la clave de cifrado
msgid "Unable to change password"
msgstr "No se ha podido cambiar la contraseña"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr "Actualizar"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Seleccionar una imagen de perfil"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "eliminado"
@@ -265,8 +293,8 @@ msgstr "deshacer"
msgid "Unable to remove user"
msgstr "Imposible eliminar al usuario"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupos"
@@ -298,7 +326,7 @@ msgstr "Se debe proporcionar una contraseña válida"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Atención: el directorio de inicio para el usuario \"{user}\" ya existe."
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Español (México)"
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raÃz de documentos del servidor web."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Advertencia de configuración"
@@ -381,53 +409,65 @@ msgstr "Su servidor web aún no está configurado adecuadamente para permitir la
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>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "No se ha encontrado el módulo \"fileinfo\""
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
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 de tipos MIME."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Su versión de PHP ha caducado"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Su versión de PHP ha caducado. Le sugerimos encarecidamente que la actualize a 5.3.8 o a una más nueva porque normalmente las versiones antiguas no funcionan bien. Puede ser que esta instalación no esté funcionando bien por ello."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "La configuración regional no está funcionando"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "No se puede escoger una configuración regional que soporte UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. "
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "La conexión a Internet no está funcionando"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Este servidor no tiene conexión a Internet. Esto significa que algunas de las caracterÃsticas no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envÃo de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Ejecutar una tarea con cada página cargada"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Utiliza el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Compartiendo"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Activar API de Compartición"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Permitir a las aplicaciones utilizar la API de Compartición"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Permitir enlaces"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permitir a los usuarios compartir elementos con el público mediante enlaces"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Permitir subidas públicas"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Permitir a los usuarios compartir elementos con el público mediante enlaces"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Permitir re-compartición"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Permitir a los usuarios compartir de nuevo elementos ya compartidos"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Permitir a los usuarios compartir con cualquier persona"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Permitir a los usuarios compartir sólo con los usuarios en sus grupos"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Permitir notificaciones por correo electrónico"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Seguridad"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Forzar HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Dirección del servidor"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Puerto"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Registro"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Nivel de registro"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Más"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +828,33 @@ msgstr "Idioma"
msgid "Help translate"
msgstr "Ayúdanos a traducir"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vÃa WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "La aplicación de cifrado ya no está activada, descifre todos sus archivos"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Contraseña de acceso"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Descifrar archivos"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Nombre de usuario"
diff --git a/l10n/es_MX/user_ldap.po b/l10n/es_MX/user_ldap.po
index 82d2c95131a29a4d8718a0a38bb92b952b91ca6e..61f03113cdf3d1e85c1f58d53403b5d1f1103b9a 100644
--- a/l10n/es_MX/user_ldap.po
+++ b/l10n/es_MX/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr "¿Asumir los ajustes actuales de la configuración del servidor?"
msgid "Keep settings?"
msgstr "¿Mantener la configuración?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "No se puede añadir la configuración del servidor"
@@ -86,6 +90,18 @@ msgstr "Éxito"
msgid "Error"
msgstr "Error"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Configuración OK"
@@ -126,28 +142,44 @@ msgstr "¿Realmente desea eliminar la configuración actual del servidor?"
msgid "Confirm Deletion"
msgstr "Confirmar eliminación"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "Grupo %s encontrado"
msgstr[1] "Grupos %s encontrados"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "Usuario %s encontrado"
msgstr[1] "Usuarios %s encontrados"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Host inválido"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "No se puede encontrar la función deseada."
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Guardar"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
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/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Agregar configuracion del servidor"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Servidor"
@@ -287,6 +332,14 @@ msgstr "Atrás"
msgid "Continue"
msgstr "Continuar"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avanzado"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/es_PE/core.po b/l10n/es_PE/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..9ec86979fd141af5ee3fa2a9014da3e224bf29f5
--- /dev/null
+++ b/l10n/es_PE/core.po
@@ -0,0 +1,843 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:10
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:13
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:16
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+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:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:487
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:587
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1211
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1212
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1213
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1214
+msgid "today"
+msgstr ""
+
+#: js/js.js:1215
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1216
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1217
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1218
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1219
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1220
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr ""
+
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:175 js/share.js:863
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:186
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:193
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:203
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:229
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:235
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:256
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:260
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:261
+msgid "Send"
+msgstr ""
+
+#: js/share.js:266
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:267
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:304
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:307
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:355 js/share.js:416
+msgid "group"
+msgstr ""
+
+#: js/share.js:388
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:432
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:454
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:462
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:465
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:467
+msgid "access control"
+msgstr ""
+
+#: js/share.js:470
+msgid "create"
+msgstr ""
+
+#: js/share.js:473
+msgid "update"
+msgstr ""
+
+#: js/share.js:476
+msgid "delete"
+msgstr ""
+
+#: js/share.js:479
+msgid "share"
+msgstr ""
+
+#: js/share.js:781
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:800
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:821
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:850
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:861
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:885
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:264
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
+
+#: js/update.js:61
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php: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 ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+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:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "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 ""
+
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+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"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+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:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, 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:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation. "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+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:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/es_PE/files.po b/l10n/es_PE/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..75463ff702233ce97af307d6f5b9525a359b664b
--- /dev/null
+++ b/l10n/es_PE/files.po
@@ -0,0 +1,416 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:15
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:25 ajax/move.php:28
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:58 js/files.js:103
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:146
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:57
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:85
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:86
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:87
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:88
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:89
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:109
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:171
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:181
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:196
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1671
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1213
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1334
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1437 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1579 js/filelist.js:1618
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+msgstr ""
+
+#: templates/admin.php:4
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:6
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:16
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:21
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "Save"
+msgstr ""
+
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/es_PE/files_encryption.po b/l10n/es_PE/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..dab8929574251d933e788d4bbfcb9d70f4c131c9
--- /dev/null
+++ b/l10n/es_PE/files_encryption.po
@@ -0,0 +1,201 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\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:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error. Please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+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:299
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:5
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:12
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:38
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:45
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:56
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:8
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:13
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:21
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:32
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:41
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:43
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:59
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/es_PE/files_external.po b/l10n/es_PE/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..74e4e2fc5a4ce87f94c60efd5a411e8d1a1c47f9
--- /dev/null
+++ b/l10n/es_PE/files_external.po
@@ -0,0 +1,296 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, php-format
+msgid ""
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:623
+#, php-format
+msgid ""
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:625
+#, php-format
+msgid ""
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:27
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:97
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:132
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:150
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:168
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/es_PE/files_sharing.po b/l10n/es_PE/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..7de440ee9b87beda3eada623ab3e824a9b5192c4
--- /dev/null
+++ b/l10n/es_PE/files_sharing.po
@@ -0,0 +1,103 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+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:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:52
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/es_PE/files_trashbin.po b/l10n/es_PE/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..4c1e50db1768a615894f60b94fd06a3f3e508a24
--- /dev/null
+++ b/l10n/es_PE/files_trashbin.po
@@ -0,0 +1,60 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/es_PE/files_versions.po b/l10n/es_PE/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..2c25cb4b9dd1e9ca18a6333eea33bed915447d36
--- /dev/null
+++ b/l10n/es_PE/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:39
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:61
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:88
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:126
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:156
+msgid "Restore"
+msgstr ""
diff --git a/l10n/es_PE/lib.po b/l10n/es_PE/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..b90ac66c50f6c085649e6c6166cb8ac01f069760
--- /dev/null
+++ b/l10n/es_PE/lib.po
@@ -0,0 +1,481 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:695
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:696
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:880
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+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 ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:144
+#: private/setup/oci.php:151 private/setup/oci.php:162
+#: private/setup/oci.php:169 private/setup/oci.php:178
+#: private/setup/oci.php:186 private/setup/oci.php:195
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:145
+#: private/setup/oci.php:152 private/setup/oci.php:163
+#: private/setup/oci.php:179 private/setup/oci.php:187
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:164
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:494
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:532
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:541
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:554 private/share/share.php:582
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:562
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:569
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:648
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:787
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:848
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:959
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:966
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:972
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1388
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1397
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1413
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1425
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1439
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/es_PE/settings.po b/l10n/es_PE/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..1227caafe54aaa8c69ec93c7089091ae0e8eb274
--- /dev/null
+++ b/l10n/es_PE/settings.po
@@ -0,0 +1,910 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:346
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:383
+msgid "Authentication method"
+msgstr ""
+
+#: 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:49
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+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/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+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:17
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:36
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:68
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:73
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:81
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:86 changepassword/controller.php:97
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:126
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:55
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+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:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:50 personal.php:51
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:50
+#, php-format
+msgid ""
+"You are accessing %s via HTTP. We strongly suggest you configure your server"
+" to require using HTTPS instead."
+msgstr ""
+
+#: templates/admin.php:64
+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:75 templates/admin.php:90
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:78
+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:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:108
+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:119
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: templates/admin.php:122
+msgid ""
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
+"newer because older versions are known to be broken. It is possible that "
+"this installation is not working correctly."
+msgstr ""
+
+#: templates/admin.php:133
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:138
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:142
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: templates/admin.php:146
+#, php-format
+msgid ""
+"We strongly suggest to install the required packages on your system to "
+"support one of the following locales: %s."
+msgstr ""
+
+#: templates/admin.php:158
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:161
+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:175
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:182
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:185
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:189
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:199
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:207
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:215
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:220
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:227
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:234
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:241
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:264
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:282
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:321
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:323
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:329
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:341
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:343
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:374
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:400
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:404
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:410
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:413
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:417
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:418
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:423
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:424
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:456
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:457
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:463 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:467 templates/personal.php:199
+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:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:38
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:49
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:51
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:53
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+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:38 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:49
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:61 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:78
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:81
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:100
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:111 templates/personal.php:112
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:131
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/es_PE/user_ldap.po b/l10n/es_PE/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..f820cc7a541a4dff1a27bcbdd6d25b8ebe65c90d
--- /dev/null
+++ b/l10n/es_PE/user_ldap.po
@@ -0,0 +1,587 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\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:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:83 lib/wizard.php:97
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:130
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:825 lib/wizard.php:837
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:1025
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, 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/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+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/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
+#: templates/settings.php:11
+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:14
+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:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitive LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, 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:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:47
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:54
+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:55
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:57
+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:58
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+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:62
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/es_PE/user_webdavauth.po b/l10n/es_PE/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..f489730aaf5275de5453ee0e9fea77de01bb3a4e
--- /dev/null
+++ b/l10n/es_PE/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-10 01:55-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:2
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:6
+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/es_PY/core.po b/l10n/es_PY/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..0e27cc4443e1e3dafb33a20fe26a00ace751bfe6
--- /dev/null
+++ b/l10n/es_PY/core.po
@@ -0,0 +1,843 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:10
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:13
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:16
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+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:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:487
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:587
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1211
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1212
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1213
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1214
+msgid "today"
+msgstr ""
+
+#: js/js.js:1215
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1216
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1217
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1218
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1219
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1220
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr ""
+
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:175 js/share.js:863
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:186
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:193
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:203
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:229
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:235
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:256
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:260
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:261
+msgid "Send"
+msgstr ""
+
+#: js/share.js:266
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:267
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:304
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:307
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:355 js/share.js:416
+msgid "group"
+msgstr ""
+
+#: js/share.js:388
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:432
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:454
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:462
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:465
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:467
+msgid "access control"
+msgstr ""
+
+#: js/share.js:470
+msgid "create"
+msgstr ""
+
+#: js/share.js:473
+msgid "update"
+msgstr ""
+
+#: js/share.js:476
+msgid "delete"
+msgstr ""
+
+#: js/share.js:479
+msgid "share"
+msgstr ""
+
+#: js/share.js:781
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:800
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:821
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:850
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:861
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:885
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:264
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
+
+#: js/update.js:61
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php: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 ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+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:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "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 ""
+
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+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"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+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:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, 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:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation. "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+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:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/es_PY/files.po b/l10n/es_PY/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..645a7e3ad8a29a83cd7de14cc47115437604a81f
--- /dev/null
+++ b/l10n/es_PY/files.po
@@ -0,0 +1,416 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:15
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:25 ajax/move.php:28
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:58 js/files.js:103
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:146
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:57
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:85
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:86
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:87
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:88
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:89
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:109
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:171
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:181
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:196
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1671
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1213
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1334
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1437 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1579 js/filelist.js:1618
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+msgstr ""
+
+#: templates/admin.php:4
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:6
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:16
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:21
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "Save"
+msgstr ""
+
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/es_PY/files_encryption.po b/l10n/es_PY/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..15853c881897efa3fe542ace6cfe96bbf8311673
--- /dev/null
+++ b/l10n/es_PY/files_encryption.po
@@ -0,0 +1,201 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\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:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error. Please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+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:299
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:5
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:12
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:38
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:45
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:56
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:8
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:13
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:21
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:32
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:41
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:43
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:59
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/es_PY/files_external.po b/l10n/es_PY/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..ad12c81adf132a290ebbac989c323cadcdb9e02e
--- /dev/null
+++ b/l10n/es_PY/files_external.po
@@ -0,0 +1,296 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, php-format
+msgid ""
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:623
+#, php-format
+msgid ""
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:625
+#, php-format
+msgid ""
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:27
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:97
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:132
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:150
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:168
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/es_PY/files_sharing.po b/l10n/es_PY/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..c6cf2ebfaf1cb8e528dbec58ea3361fb5fb5d16e
--- /dev/null
+++ b/l10n/es_PY/files_sharing.po
@@ -0,0 +1,103 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+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:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:52
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/es_PY/files_trashbin.po b/l10n/es_PY/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..15dea56a5b501ddf6c87c82556d379fb5a708162
--- /dev/null
+++ b/l10n/es_PY/files_trashbin.po
@@ -0,0 +1,60 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/es_PY/files_versions.po b/l10n/es_PY/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..a9d3b8665841d7387fb386de2750394d83742b79
--- /dev/null
+++ b/l10n/es_PY/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:39
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:61
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:88
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:126
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:156
+msgid "Restore"
+msgstr ""
diff --git a/l10n/es_PY/lib.po b/l10n/es_PY/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..b2b7ceec0cce7ea59e46af5f1a31deaca5e9032f
--- /dev/null
+++ b/l10n/es_PY/lib.po
@@ -0,0 +1,481 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:695
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:696
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:880
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+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 ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:144
+#: private/setup/oci.php:151 private/setup/oci.php:162
+#: private/setup/oci.php:169 private/setup/oci.php:178
+#: private/setup/oci.php:186 private/setup/oci.php:195
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:145
+#: private/setup/oci.php:152 private/setup/oci.php:163
+#: private/setup/oci.php:179 private/setup/oci.php:187
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:164
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:494
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:532
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:541
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:554 private/share/share.php:582
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:562
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:569
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:648
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:787
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:848
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:959
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:966
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:972
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1388
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1397
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1413
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1425
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1439
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/es_PY/settings.po b/l10n/es_PY/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..897a50c7b211c2671fcd2108c70c7d68c02e2b1b
--- /dev/null
+++ b/l10n/es_PY/settings.po
@@ -0,0 +1,910 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:346
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:383
+msgid "Authentication method"
+msgstr ""
+
+#: 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:49
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+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/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+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:17
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:36
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:68
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:73
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:81
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:86 changepassword/controller.php:97
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:126
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:55
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+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:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:50 personal.php:51
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:50
+#, php-format
+msgid ""
+"You are accessing %s via HTTP. We strongly suggest you configure your server"
+" to require using HTTPS instead."
+msgstr ""
+
+#: templates/admin.php:64
+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:75 templates/admin.php:90
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:78
+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:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:108
+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:119
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: templates/admin.php:122
+msgid ""
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
+"newer because older versions are known to be broken. It is possible that "
+"this installation is not working correctly."
+msgstr ""
+
+#: templates/admin.php:133
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:138
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:142
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: templates/admin.php:146
+#, php-format
+msgid ""
+"We strongly suggest to install the required packages on your system to "
+"support one of the following locales: %s."
+msgstr ""
+
+#: templates/admin.php:158
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:161
+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:175
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:182
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:185
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:189
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:199
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:207
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:215
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:220
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:227
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:234
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:241
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:264
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:282
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:321
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:323
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:329
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:341
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:343
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:374
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:400
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:404
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:410
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:413
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:417
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:418
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:423
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:424
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:456
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:457
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:463 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:467 templates/personal.php:199
+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:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:38
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:49
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:51
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:53
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+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:38 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:49
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:61 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:78
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:81
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:100
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:111 templates/personal.php:112
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:131
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/es_PY/user_ldap.po b/l10n/es_PY/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..f02218c30e92644ff65be0f5ab6562848452f114
--- /dev/null
+++ b/l10n/es_PY/user_ldap.po
@@ -0,0 +1,587 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\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:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:83 lib/wizard.php:97
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:130
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:825 lib/wizard.php:837
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:1025
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, 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/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+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/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
+#: templates/settings.php:11
+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:14
+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:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitive LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, 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:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:47
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:54
+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:55
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:57
+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:58
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+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:62
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/es_PY/user_webdavauth.po b/l10n/es_PY/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..49d8df6b3a40c5cbc128e2dc1bdafb77522dce1a
--- /dev/null
+++ b/l10n/es_PY/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:2
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:6
+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/es_US/core.po b/l10n/es_US/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..392008628f1c1d961e2e4390dfa658c00ee045f4
--- /dev/null
+++ b/l10n/es_US/core.po
@@ -0,0 +1,843 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:10
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:13
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:16
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+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:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:487
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:587
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1211
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1212
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1213
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1214
+msgid "today"
+msgstr ""
+
+#: js/js.js:1215
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1216
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1217
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1218
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1219
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1220
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr ""
+
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:175 js/share.js:863
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:186
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:193
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:203
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:229
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:235
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:256
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:260
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:261
+msgid "Send"
+msgstr ""
+
+#: js/share.js:266
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:267
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:304
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:307
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:355 js/share.js:416
+msgid "group"
+msgstr ""
+
+#: js/share.js:388
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:432
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:454
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:462
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:465
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:467
+msgid "access control"
+msgstr ""
+
+#: js/share.js:470
+msgid "create"
+msgstr ""
+
+#: js/share.js:473
+msgid "update"
+msgstr ""
+
+#: js/share.js:476
+msgid "delete"
+msgstr ""
+
+#: js/share.js:479
+msgid "share"
+msgstr ""
+
+#: js/share.js:781
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:800
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:821
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:850
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:861
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:885
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:264
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
+
+#: js/update.js:61
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php: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 ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+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:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "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 ""
+
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+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"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+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:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, 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:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation. "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+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:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/es_US/files.po b/l10n/es_US/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..b1678d1fbac61ee842c956833e31e72a74cfffa2
--- /dev/null
+++ b/l10n/es_US/files.po
@@ -0,0 +1,416 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:15
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:25 ajax/move.php:28
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:58 js/files.js:103
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:146
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:57
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:85
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:86
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:87
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:88
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:89
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:109
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:171
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:181
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:196
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1671
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1213
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1334
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1437 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1579 js/filelist.js:1618
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+msgstr ""
+
+#: templates/admin.php:4
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:6
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:16
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:21
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "Save"
+msgstr ""
+
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/es_US/files_encryption.po b/l10n/es_US/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..8f924e5fea234be6182101ba487b15d532138b0b
--- /dev/null
+++ b/l10n/es_US/files_encryption.po
@@ -0,0 +1,201 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\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:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error. Please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+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:299
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:5
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:12
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:38
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:45
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:56
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:8
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:13
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:21
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:32
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:41
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:43
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:59
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/es_US/files_external.po b/l10n/es_US/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..19a28ef905dc681cc465f81e48c0fa926a1cdbc5
--- /dev/null
+++ b/l10n/es_US/files_external.po
@@ -0,0 +1,296 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, php-format
+msgid ""
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:623
+#, php-format
+msgid ""
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:625
+#, php-format
+msgid ""
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:27
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:97
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:132
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:150
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:168
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/es_US/files_sharing.po b/l10n/es_US/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..fd7d3ed1fb8778212d318d63d1653efd9da6602d
--- /dev/null
+++ b/l10n/es_US/files_sharing.po
@@ -0,0 +1,103 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+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:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:52
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/es_US/files_trashbin.po b/l10n/es_US/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..031ebf57ce2818c632af60f2d9cf60c6d09571c8
--- /dev/null
+++ b/l10n/es_US/files_trashbin.po
@@ -0,0 +1,60 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/es_US/files_versions.po b/l10n/es_US/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..a1c045704052114137fac0ed988aa27bf01a77db
--- /dev/null
+++ b/l10n/es_US/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:39
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:61
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:88
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:126
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:156
+msgid "Restore"
+msgstr ""
diff --git a/l10n/es_US/lib.po b/l10n/es_US/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..1b84c6a1c3faf4f0cc25a9e7bf4d9a749fc51013
--- /dev/null
+++ b/l10n/es_US/lib.po
@@ -0,0 +1,481 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:695
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:696
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:880
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+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 ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:144
+#: private/setup/oci.php:151 private/setup/oci.php:162
+#: private/setup/oci.php:169 private/setup/oci.php:178
+#: private/setup/oci.php:186 private/setup/oci.php:195
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:145
+#: private/setup/oci.php:152 private/setup/oci.php:163
+#: private/setup/oci.php:179 private/setup/oci.php:187
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:164
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:494
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:532
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:541
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:554 private/share/share.php:582
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:562
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:569
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:648
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:787
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:848
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:959
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:966
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:972
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1388
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1397
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1413
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1425
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1439
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/es_US/settings.po b/l10n/es_US/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..d501b61d66ebdb3a58856ed371ed93e7389cc908
--- /dev/null
+++ b/l10n/es_US/settings.po
@@ -0,0 +1,910 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:346
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:383
+msgid "Authentication method"
+msgstr ""
+
+#: 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:49
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+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/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+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:17
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:36
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:68
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:73
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:81
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:86 changepassword/controller.php:97
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:126
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:55
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+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:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:50 personal.php:51
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:50
+#, php-format
+msgid ""
+"You are accessing %s via HTTP. We strongly suggest you configure your server"
+" to require using HTTPS instead."
+msgstr ""
+
+#: templates/admin.php:64
+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:75 templates/admin.php:90
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:78
+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:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:108
+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:119
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: templates/admin.php:122
+msgid ""
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
+"newer because older versions are known to be broken. It is possible that "
+"this installation is not working correctly."
+msgstr ""
+
+#: templates/admin.php:133
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:138
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:142
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: templates/admin.php:146
+#, php-format
+msgid ""
+"We strongly suggest to install the required packages on your system to "
+"support one of the following locales: %s."
+msgstr ""
+
+#: templates/admin.php:158
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:161
+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:175
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:182
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:185
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:189
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:199
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:207
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:215
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:220
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:227
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:234
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:241
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:264
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:282
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:321
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:323
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:329
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:341
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:343
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:374
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:400
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:404
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:410
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:413
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:417
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:418
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:423
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:424
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:456
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:457
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:463 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:467 templates/personal.php:199
+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:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:38
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:49
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:51
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:53
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+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:38 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:49
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:61 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:78
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:81
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:100
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:111 templates/personal.php:112
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:131
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/es_US/user_ldap.po b/l10n/es_US/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..bfa4b06c1aa239b83e86d9662d9b5cbd8376c4fe
--- /dev/null
+++ b/l10n/es_US/user_ldap.po
@@ -0,0 +1,587 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\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:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:83 lib/wizard.php:97
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:130
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:825 lib/wizard.php:837
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:1025
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, 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/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+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/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
+#: templates/settings.php:11
+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:14
+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:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitive LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, 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:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:47
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:54
+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:55
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:57
+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:58
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+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:62
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/es_US/user_webdavauth.po b/l10n/es_US/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..95da0e4e8c227619d28f850f1e0018819982c746
--- /dev/null
+++ b/l10n/es_US/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:2
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:6
+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/es_UY/core.po b/l10n/es_UY/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..9d0923432f4351c58aba80b3a0096eaf63987309
--- /dev/null
+++ b/l10n/es_UY/core.po
@@ -0,0 +1,843 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:10
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:13
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:16
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+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:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:487
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:587
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1211
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1212
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1213
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1214
+msgid "today"
+msgstr ""
+
+#: js/js.js:1215
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1216
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1217
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1218
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1219
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1220
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr ""
+
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:175 js/share.js:863
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:186
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:193
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:203
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:229
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:235
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:256
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:260
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:261
+msgid "Send"
+msgstr ""
+
+#: js/share.js:266
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:267
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:304
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:307
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:355 js/share.js:416
+msgid "group"
+msgstr ""
+
+#: js/share.js:388
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:432
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:454
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:462
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:465
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:467
+msgid "access control"
+msgstr ""
+
+#: js/share.js:470
+msgid "create"
+msgstr ""
+
+#: js/share.js:473
+msgid "update"
+msgstr ""
+
+#: js/share.js:476
+msgid "delete"
+msgstr ""
+
+#: js/share.js:479
+msgid "share"
+msgstr ""
+
+#: js/share.js:781
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:800
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:821
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:850
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:861
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:885
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:264
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
+
+#: js/update.js:61
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php: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 ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+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:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "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 ""
+
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+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"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+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:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, 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:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation. "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+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:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/es_UY/files.po b/l10n/es_UY/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..d0cde4efe132a8e962f6d4d609d61d148f222bef
--- /dev/null
+++ b/l10n/es_UY/files.po
@@ -0,0 +1,416 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:15
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:25 ajax/move.php:28
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:58 js/files.js:103
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:146
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:57
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:85
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:86
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:87
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:88
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:89
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:109
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:171
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:181
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:196
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1671
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1213
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1334
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1437 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1579 js/filelist.js:1618
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+msgstr ""
+
+#: templates/admin.php:4
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:6
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:16
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:21
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "Save"
+msgstr ""
+
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/es_UY/files_encryption.po b/l10n/es_UY/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..b4ec9c0ed3db17dfc970d15a814040c4465e17b3
--- /dev/null
+++ b/l10n/es_UY/files_encryption.po
@@ -0,0 +1,201 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\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:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error. Please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+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:299
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:5
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:12
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:38
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:45
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:56
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:8
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:13
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:21
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:32
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:41
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:43
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:59
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/es_UY/files_external.po b/l10n/es_UY/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..bde03579aa177e49df130dff6dc6923384115b8a
--- /dev/null
+++ b/l10n/es_UY/files_external.po
@@ -0,0 +1,296 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, php-format
+msgid ""
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:623
+#, php-format
+msgid ""
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:625
+#, php-format
+msgid ""
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:27
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:97
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:132
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:150
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:168
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/es_UY/files_sharing.po b/l10n/es_UY/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..edee169182a855a5e598b4a6bedd1a065a5d19c7
--- /dev/null
+++ b/l10n/es_UY/files_sharing.po
@@ -0,0 +1,103 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
+msgid "Shared by {owner}"
+msgstr ""
+
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+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:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:52
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/es_UY/files_trashbin.po b/l10n/es_UY/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..2ec1edc742408204a947e4a1f786ad2ebdeeb3b1
--- /dev/null
+++ b/l10n/es_UY/files_trashbin.po
@@ -0,0 +1,60 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/es_UY/files_versions.po b/l10n/es_UY/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..db19308416459ca1592488adbdd6c75aa63dfe74
--- /dev/null
+++ b/l10n/es_UY/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-10 01:55-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:39
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:61
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:88
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:126
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:156
+msgid "Restore"
+msgstr ""
diff --git a/l10n/es_UY/lib.po b/l10n/es_UY/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..c9d61ec33dc0c075824208d0cb45335e6f53cc14
--- /dev/null
+++ b/l10n/es_UY/lib.po
@@ -0,0 +1,481 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:695
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:696
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:880
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+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 ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:144
+#: private/setup/oci.php:151 private/setup/oci.php:162
+#: private/setup/oci.php:169 private/setup/oci.php:178
+#: private/setup/oci.php:186 private/setup/oci.php:195
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:145
+#: private/setup/oci.php:152 private/setup/oci.php:163
+#: private/setup/oci.php:179 private/setup/oci.php:187
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:164
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:494
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:532
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:541
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:554 private/share/share.php:582
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:562
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:569
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:648
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:787
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:848
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:959
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:966
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:972
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1388
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1397
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1413
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1425
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1439
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/es_UY/settings.po b/l10n/es_UY/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..d3fcfb9ae6b1db100dbf3507f6bf3b4974febb83
--- /dev/null
+++ b/l10n/es_UY/settings.po
@@ -0,0 +1,910 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:346
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:383
+msgid "Authentication method"
+msgstr ""
+
+#: 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:49
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+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/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+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:17
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:36
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:68
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:73
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:81
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:86 changepassword/controller.php:97
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:126
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:55
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+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:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:50 personal.php:51
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:50
+#, php-format
+msgid ""
+"You are accessing %s via HTTP. We strongly suggest you configure your server"
+" to require using HTTPS instead."
+msgstr ""
+
+#: templates/admin.php:64
+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:75 templates/admin.php:90
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:78
+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:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:108
+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:119
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: templates/admin.php:122
+msgid ""
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
+"newer because older versions are known to be broken. It is possible that "
+"this installation is not working correctly."
+msgstr ""
+
+#: templates/admin.php:133
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:138
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:142
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: templates/admin.php:146
+#, php-format
+msgid ""
+"We strongly suggest to install the required packages on your system to "
+"support one of the following locales: %s."
+msgstr ""
+
+#: templates/admin.php:158
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:161
+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:175
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:182
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:185
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:189
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:199
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:207
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:215
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:220
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:227
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:234
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:241
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:264
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:282
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:321
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:323
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:329
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:341
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:343
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:374
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:400
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:404
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:410
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:413
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:417
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:418
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:423
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:424
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:456
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:457
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:463 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:467 templates/personal.php:199
+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:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:38
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:49
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:51
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:53
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+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:38 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:49
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:61 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:78
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:81
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:100
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:111 templates/personal.php:112
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:131
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/es_UY/user_ldap.po b/l10n/es_UY/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..50a35d6019b1ede469dc1bce3b36b9a623b548f8
--- /dev/null
+++ b/l10n/es_UY/user_ldap.po
@@ -0,0 +1,587 @@
+# 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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\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:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:83 lib/wizard.php:97
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:130
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:825 lib/wizard.php:837
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:1025
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, 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/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+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/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
+#: templates/settings.php:11
+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:14
+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:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitive LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, 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:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:47
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:54
+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:55
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:57
+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:58
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+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:62
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/es_UY/user_webdavauth.po b/l10n/es_UY/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..d6d6f0b54a43521db6f1e56ef3471fb551fad451
--- /dev/null
+++ b/l10n/es_UY/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: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-10 01:55-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_UY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:2
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:6
+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 831f23117afd8eaa6e04e8d49025b13353bb5e8d..617861d81b1b08f119f42ae10375a020a0e94ce7 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -4,14 +4,14 @@
#
# Translators:
# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
-# Rivo Zängov <eraser@eraser.ee>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -19,11 +19,11 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "Aegumise kuupäev on minevikus."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s "
@@ -40,6 +40,11 @@ msgstr "Haldusrežiimis välja lülitatud"
msgid "Updated database"
msgstr "Uuendatud andmebaas"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Ühtegi pilti või faili pole pakutud"
@@ -60,207 +65,207 @@ msgstr "Ãœhtegi ajutist profiili pilti pole saadaval, proovi uuesti"
msgid "No crop data provided"
msgstr "Lõikeandmeid ei leitud"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Pühapäev"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Esmaspäev"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Teisipäev"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Kolmapäev"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Neljapäev"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Reede"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Laupäev"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Jaanuar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Veebruar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Märts"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Aprill"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juuni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juuli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktoober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Detsember"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Seaded"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Salvestamine..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "sekundit tagasi"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut tagasi"
msgstr[1] "%n minutit tagasi"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n tund tagasi"
msgstr[1] "%n tundi tagasi"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "täna"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "eile"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n päev tagasi"
msgstr[1] "%n päeva tagasi"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "viimasel kuul"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n kuu tagasi"
msgstr[1] "%n kuud tagasi"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "viimasel aastal"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "aastat tagasi"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Vali"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Viga failivalija malli laadimisel: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Jah"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ei"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Vali"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Viga failivalija malli laadimisel: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Viga sõnumi malli laadimisel: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} failikonflikt"
msgstr[1] "{count} failikonflikti"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Ãœks failikonflikt"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Uued failid"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Juba olemasolevad failid"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Milliseid faile sa soovid alles hoida?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Kui valid mõlemad versioonid, siis lisatakse kopeeritud faili nimele number."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Loobu"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Jätka"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(kõik valitud)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} valitud)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Viga faili olemasolu malli laadimisel"
@@ -292,140 +297,149 @@ msgstr "Jagatud"
msgid "Share"
msgstr "Jaga"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Viga"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Viga jagamisel"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Viga jagamise lõpetamisel"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Viga õiguste muutmisel"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Jagatud sinu ja {group} grupiga {owner} poolt"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Sinuga jagas {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "Jaga kasutaja või grupiga ..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Jaga linki"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist"
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr "Avalik link aegub vaikimisi pärast {days} päeva"
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Parooliga kaitstud"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Parool"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr "Vali avaliku lingi jaoks parool"
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Luba avalik üleslaadimine"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Saada link isikule e-postiga"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Saada"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Määra aegumise kuupäev"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Aegumise kuupäev"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Jaga e-postiga:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Ãœhtegi inimest ei leitud"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "grupp"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Edasijagamine pole lubatud"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Jagatud {item} kasutajaga {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Lõpeta jagamine"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "teavita e-postiga"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "saab muuta"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "ligipääsukontroll"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "loo"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "uuenda"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "kustuta"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "jaga"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Parooliga kaitstud"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Viga aegumise kuupäeva eemaldamisel"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Viga aegumise kuupäeva määramisel"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Saatmine ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "E-kiri on saadetud"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Hoiatus"
@@ -457,18 +471,19 @@ msgstr "Viga dialoogi malli laadimisel: {error}"
msgid "No tags selected for deletion."
msgstr "Kustutamiseks pole ühtegi silti valitud."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Palun laadi see uuesti."
-#: 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 "Uuendus ebaõnnestus. Palun teavita probleemidest <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kogukonda</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi."
@@ -669,6 +684,10 @@ msgstr "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_bl
msgid "Create an <strong>admin account</strong>"
msgstr "Loo <strong>admini konto</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Parool"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Andmehoidla ja andmebaas"
@@ -794,8 +813,27 @@ msgstr "Täname kannatlikkuse eest."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloudi uuendamine versioonile %s. See võib veidi aega võtta."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 95e5c718e990d6d2199f7dcb732d862fa58c5a53..2a1b0bfb67b3ab24f39e514340554354a9381e02 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -4,14 +4,14 @@
#
# Translators:
# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
-# Rivo Zängov <eraser@eraser.ee>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 15:18+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\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"
@@ -29,7 +29,7 @@ msgstr "Ei saa liigutada faili %s - samanimeline fail on juba olemas"
msgid "Could not move %s"
msgstr "%s liigutamine ebaõnnestus"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Faili nimi ei saa olla tühi."
@@ -38,18 +38,18 @@ msgstr "Faili nimi ei saa olla tühi."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" on vigane failinimi."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "Sihtkataloog on ümber tõstetud või kustutatud."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -125,44 +125,48 @@ msgstr "Ajutiste failide kaust puudub"
msgid "Failed to write to disk"
msgstr "Kettale kirjutamine ebaõnnestus"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Saadaval pole piisavalt ruumi"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Üleslaadimine ebaõnnestus. Üleslaetud faili ei leitud"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Üleslaadimine ebaõnnestus. Faili info hankimine ebaõnnestus."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Vigane kaust."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Failid"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Kõik failid"
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "Faili suurus {size1} ületab faili üleslaadimise mahu piirangu {size2}."
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval."
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Üleslaadimine tühistati."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Serverist ei saadud tulemusi"
@@ -175,120 +179,124 @@ msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle ülesla
msgid "URL cannot be empty"
msgstr "URL ei saa olla tühi"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1170
msgid "{new_name} already exists"
msgstr "{new_name} on juba olemas"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Ei suuda luua faili"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Ei suuda luua kataloogi"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Viga URL-i haaramisel"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Jaga"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Kustuta jäädavalt"
-#: js/fileactions.js:234
+#: js/fileactions.js:183 templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr "Kustuta"
+
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Nimeta ümber"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:596 js/filelist.js:1665
msgid "Pending"
msgstr "Ootel"
-#: js/filelist.js:916
+#: js/filelist.js:1121
msgid "Error moving file."
-msgstr ""
+msgstr "Viga faili liigutamisel."
-#: js/filelist.js:924
+#: js/filelist.js:1129
msgid "Error moving file"
msgstr "Viga faili eemaldamisel"
-#: js/filelist.js:924
+#: js/filelist.js:1129
msgid "Error"
msgstr "Viga"
-#: js/filelist.js:988
+#: js/filelist.js:1207
msgid "Could not rename file"
msgstr "Ei suuda faili ümber nimetada"
-#: js/filelist.js:1122
+#: js/filelist.js:1328
msgid "Error deleting file."
msgstr "Viga faili kustutamisel."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1431 templates/list.php:62
msgid "Name"
msgstr "Nimi"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1432 templates/list.php:75
msgid "Size"
msgstr "Suurus"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1433 templates/list.php:78
msgid "Modified"
msgstr "Muudetud"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1443 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n kataloog"
msgstr[1] "%n kataloogi"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1449 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fail"
msgstr[1] "%n faili"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1573 js/filelist.js:1612
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Laadin üles %n faili"
msgstr[1] "Laadin üles %n faili"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" on vigane failinimi."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Su andmemaht on peaaegu täis ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse."
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -298,12 +306,12 @@ msgstr "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Pa
msgid "{dirs} and {files}"
msgstr "{dirs} ja {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s ümbernimetamine ebaõnnestus"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Ãœleslaadimine (max. %s)"
@@ -340,68 +348,71 @@ msgstr "Maksimaalne ZIP-faili sisestatava faili suurus"
msgid "Save"
msgstr "Salvesta"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Uus"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Uus tekstifail"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Tekstifail"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Uus kaust"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Kaust"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Allikast"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Kustutatud failid"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Tühista üleslaadimine"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Sul puuduvad õigused siia failide üleslaadimiseks või tekitamiseks"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Siin pole midagi. Lae midagi üles!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Lae alla"
-#: templates/index.php:84 templates/index.php:85
-msgid "Delete"
-msgstr "Kustuta"
-
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Ãœleslaadimine on liiga suur"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Faile skannitakse, palun oota."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Praegune skannimine"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr "Praegu skännimisel"
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index cb79568466e92fc9e5d5a39eb8045720f2551e69..7eebd7cedfca7f36b411692fe3911de668039779 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.po
@@ -4,14 +4,14 @@
#
# Translators:
# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
-# Rivo Zängov <eraser@eraser.ee>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-02 01:55-0400\n"
-"PO-Revision-Date: 2014-04-01 07:05+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 15:18+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\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"
@@ -78,9 +78,9 @@ msgstr "Sa ei saa seda faili dekrüpteerida, see on tõenäoliselt jagatud fail.
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Tundmatu tõrge. Palun kontrolli süsteemi seadeid või võta ühendust oma süsteemi administraatoriga"
+msgstr "Tundmatu viga. Palun võta ühendust oma administraatoriga."
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -93,7 +93,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "Palun veendu, et on paigaldatud PHP 5.3.3 või uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krüpteerimise rakendus on peatatud."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Järgmised kasutajad pole seadistatud krüpteeringuks:"
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index 63023e87098048646f0546fcfd5177708dd8f8c4..11c6fea44e97e4f265b15697356914e8d1b55a1f 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -4,14 +4,14 @@
#
# Translators:
# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2014
-# Rivo Zängov <eraser@eraser.ee>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 15:18+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\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"
@@ -23,157 +23,161 @@ msgstr ""
msgid "Local"
msgstr "Kohalik"
-#: appinfo/app.php:36
+#: appinfo/app.php:37
msgid "Location"
msgstr "Asukoht"
-#: appinfo/app.php:39
+#: appinfo/app.php:40
msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
-#: appinfo/app.php:41
+#: appinfo/app.php:43
msgid "Key"
-msgstr ""
+msgstr "Võti"
-#: appinfo/app.php:42
+#: appinfo/app.php:44
msgid "Secret"
-msgstr ""
+msgstr "Salasõna"
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
msgid "Bucket"
-msgstr ""
+msgstr "Korv"
-#: appinfo/app.php:47
+#: appinfo/app.php:49
msgid "Amazon S3 and compliant"
msgstr ""
-#: appinfo/app.php:49
+#: appinfo/app.php:52
msgid "Access Key"
-msgstr ""
+msgstr "Ligipääsu võti"
-#: appinfo/app.php:50
+#: appinfo/app.php:53
msgid "Secret Key"
-msgstr ""
+msgstr "Salavõti"
-#: appinfo/app.php:52
+#: appinfo/app.php:55
msgid "Hostname (optional)"
-msgstr ""
+msgstr "Hostinimi (valikuline)"
-#: appinfo/app.php:53
+#: appinfo/app.php:56
msgid "Port (optional)"
-msgstr ""
+msgstr "Post (valikuline)"
-#: appinfo/app.php:54
+#: appinfo/app.php:57
msgid "Region (optional)"
-msgstr ""
+msgstr "Regioon (valikuline)"
-#: appinfo/app.php:55
+#: appinfo/app.php:58
msgid "Enable SSL"
-msgstr ""
+msgstr "SSL-i kasutamine"
-#: appinfo/app.php:56
+#: appinfo/app.php:59
msgid "Enable Path Style"
msgstr ""
-#: appinfo/app.php:63
+#: appinfo/app.php:67
msgid "App key"
-msgstr ""
+msgstr "Rakenduse võti"
-#: appinfo/app.php:64
+#: appinfo/app.php:68
msgid "App secret"
-msgstr ""
+msgstr "Rakenduse salasõna"
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
+msgid "Host"
+msgstr "Host"
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
msgid "Username"
msgstr "Kasutajanimi"
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
msgid "Password"
msgstr "Parool"
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
msgid "Root"
msgstr ""
-#: appinfo/app.php:77
+#: appinfo/app.php:82
msgid "Secure ftps://"
-msgstr ""
+msgstr "Turvaline ftps://"
-#: appinfo/app.php:84
+#: appinfo/app.php:90
msgid "Client ID"
-msgstr ""
+msgstr "Kliendi ID"
-#: appinfo/app.php:85
+#: appinfo/app.php:91
msgid "Client secret"
-msgstr ""
+msgstr "Kliendi salasõna"
-#: appinfo/app.php:92
+#: appinfo/app.php:98
msgid "OpenStack Object Storage"
msgstr ""
-#: appinfo/app.php:94
+#: appinfo/app.php:101
msgid "Username (required)"
-msgstr ""
+msgstr "Kasutajanimi (kohustuslik)"
-#: appinfo/app.php:95
+#: appinfo/app.php:102
msgid "Bucket (required)"
-msgstr ""
+msgstr "Korv (kohustuslik)"
-#: appinfo/app.php:96
+#: appinfo/app.php:103
msgid "Region (optional for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:97
+#: appinfo/app.php:104
msgid "API Key (required for Rackspace Cloud Files)"
msgstr ""
-#: appinfo/app.php:98
+#: appinfo/app.php:105
msgid "Tenantname (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:99
+#: appinfo/app.php:106
msgid "Password (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:100
+#: appinfo/app.php:107
msgid "Service Name (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:101
+#: appinfo/app.php:108
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:102
+#: appinfo/app.php:109
msgid "Timeout of HTTP requests in seconds (optional)"
msgstr ""
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
msgid "Share"
msgstr "Jaga"
-#: appinfo/app.php:119
+#: appinfo/app.php:127
msgid "SMB / CIFS using OC login"
msgstr ""
-#: appinfo/app.php:122
+#: appinfo/app.php:131
msgid "Username as share"
msgstr ""
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:141 appinfo/app.php:152
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:145 appinfo/app.php:156
msgid "Secure https://"
-msgstr ""
+msgstr "Turvaline https://"
-#: appinfo/app.php:144
+#: appinfo/app.php:155
msgid "Remote subfolder"
-msgstr ""
+msgstr "Mujahl olev alamkaust"
#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
msgid "Access granted"
@@ -199,29 +203,29 @@ msgstr "Viga Google Drive'i salvestusruumi seadistamisel"
msgid "Saved"
msgstr "Salvestatud"
-#: lib/config.php:598
+#: lib/config.php:674
msgid "<b>Note:</b> "
msgstr "<b>Märkus:</b>"
-#: lib/config.php:608
+#: lib/config.php:684
msgid " and "
msgstr "ja"
-#: lib/config.php:630
+#: lib/config.php:706
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Märkus:</b> cURL tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata cURL tugi."
-#: lib/config.php:632
+#: lib/config.php:708
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Märkus:</b> FTP tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi."
-#: lib/config.php:634
+#: lib/config.php:710
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 3a275271ccc52f6252c1f9b9a6e5e0bc458c6019..ac7701f07278e0e0b4dde7e7bda9fadb317dec2a 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,34 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Jagas {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "See jagamine on parooliga kaitstud"
@@ -35,6 +59,14 @@ msgstr "Parool on vale. Proovi uuesti."
msgid "Password"
msgstr "Parool"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Vabandust, see link ei tundu enam toimivat."
@@ -63,11 +95,11 @@ msgstr "Täpsema info saamiseks palun pöördu lingi saatnud isiku poole."
msgid "Download"
msgstr "Lae alla"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Laadi alla %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Otsene link"
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index cb8d06a22d860ef59dfcc530646490a2ce58dda8..296f54efd9010f7ffea260611c286963c0d0af42 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "%s jäädavalt kustutamine ebaõnnestus"
msgid "Couldn't restore %s"
msgstr "%s ei saa taastada"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Kustutatud failid"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Taasta"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Viga"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Kustutatud failid"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "taastatud"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Siin pole midagi. Sinu prügikast on tühi!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nimi"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Taasta"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Kustutatud"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Kustuta"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index 019a214d31b41bb155d2d9be7328d350160ab8a5..374700d267c76a6461e198f30d14437ba6c648cb 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -4,14 +4,14 @@
#
# Translators:
# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
-# Rivo Zängov <eraser@eraser.ee>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 15:18+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\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"
@@ -19,16 +19,16 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:710
msgid "You are accessing the server from an untrusted domain."
msgstr "Sa kasutad serverit usalduseta asukohast"
-#: base.php:724
+#: base.php:711
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
"example configuration is provided in config/config.sample.php."
-msgstr ""
+msgstr "Palun võta ühendust oma saidi administraatoriga. Kui sa oled ise administraator, siis seadista failis config/config.php sätet \"trusted_domain\". Näidis seadistused leiad failist config/config.sample.php."
#: private/app.php:236
#, php-format
@@ -78,23 +78,23 @@ msgstr "Vigane pilt"
msgid "web services under your control"
msgstr "veebitenused sinu kontrolli all"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP-ina allalaadimine on välja lülitatud."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Failid tuleb alla laadida ükshaaval."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Tagasi failide juurde"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Valitud failid on ZIP-faili loomiseks liiga suured."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -129,29 +129,29 @@ msgstr "Rakend ei paku ühtegi info.xml faili"
msgid "App can't be installed because of not allowed code in the App"
msgstr "Rakendit ei saa paigaldada, kuna sisaldab lubamatud koodi"
-#: private/installer.php:141
+#: private/installer.php:138
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."
-#: private/installer.php:147
+#: private/installer.php:144
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"
-#: private/installer.php:160
+#: private/installer.php:157
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."
-#: private/installer.php:170
+#: private/installer.php:167
msgid "App directory already exists"
msgstr "Rakendi kataloog on juba olemas"
-#: private/installer.php:183
+#: private/installer.php:180
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Ei saa luua rakendi kataloogi. Palun korrigeeri õigusi. %s"
@@ -280,127 +280,138 @@ msgstr "Määra admin kasutajanimi."
msgid "Set an admin password."
msgstr "Määra admini parool."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s jagas sinuga »%s«"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr "%s jagamine ebaõnnestus, kuna faili pole olemas"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Sul pole lubatud %s jagada"
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "%s jagamine ebaõnnestus, kuna kuna kasutaja %s on üksuse omanik"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "%s jagamine ebaõnnestus, kuna kasutajat %s pole olemas"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr "%s jagamine ebaõnnestus, kuna kasutaja %s pole ühegi grupi liige, millede liige on %s"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "%s jagamine ebaõnnestus, kuna see üksus on juba jagatud %s"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "%s jagamine ebaõnnestus, kuna gruppi %s pole olemas"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "%s jagamine ebaõnnestus, kuna %s pole grupi %s liige"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "%s jagamine ebaõnnestus, kuna linkidega jagamine pole lubatud"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr "Jagamise tüüp %s ei ole õige %s jaoks"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr "Lubade seadistus %s jaoks ebaõnnestus, kuna antud õigused ületavad %s jaoks määratud õigusi"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "Lubade seadistus %s jaoks ebaõnnestus, kuna üksust ei leitud"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr "Jagamise tagarakend %s peab kasutusele võtma OCP\\Share_Backend liidese"
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr "Jagamise tagarakendit %s ei leitud"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr "Jagamise tagarakendit %s jaoks ei leitud"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr "%s jagamine ebaõnnestus, kuna kasutaja %s on algne jagaja"
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr "%s jagamine ebaõnnestus, kuna antud õigused ületavad %s jaoks määratud õigusi"
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr "%s jagamine ebaõnnestus, kuna edasijagamine pole lubatud"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr "%s jagamine ebaõnnestus, kuna jagamise tagarakend ei suutnud leida %s jaoks lähteallikat"
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr "%s jagamine ebaõnnestus, kuna faili ei suudetud leida failide puhvrist"
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Ei leia kategooriat \"%s\""
@@ -453,20 +464,20 @@ msgstr "viimasel aastal"
msgid "years ago"
msgstr "aastat tagasi"
-#: private/user/manager.php:232
+#: private/user/manager.php:238
msgid ""
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
"\"0-9\", and \"_.@-\""
msgstr "Kasutajanimes on lubatud ainult järgnevad tähemärgid: \"a-z\", \"A-Z\", \"0-9\" ja \"_.@-\""
-#: private/user/manager.php:237
+#: private/user/manager.php:243
msgid "A valid username must be provided"
msgstr "Sisesta nõuetele vastav kasutajatunnus"
-#: private/user/manager.php:241
+#: private/user/manager.php:247
msgid "A valid password must be provided"
msgstr "Sisesta nõuetele vastav parool"
-#: private/user/manager.php:246
+#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Kasutajanimi on juba kasutuses"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 878c48b3baa03c9c54306aa12688bb9747839ec9..9b23b31aa021906e7cf58cfe30f614b722760153 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -49,15 +49,15 @@ msgstr "E-kiri on saadetud"
msgid "You need to set your user email before being able to send test emails."
msgstr "Pead seadistama oma e-postienne kui on võimalik saata test-kirju."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Saatmise viis"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Krüpteerimine"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Autentimise meetod"
@@ -100,6 +100,16 @@ msgstr "Ei suutnud faile dekrüpteerida, palun kontrolli oma owncloud.log-i või
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "Ei suutnud failde dekrüpteerida, kontrolli parooli ja proovi uuesti"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Kiri on salvestatud"
@@ -116,6 +126,16 @@ msgstr "Grupi kustutamine ebaõnnestus"
msgid "Unable to delete user"
msgstr "Kasutaja kustutamine ebaõnnestus"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Keel on muudetud"
@@ -171,7 +191,7 @@ msgstr "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuen
msgid "Unable to change password"
msgstr "Ei suuda parooli muuta"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Saadan..."
@@ -227,34 +247,42 @@ msgstr "Uuenda"
msgid "Updated"
msgstr "Uuendatud"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Vali profiili pilt"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Väga nõrk parool"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Nõrk parool"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Enam-vähem sobiv parool"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Hea parool"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Väga hea parool"
-#: js/personal.js:313
+#: js/personal.js:310
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:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "kustutatud"
@@ -267,8 +295,8 @@ msgstr "tagasi"
msgid "Unable to remove user"
msgstr "Kasutaja eemaldamine ebaõnnestus"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupid"
@@ -300,7 +328,7 @@ msgstr "Sisesta nõuetele vastav parool"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Hoiatus: kasutaja \"{user}\" kodukataloog on juba olemas"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Eesti"
@@ -368,7 +396,7 @@ msgid ""
"root."
msgstr "Andmete kataloog ja failid on tõenäoliselt internetis avalikult saadaval. .htaccess fail, ei toimi. Soovitame tungivalt veebiserver seadistada selliselt, et andmete kataloog ei oleks enam vabalt saadaval või tõstaksid andmete kataloogi oma veebiserveri veebi juurkataloogist mujale."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Paigalduse hoiatus"
@@ -383,53 +411,65 @@ msgstr "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide s
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "Palun kontrolli uuesti <a href=\"%s\">paigaldusjuhendeid</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Moodul 'fileinfo' puudub"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "PHP moodul 'fileinfo' puudub. Soovitame tungivalt see lisada saavutamaks parimaid tulemusi failitüüpide tuvastamisel."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "PHP versioon on aegunud"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Sinu PHP versioon on aegunud. Soovitame tungivalt uuenda versioonile 5.3.8 või uuemale, kuna varasemad versioonid on teadaolevalt vigased. On võimalik, et see käesolev paigaldus ei toimi korrektselt."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Lokalisatsioon ei toimi"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Süsteemi lokaliseeringuks ei saa panna sellist, mis toetab UTF-8-t."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "See tähendab, et võib esineda probleeme failide nimedes mõnede sümbolitega."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Soovitame tungivalt paigaldada vajalikud paketid oma süsteemi tagamaks tuge järgmistele lokaliseeringutele: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Internetiühendus ei toimi"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -438,198 +478,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "Cron käivitati viimati %s."
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "Cron käivitati viimati %s. See on rohkem kui tund tagasi, midagi on valesti."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "Cron pole kordagi käivitatud!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Käivita toiming igal lehe laadimisel"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php on registreeritud webcron teenuses, et käivitada fail cron.php iga 15 minuti tagant üle http."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti tagant."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Jagamine"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Luba Share API"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Luba rakendustel kasutada Share API-t"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Luba lingid"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Luba kasutajatel jagada kirjeid avalike linkidega"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Luba avalikud üleslaadimised"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Luba kasutajatel üleslaadimine teiste poolt oma avalikult jagatud kataloogidesse "
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Aegu pärast"
-#: templates/admin.php:235
+#: templates/admin.php:250
+msgid "days"
+msgstr "päeva"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Luba kasutajatel jagada kirjeid avalike linkidega"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Luba edasijagamine"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Luba kasutajatel kõigiga jagada"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Luba teavitused e-postiga"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta"
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Aegu pärast"
-
-#: templates/admin.php:266
-msgid "days"
-msgstr "päeva"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Peata jagamine N päeva möödudes"
-
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Turvalisus"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Sunni peale HTTPS-i kasutamine"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Sunnib kliente %s ühenduma krüpteeritult."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Palun ühendu oma %s üle HTTPS või keela SSL kasutamine."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Postiserver"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "Seda kasutatakse teadete välja saatmiseks."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Saatja aadress"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Autentimine on vajalik"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Serveri aadress"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Port"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Kasutajatunnused"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "SMTP kasutajatunnus"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "SMTP parool"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Testi e-posti seadeid"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Saada kiri"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Logi"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Logi tase"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Rohkem"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Vähem"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versioon"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -782,29 +830,33 @@ msgstr "Keel"
msgid "Help translate"
msgstr "Aita tõlkida"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Sisselogimise parool"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Dekrüpteeri kõik failid"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Kasutajanimi"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index b156623c15d249e4dff39845bce15292682db293..1dff8004760f0b11115549b59844f4be5155dc09 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -4,14 +4,14 @@
#
# Translators:
# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
-# Rivo Zängov <eraser@eraser.ee>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 15:18+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\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"
@@ -72,6 +72,10 @@ msgstr "Võta sätted viimasest serveri seadistusest?"
msgid "Keep settings?"
msgstr "Säilitada seadistused?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Server"
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Ei suuda lisada serveri seadistust"
@@ -88,6 +92,18 @@ msgstr "Korras"
msgid "Error"
msgstr "Viga"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Palun määra baas DN"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Baas DN-i tuvastamine ebaõnnestus"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Palun määra post"
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Seadistus on korras"
@@ -128,28 +144,44 @@ msgstr "Oled kindel, et tahad kustutada praegust serveri seadistust?"
msgid "Confirm Deletion"
msgstr "Kinnita kustutamine"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s grupp leitud"
msgstr[1] "%s gruppi leitud"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s kasutaja leitud"
msgstr[1] "%s kasutajat leitud"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Vigane server"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Ei suuda leida soovitud funktsioonaalsust"
+#: settings.php:52
+msgid "Server"
+msgstr "Server"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Kasutaja filter"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Kasutajanime filter"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Grupi filter"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Salvesta"
@@ -222,10 +254,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime. Näide: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Server"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Server:"
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Lisa serveri seadistus"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Kustuta seadistused"
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Host"
@@ -289,6 +334,14 @@ msgstr "Tagasi"
msgid "Continue"
msgstr "Jätka"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Ekspert"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Täpsem"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index efe962642fe966dc91e82d29f65fc9c2697658a5..53b08c191cd2935ce148587bd525e897bf0363ea 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -4,13 +4,14 @@
#
# Translators:
# asieriko <asieriko@gmail.com>, 2013
+# Hey_neken <mikel@olasagasti.info>, 2014
# Piarres Beobide <pi@beobide.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +20,11 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
-msgstr ""
+msgstr "Muga data iraganekoa da"
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Ezin izan da posta bidali hurrengo erabiltzaileei: %s"
@@ -40,6 +41,11 @@ msgstr "Mantenu modua desgaitu da"
msgid "Updated database"
msgstr "Datu basea eguneratu da"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Ez da irudi edo fitxategirik zehaztu"
@@ -60,229 +66,229 @@ msgstr "Ez dago behin-behineko profil irudirik, saiatu berriro"
msgid "No crop data provided"
msgstr "Ez da ebaketarako daturik zehaztu"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Igandea"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Astelehena"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Asteartea"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Asteazkena"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Osteguna"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Ostirala"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Larunbata"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Urtarrila"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Otsaila"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Martxoa"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Apirila"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maiatza"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Ekaina"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Uztaila"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Abuztua"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Iraila"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Urria"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Azaroa"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Abendua"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Ezarpenak"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Gordetzen..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "segundu"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "orain dela minutu %n"
msgstr[1] "orain dela %n minutu"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "orain dela ordu %n"
msgstr[1] "orain dela %n ordu"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "gaur"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "atzo"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "orain dela egun %n"
msgstr[1] "orain dela %n egun"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "joan den hilabetean"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "orain dela hilabete %n"
msgstr[1] "orain dela %n hilabete"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "joan den urtean"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "urte"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Aukeratu"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Bai"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ez"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Aukeratu"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ados"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Errorea mezu txantiloia kargatzean: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "fitxategi {count}ek konfliktua sortu du"
msgstr[1] "{count} fitxategik konfliktua sortu dute"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Fitxategi batek konfliktua sortu du"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Fitxategi Berriak"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
-msgstr ""
+msgstr "Dagoeneko existitzen diren fitxategiak"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Ze fitxategi mantendu nahi duzu?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Bi bertsioak hautatzen badituzu, kopiatutako fitxategiaren izenean zenbaki bat atxikituko zaio."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Ezeztatu"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Jarraitu"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(denak hautatuta)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} hautatuta)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Errorea fitxategia existitzen da txantiloiak kargatzerakoan"
#: js/setup.js:84
msgid "Very weak password"
-msgstr ""
+msgstr "Pasahitz oso ahula"
#: js/setup.js:85
msgid "Weak password"
-msgstr ""
+msgstr "Pasahitz ahula"
#: js/setup.js:86
msgid "So-so password"
-msgstr ""
+msgstr "Halamoduzko pasahitza"
#: js/setup.js:87
msgid "Good password"
-msgstr ""
+msgstr "Pasahitz ona"
#: js/setup.js:88
msgid "Strong password"
-msgstr ""
+msgstr "Pasahitz sendoa"
#: js/share.js:51 js/share.js:66 js/share.js:106
msgid "Shared"
@@ -292,140 +298,149 @@ msgstr "Elkarbanatuta"
msgid "Share"
msgstr "Elkarbanatu"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Errorea"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Errore bat egon da elkarbanatzean"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Errore bat egon da elkarbanaketa desegitean"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Errore bat egon da baimenak aldatzean"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner}-k zu eta {group} taldearekin elkarbanatuta"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "{owner}-k zurekin elkarbanatuta"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "Elkarbanatu erabiltzaile edo taldearekin..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Elkarbanatu lotura"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Babestu pasahitzarekin"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Pasahitza"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Gaitu igotze publikoa"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Postaz bidali lotura "
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Bidali"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Ezarri muga data"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Muga data"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Elkarbanatu eposta bidez:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Ez da inor aurkitu"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "taldea"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Berriz elkarbanatzea ez dago baimendua"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "{user}ekin {item}-n elkarbanatuta"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Ez elkarbanatu"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "jakinarazi eposta bidez"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "editatu dezake"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "sarrera kontrola"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "sortu"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "eguneratu"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "ezabatu"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "elkarbanatu"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Pasahitzarekin babestuta"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Errorea izan da muga data kentzean"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Errore bat egon da muga data ezartzean"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Bidaltzen ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Eposta bidalia"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Abisua"
@@ -457,18 +472,19 @@ msgstr "Errorea elkarrizketa txantiloia kargatzean: {errorea}"
msgid "No tags selected for deletion."
msgstr "Ez dira ezabatzeko etiketak hautatu."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Mesedez birkargatu orria."
-#: 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 "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud komunitatearentzako</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara."
@@ -481,7 +497,7 @@ msgstr "%s pasahitza berrezarri"
msgid ""
"A problem has occurred whilst sending the email, please contact your "
"administrator."
-msgstr ""
+msgstr "Arazo bat gertatu da posta elektronikoa bidaltzerakoan, mesedez jarri harremanetan zure administrariarekin."
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -549,7 +565,7 @@ msgstr ""
#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
-msgstr ""
+msgstr "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea."
#: strings.php:5
msgid "Personal"
@@ -669,9 +685,13 @@ msgstr "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_
msgid "Create an <strong>admin account</strong>"
msgstr "Sortu <strong>kudeatzaile kontu<strong> bat"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Pasahitza"
+
#: templates/installation.php:70
msgid "Storage & database"
-msgstr ""
+msgstr "Biltegia & datubasea"
#: templates/installation.php:77
msgid "Data folder"
@@ -772,7 +792,7 @@ msgstr "Beste erabiltzaile izenak"
msgid ""
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
"with you.<br><a href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s"
#: templates/singleuser.user.php:3
msgid "This ownCloud instance is currently in single user mode."
@@ -794,8 +814,27 @@ msgstr "Milesker zure patzientziagatik."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud %s bertsiora eguneratzen, denbora har dezake."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 623359b6903b66a55429a083274283a3dd05e193..b42a199cbab6db7f416beb41d51f0433303d1825 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -29,27 +29,27 @@ msgstr "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da"
msgid "Could not move %s"
msgstr "Ezin dira fitxategiak mugitu %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Fitxategi izena ezin da hutsa izan."
#: ajax/newfile.php:63
#, php-format
msgid "\"%s\" is an invalid file name."
-msgstr ""
+msgstr "\"%s\" ez da fitxategi izen baliogarria."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "Jatorrizko karpeta mugitu edo ezabatu da."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -125,44 +125,48 @@ msgstr "Aldi bateko karpeta falta da"
msgid "Failed to write to disk"
msgstr "Errore bat izan da diskoan idazterakoan"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Ez dago behar aina leku erabilgarri,"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Igoerak huts egin du. Ezin izan da igotako fitxategia aurkitu"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Igoerak huts egin du. Ezin izan da fitxategiaren informazioa eskuratu."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Baliogabeko karpeta."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Fitxategiak"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "Ezin da {filename} igo karpeta bat delako edo 0 byte dituelako"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "Fitxategiaren tamainak {size1} igotzeko muga {size2} gainditzen du"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "Ez dago leku nahikorik, zu {size1} igotzen ari zara baina bakarrik {size2} libre dago"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Igoera ezeztatuta"
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Ezin da zerbitzaritik emaitzik lortu"
@@ -175,120 +179,120 @@ msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.
msgid "URL cannot be empty"
msgstr "URLa ezin da hutsik egon"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} dagoeneko existitzen da"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Ezin izan da fitxategia sortu"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Ezin izan da karpeta sortu"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Errorea URLa eskuratzerakoan"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Elkarbanatu"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Ezabatu betirako"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Berrizendatu"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Zain"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
-msgstr ""
+msgstr "Errorea fitxategia mugitzean."
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Errorea fitxategia mugitzean"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Errorea"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Ezin izan da fitxategia berrizendatu"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Errorea fitxategia ezabatzerakoan."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Izena"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Tamaina"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Aldatuta"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "karpeta %n"
msgstr[1] "%n karpeta"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "fitxategi %n"
msgstr[1] "%n fitxategi"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Fitxategi %n igotzen"
msgstr[1] "%n fitxategi igotzen"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
-msgstr ""
+msgstr "\"{name}\" ez da fitxategi izen baliogarria."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Enkriptazio aplikaziorako gako pribatu okerra. Mesedez eguneratu zure gako pribatuaren pasahitza zure ezarpen pertsonaletan zure enkriptatuko fitxategietarako sarrera berreskuratzeko."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -298,15 +302,15 @@ msgstr "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptat
msgid "{dirs} and {files}"
msgstr "{dirs} eta {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s ezin da berrizendatu"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
-msgstr ""
+msgstr "Igo (max. %s)"
#: templates/admin.php:4
msgid "File handling"
@@ -340,68 +344,75 @@ msgstr "ZIP fitxategien gehienezko tamaina"
msgid "Save"
msgstr "Gorde"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "<a href=\"%s\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Berria"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Testu fitxategi berria"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Testu fitxategia"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Karpeta berria"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Karpeta"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Estekatik"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Ezabatutako fitxategiak"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Ezeztatu igoera"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Ez duzu fitxategiak hona igotzeko edo hemen sortzeko baimenik"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Ez dago ezer. Igo zerbait!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Deskargatu"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Ezabatu"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Igoera handiegia da"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Orain eskaneatzen ari da"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index 9013cba3e0ea1effe5beeb4f54d0d8e46ec0a33f..a80989a8430c984fefdb1060a0131253e26fe28b 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -79,9 +79,9 @@ msgstr "Ezin izan da fitxategi hau deszifratu, ziurrenik elkarbanatutako fitxate
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Errore ezezaguna mesedez egiaztatu zure sistemaren ezarpenak edo harremanetan jarri zure administradorearekin"
+msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "Mesedez ziurtatu PHP 5.3.3 edo berriago bat instalatuta dagoela eta OpenSSL PHP hedapenarekin gaitua eta ongi konfiguratuta dagoela. Oraingoz, enkriptazio aplikazioa desgaituta dago."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:"
@@ -114,91 +114,91 @@ msgstr "Joan zuzenean zure"
msgid "personal settings"
msgstr "ezarpen pertsonalak"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Enkriptazioa"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Berreskuratze gako pasahitza"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Errepikatu berreskuratze gakoaren pasahitza"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Gaitua"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Ez-gaitua"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Aldatu berreskuratze gako pasahitza:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Berreskuratze gako pasahitz zaharra"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Berreskuratze gako pasahitz berria"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Errepikatu berreskuratze gako berriaren pasahitza"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Aldatu Pasahitza"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Zure gako pribatuaren pasahitza ez da dagoeneko zure sarrera pasahitza:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Ezarri zure gako pribatu zaharraren pasahitza zure oraingo sarrerako psahitzara."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Ez baduzu zure pasahitz zaharra gogoratzen eskatu zure administratzaileari zure fitxategiak berreskuratzeko."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Sartzeko pasahitz zaharra"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Sartzeko oraingo pasahitza"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Eguneratu gako pribatu pasahitza"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Gaitu pasahitz berreskuratzea:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Aukera hau gaituz zure enkriptatutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Fitxategi berreskuratze ezarpenak eguneratuak"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Ezin da fitxategi berreskuratzea eguneratu"
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index 766ade3ce0aa7d0b6bd0f97e28830d216ad65ed5..a6c5023f24876f04d331249546b94165b517af78 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# asieriko <asieriko@gmail.com>, 2014
# Piarres Beobide <pi@beobide.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -20,7 +21,7 @@ msgstr ""
#: appinfo/app.php:34
msgid "Local"
-msgstr ""
+msgstr "Bertakoa"
#: appinfo/app.php:36
msgid "Location"
@@ -28,7 +29,7 @@ msgstr "Kokapena"
#: appinfo/app.php:39
msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
#: appinfo/app.php:41
msgid "Key"
@@ -60,7 +61,7 @@ msgstr ""
#: appinfo/app.php:53
msgid "Port (optional)"
-msgstr ""
+msgstr "Portua (hautazkoa)"
#: appinfo/app.php:54
msgid "Region (optional)"
@@ -68,7 +69,7 @@ msgstr ""
#: appinfo/app.php:55
msgid "Enable SSL"
-msgstr ""
+msgstr "Gaitu SSL"
#: appinfo/app.php:56
msgid "Enable Path Style"
@@ -83,9 +84,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Hostalaria"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,6 +167,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -196,31 +201,31 @@ msgstr "Errore bat egon da Google Drive biltegiratzea konfiguratzean"
#: js/settings.js:318 js/settings.js:325
msgid "Saved"
-msgstr ""
+msgstr "Gordeta"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>Oharra:</b>"
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
-msgstr ""
+msgstr "eta"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -257,7 +262,7 @@ msgstr "Gehitu biltegiratzea"
#: templates/settings.php:92
msgid "No user or group"
-msgstr ""
+msgstr "Talde edo erabiltzailerik ez"
#: templates/settings.php:95
msgid "All Users"
@@ -282,7 +287,7 @@ msgstr "Gaitu erabiltzaileentzako Kanpo Biltegiratzea"
#: templates/settings.php:135
msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "Baimendu erabiltzaileak hurrengo kanpo biltegiratzeak muntatzen"
#: templates/settings.php:150
msgid "SSL root certificates"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index cf7d9d97afc5e449358a6c3b684007bfbb1f5673..00711a21d38847ba7c3350768e931f3e3c407e2f 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# asieriko <asieriko@gmail.com>, 2013
+# asieriko <asieriko@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "{owner}-k partekatuta"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Elkarbanatutako hau pasahitzarekin babestuta dago"
@@ -34,6 +58,14 @@ msgstr "Pasahitza ez da egokia. Saiatu berriro."
msgid "Password"
msgstr "Pasahitza"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Barkatu, lotura ez dirudi eskuragarria dagoenik."
@@ -62,11 +94,11 @@ msgstr "Informazio gehiagorako, mesedez eskatu lotura hau bidali zuen pertsonari
msgid "Download"
msgstr "Deskargatu"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
-msgstr ""
+msgstr "Deskargatu %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Lotura zuzena"
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index 85c7136db7140d7be9baf8b228fba0f93fd761e9..4b2854710b62e295ab420adbef5300ee5d72b0f4 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "Ezin izan da %s betirako ezabatu"
msgid "Couldn't restore %s"
msgstr "Ezin izan da %s berreskuratu"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Ezabatutako fitxategiak"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Berrezarri"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Errorea"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Ezabatutako Fitxategiak"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "Berrezarrita"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Ez dago ezer ez. Zure zakarrontzia hutsik dago!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Izena"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Berrezarri"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Ezabatuta"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Ezabatu"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index e819b18e5d79ccdf5322feeb2bfd21f06a913bce..ca191c53d6c35a9b3f066b6c944f46dfb18e28a2 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -78,23 +78,23 @@ msgstr "Baliogabeko irudia"
msgid "web services under your control"
msgstr "web zerbitzuak zure kontrolpean"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP deskarga ez dago gaituta."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Fitxategiak banan-banan deskargatu behar dira."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Itzuli fitxategietara"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -280,127 +280,138 @@ msgstr "Ezarri administraziorako erabiltzaile izena."
msgid "Set an admin password."
msgstr "Ezarri administraziorako pasahitza."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Mesedez begiratu <a href='%s'>instalazio gidak</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s-ek »%s« zurekin partekatu du"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Ezin da \"%s\" kategoria aurkitu"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index f00ea4af66c129159389f4efd32862d43dea28f1..a5ed776c53c652237dc5722a2f9053247e1bb0bc 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#: admin/controller.php:73
msgid "Saved"
-msgstr ""
+msgstr "Gordeta"
#: admin/controller.php:90
msgid "test email settings"
@@ -50,15 +50,15 @@ msgstr "Eposta bidalia"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Enkriptazioa"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -101,6 +101,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Eposta gorde da"
@@ -117,6 +127,16 @@ msgstr "Ezin izan da taldea ezabatu"
msgid "Unable to delete user"
msgstr "Ezin izan da erabiltzailea ezabatu"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Hizkuntza aldatuta"
@@ -172,7 +192,7 @@ msgstr ""
msgid "Unable to change password"
msgstr "Ezin izan da pasahitza aldatu"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -228,34 +248,42 @@ msgstr "Eguneratu"
msgid "Updated"
msgstr "Eguneratuta"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Profil argazkia aukeratu"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
-msgstr ""
+msgstr "Pasahitz oso ahula"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
-msgstr ""
+msgstr "Pasahitz ahula"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
-msgstr ""
+msgstr "Halamoduzko pasahitza"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
-msgstr ""
+msgstr "Pasahitz ona"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
-msgstr ""
+msgstr "Pasahitz sendoa"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "ezabatuta"
@@ -268,8 +296,8 @@ msgstr "desegin"
msgid "Unable to remove user"
msgstr "Ezin izan da erabiltzailea aldatu"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Taldeak"
@@ -301,7 +329,7 @@ msgstr "Baliozko pasahitza eman behar da"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Abisua: \"{user}\" erabiltzailearen Home karpeta dagoeneko exisititzen da"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Euskera"
@@ -369,7 +397,7 @@ msgid ""
"root."
msgstr "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Konfiguratu Abisuak"
@@ -384,53 +412,65 @@ msgstr "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sin
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "Mesedez birpasatu <a href=\"%s\">instalazio gidak</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "'fileinfo' Modulua falta da"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Zure PHP bertsioa zaharkituta dago"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Zure PHP bertsioa zaharkituta dago. Gure aholkua 5.3.8 edo bertsio berriago batera eguneratzea da, bertsio zaharragoak arazoak ematen baitituzte. Posible da instalazio honek ez funtzionatzea ongi."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Lokala ez dabil"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Sistemaren lokala ezin da UTF-8 onartzen duen batera ezarri."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Honek esan nahi du fitxategien izenetako karaktere batzuekin arazoak egon daitezkeela."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Interneteko konexioak ez du funtzionatzen"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -439,198 +479,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Exekutatu zeregin bat orri karga bakoitzean"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php webcron zerbitzu batean erregistratua dago cron.php 15 minuturo http bidez deitzeko."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Erabili sistemaren cron zerbitzua cron.php fitxategia 15 minuturo deitzeko."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Partekatzea"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Gaitu Elkarbanatze APIa"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Baimendu loturak"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Baimendu igoera publikoak"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Baimendu erabiltzaileak besteak bere partekatutako karpetetan fitxategiak igotzea"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Baimendu birpartekatzea"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Baimendu erabiltzaileak edonorekin elkarbanatzen"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin elkarbanatzen"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Baimendu posta bidezko jakinarazpenak"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Segurtasuna"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Behartu HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Bezeroak %s-ra konexio enkriptatu baten bidez konektatzera behartzen ditu."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Mesedez konektatu zure %s-ra HTTPS bidez SSL zehaztapenak aldatzeko."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Zerbitzariaren helbidea"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Portua"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Kredentzialak"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Egunkaria"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Erregistro maila"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Gehiago"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Gutxiago"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Bertsioa"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -783,29 +831,33 @@ msgstr "Hizkuntza"
msgid "Help translate"
msgstr "Lagundu itzultzen"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "<a href=\"%s\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak."
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Saioa hasteko pasahitza"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Desenkripattu fitxategi guztiak"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Sarrera Izena"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 8f64a9143108ee839e1a214b1d5d4b14a28bb0a7..93c257a208e97eacf9ec14dfeea8466a4f93f2b5 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?"
msgid "Keep settings?"
msgstr "Mantendu ezarpenak?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Ezin da zerbitzariaren konfigurazioa gehitu"
@@ -87,6 +91,18 @@ msgstr "Arrakasta"
msgid "Error"
msgstr "Errorea"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Konfigurazioa ongi dago"
@@ -127,28 +143,44 @@ msgstr "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?"
msgid "Confirm Deletion"
msgstr "Baieztatu Ezabatzea"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "Talde %s aurkitu da"
msgstr[1] "%s talde aurkitu dira"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "Erabiltzaile %s aurkitu da"
msgstr[1] "%s erabiltzaile aurkitu dira"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Baliogabeko hostalaria"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Ezin izan da nahi zen ezaugarria aurkitu"
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Taldeen iragazkia"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Gorde"
@@ -221,10 +253,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Gehitu Zerbitzariaren Konfigurazioa"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Hostalaria"
@@ -288,6 +333,14 @@ msgstr "Atzera"
msgid "Continue"
msgstr "Jarraitu"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Aurreratua"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index dff837b3f78e1f7f60f2fe9932fc12bf2f74bd0f..b2fd5ce87568eefd8cf7ac1c0cc91b7a3baf8e5a 100644
--- a/l10n/eu_ES/core.po
+++ b/l10n/eu_ES/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: eu_ES\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Ezeztatu"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po
index 9cdd06f5c7d778265bef5e28c01cabf488c0e47b..018dc187f1db475f166d1e7020a80809efc1b126 100644
--- a/l10n/eu_ES/files.po
+++ b/l10n/eu_ES/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr "Gorde"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Deskargatu"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Ezabatu"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/eu_ES/files_encryption.po b/l10n/eu_ES/files_encryption.po
index 8e857a607679d030d6eb3bb3aa971da294f095c2..8e95212ac7f5f40838e140a8463f3ce432db0197 100644
--- a/l10n/eu_ES/files_encryption.po
+++ b/l10n/eu_ES/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/eu_ES/files_external.po b/l10n/eu_ES/files_external.po
index bc7836387d602f70e743b4bb11a6392d21ec3c20..7c52a0f4a6460c814e80add9361a6b0cfaf1f6a6 100644
--- a/l10n/eu_ES/files_external.po
+++ b/l10n/eu_ES/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/eu_ES/files_sharing.po b/l10n/eu_ES/files_sharing.po
index df214550ddf36e457cc3f2de7aac73e769921967..7e27f1ea919a9b69600a0507b5bece587698096a 100644
--- a/l10n/eu_ES/files_sharing.po
+++ b/l10n/eu_ES/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: eu_ES\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "Deskargatu"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/eu_ES/files_trashbin.po b/l10n/eu_ES/files_trashbin.po
index 6705f5cbf2f2ab7c54c5c11620ec0c3309dbdcb2..28fb9197d3fe6045ecb09f07c68109a1c0f12e0a 100644
--- a/l10n/eu_ES/files_trashbin.po
+++ b/l10n/eu_ES/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Ezabatu"
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/eu_ES/lib.po b/l10n/eu_ES/lib.po
index 04f17ebfab76c0a15d6471d1453dc6d7fcf48390..a62ee693aca56d2db182f514b804451a9809fab4 100644
--- a/l10n/eu_ES/lib.po
+++ b/l10n/eu_ES/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: eu_ES\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index ce42674fd78759b430d8a31ae43703932c082624..c7803bb2cb02aa4886bcabf922c176d84a141b90 100644
--- a/l10n/eu_ES/settings.po
+++ b/l10n/eu_ES/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/eu_ES/user_ldap.po b/l10n/eu_ES/user_ldap.po
index 2b77e0e7f4120ed910407cfd1910425e6862f33d..51ef568b7207b8743ad7fedd8b78a34173893836 100644
--- a/l10n/eu_ES/user_ldap.po
+++ b/l10n/eu_ES/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Gorde"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index b07c52a0f2817ef0b467255b3856da2f523d679c..40933e17a335bf1c8a0645f42e4ed4b0cfb199bc 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -4,12 +4,13 @@
#
# Translators:
# miki_mika1362 <miki_mika1362@yahoo.com>, 2013
+# hajibaba <majid.hajibaba@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +19,11 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -39,17 +40,22 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "نوع Ùایل ناشناخته"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "عکس نامعتبر"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
@@ -59,202 +65,202 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "یکشنبه"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "دوشنبه"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "سه شنبه"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "چهارشنبه"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "پنجشنبه"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "جمعه"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "شنبه"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "ژانویه"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Ùبریه"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "مارس"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "آوریل"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "می"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "ژوئن"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "جولای"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "آگوست"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "سپتامبر"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "اکتبر"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "نوامبر"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "دسامبر"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "تنظیمات"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "در Øال ذخیره سازی..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "ثانیه‌ها پیش"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n دقیقه قبل"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n ساعت قبل"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "امروز"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "دیروز"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n روز قبل"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "ماه قبل"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n ماه قبل"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "سال قبل"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "سال‌های قبل"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "انتخاب کردن"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "بله"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "نه"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "انتخاب کردن"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "قبول"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Ùایل های جدید"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "منصر٠شدن"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
-msgstr ""
+msgstr "ادامه"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -264,19 +270,19 @@ msgstr ""
#: js/setup.js:85
msgid "Weak password"
-msgstr ""
+msgstr "رمز عبور ضعیÙ"
#: js/setup.js:86
msgid "So-so password"
-msgstr ""
+msgstr "رمز عبور متوسط"
#: js/setup.js:87
msgid "Good password"
-msgstr ""
+msgstr "رمز عبور خوب"
#: js/setup.js:88
msgid "Strong password"
-msgstr ""
+msgstr "رمز عبور قوی"
#: js/share.js:51 js/share.js:66 js/share.js:106
msgid "Shared"
@@ -286,140 +292,149 @@ msgstr "اشتراک گذاشته شده"
msgid "Share"
msgstr "اشتراک‌گذاری"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "خطا"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "خطا درØال به اشتراک گذاشتن"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "خطا درØال لغو اشتراک"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "خطا در Øال تغییر مجوز"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "به اشتراک گذاشته شده با شما توسط { دارنده}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "اشتراک گذاشتن لینک"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "نگهداری کردن رمز عبور"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "گذرواژه"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "اجازه آپلود عمومی"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "پیوند ایمیل برای شخص."
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "ارسال"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "تنظیم تاریخ انقضا"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "تاریخ انقضا"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "از طریق ایمیل به اشتراک بگذارید :"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "کسی یاÙت نشد"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "گروه"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "اشتراک گذاری مجدد مجاز نمی باشد"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "به اشتراک گذاشته شده در {بخش} با {کاربر}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "لغو اشتراک"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "می توان ویرایش کرد"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "کنترل دسترسی"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "ایجاد"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "به روز"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "پاک کردن"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "به اشتراک گذاشتن"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "نگهداری از رمز عبور"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "خطا در تنظیم نکردن تاریخ انقضا "
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "خطا در تنظیم تاریخ انقضا"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "درØال ارسال ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "ایمیل ارسال شد"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "اخطار"
@@ -451,18 +466,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "به روز رسانی ناموÙÙ‚ بود. لطÙا این خطا را به <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">جامعه ÛŒ OwnCloud</a> گزارش نمایید."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "به روزرسانی موÙقیت آمیز بود. در Øال انتقال شما به OwnCloud."
@@ -618,7 +634,7 @@ msgstr ""
#: templates/altmail.php:7 templates/mail.php:20
msgid "Cheers!"
-msgstr ""
+msgstr "سلامتی!"
#: templates/installation.php:25 templates/installation.php:32
#: templates/installation.php:39
@@ -663,9 +679,13 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "لطÙا یک <strong> شناسه برای مدیر</strong> بسازید"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "گذرواژه"
+
#: templates/installation.php:70
msgid "Storage & database"
-msgstr ""
+msgstr "انبارش و پایگاه داده"
#: templates/installation.php:77
msgid "Data folder"
@@ -788,8 +808,27 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "به روز رسانی OwnCloud به نسخه ی %s، این عملیات ممکن است زمان بر باشد."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index d4451d5a3f20cea4412b8462b13ee321877539b7..5c251cd16eba08f433217d4c7a6470edcf4e7b84 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr "%s نمی توان جابجا کرد - در Øال Øاضر پرونده
msgid "Could not move %s"
msgstr "%s نمی تواند Øرکت کند "
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "نام پرونده نمی تواند خالی باشد."
@@ -38,18 +38,18 @@ msgstr "نام پرونده نمی تواند خالی باشد."
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "نام نامعتبر ، '\\', '/', '<', '>', ':', '\"', '|', '?' و '*' مجاز نمی باشند."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -125,44 +125,48 @@ msgstr "یک پوشه موقت گم شده"
msgid "Failed to write to disk"
msgstr "نوشتن بر روی دیسک سخت ناموÙÙ‚ بود"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Ùضای کاÙÛŒ در دسترس نیست"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Ùهرست راهنما نامعتبر Ù…ÛŒ باشد."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "پرونده‌ها"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "بار گذاری لغو شد"
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -175,117 +179,117 @@ msgstr "آپلودکردن پرونده در Øال پیشرÙت است. در ص
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{نام _جدید} در Øال Øاضر وجود دارد."
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "اشتراک‌گذاری"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Øذ٠قطعی"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "تغییرنام"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "دانلود شما در Øال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد."
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "در انتظار"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "خطا"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "نام"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "اندازه"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "تاریخ"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "در Øال بارگذاری %n Ùایل"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Ùضای ذخیره ÛŒ شما کاملا پر است، بیش از این Ùایلها بهنگام یا همگام سازی نمی توانند بشوند!"
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ùضای ذخیره ÛŒ شما تقریبا پر است ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -295,12 +299,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s نمیتواند تغییر نام دهد."
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -337,68 +341,75 @@ msgstr "Øداکثرمقدار برای بار گزاری پرونده های Ù
msgid "Save"
msgstr "ذخیره"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "از این آدرس استÙاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به Ùایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "جدید"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Ùایل متنی"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "پوشه جدید"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "پوشه"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "از پیوند"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Ùایل های Øذ٠شده"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "متوق٠کردن بار گذاری"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "اینجا هیچ چیز نیست."
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "دانلود"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "ØØ°Ù"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "سایز Ùایل برای آپلود زیاد است(Ù….تنظیمات در php.ini)"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "پرونده ها در Øال بازرسی هستند لطÙا صبر کنید"
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "بازرسی کنونی"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index d649081bcf41d2ee858d99bb9f4aa8ddaf48e6a6..06bb66854762ec7eff2c796f77be5ff558525312 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/files_encryption.po
@@ -4,12 +4,13 @@
#
# Translators:
# miki_mika1362 <miki_mika1362@yahoo.com>, 2013
+# hajibaba <majid.hajibaba@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -77,7 +78,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -92,9 +93,9 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "کاربران زیر برای رمزنگاری تنظیم نشده اند"
#: js/detect-migration.js:21
msgid "Initial encryption started... This can take some time. Please wait."
@@ -112,91 +113,91 @@ msgstr ""
msgid "personal settings"
msgstr "تنظیمات شخصی"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "رمزگذاری"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Ùعال کردن کلید بازیابی(اجازه بازیابی Ùایل های کاربران در صورت از دست دادن رمزعبور):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "رمزعبور کلید بازیابی"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Ùعال شده"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "غیرÙعال شده"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "تغییر رمزعبور کلید بازیابی:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "رمزعبور قدیمی کلید بازیابی "
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "رمزعبور جدید کلید بازیابی"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "تغییر رمزعبور"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "رمزعبور کلید خصوصی شما با رمزعبور شما یکسان نیست :"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "رمزعبور قدیمی کلید خصوصی خود را با رمزعبور Ùعلی تنظیم نمایید."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "اگر رمزعبور قدیمی را Ùراموش کرده اید میتوانید از مدیر خود برای بازیابی Ùایل هایتان درخواست نمایید."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "رمزعبور قدیمی"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "رمزعبور Ùعلی"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "به روز رسانی رمزعبور کلید خصوصی"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Ùعال سازی بازیابی رمزعبور:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Ùعال کردن این گزینه به شما اجازه خواهد داد در صورت از دست دادن رمزعبور به Ùایل های رمزگذاری شده خود دسترسی داشته باشید."
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "تنظیمات بازیابی Ùایل به روز شده است."
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "به روز رسانی بازیابی Ùایل را نمی تواند انجام دهد."
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
index cb18f4be7df633da08e2dd11837b072b2f8351e2..0eb8480154275161fccb47e84dde665c37ee7f58 100644
--- a/l10n/fa/files_external.po
+++ b/l10n/fa/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "آدرس"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "میزبانی"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,6 +166,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "آدرس"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -198,29 +202,29 @@ msgstr "خطا به هنگام تنظیم Ùضای Google Drive"
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 4629b775c161a1dbf6720bb2b0157a6470f375af..4d55ad89d95d5202304e91ee802ba98b5f46fc16 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -4,12 +4,13 @@
#
# Translators:
# miki_mika1362 <miki_mika1362@yahoo.com>, 2013
+# hajibaba <majid.hajibaba@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -18,13 +19,37 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "اشتراک گذارنده {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
-msgstr ""
+msgstr "این اشتراک توسط رمز عبور Ù…ØاÙظت Ù…ÛŒ شود"
#: templates/authenticate.php:7
msgid "The password is wrong. Try again."
@@ -34,39 +59,47 @@ msgstr "رمزعبور اشتباه Ù…ÛŒ باشد. دوباره امتØان Ú©
msgid "Password"
msgstr "گذرواژه"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+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:21
msgid "Download"
msgstr "دانلود"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
-msgstr ""
+msgstr "دانلود %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
-msgstr ""
+msgstr "پیوند مستقیم"
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index a5308fdb1bb1170cb5f04f850c314263e8eb49ff..6f07b26556d9124a26093c0f9ae03ec8aac5ef03 100644
--- a/l10n/fa/files_trashbin.po
+++ b/l10n/fa/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr "%s را نمی توان برای همیشه Øذ٠کرد"
msgid "Couldn't restore %s"
msgstr "%s را نمی توان بازگرداند"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Ùایل های Øذ٠شده"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "بازیابی"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "خطا"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Ùایلهای Øذ٠شده"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "هیچ چیزی اینجا نیست. سطل زباله ی شما خالی است."
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "نام"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "بازیابی"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Øذ٠شده"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "ØØ°Ù"
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index 4aa77898117132ed9815fbba95c9509a6018dd09..da0eb359ffd2f64af76368b43a1d76dd21b29224 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -67,33 +67,33 @@ msgstr ""
#: private/avatar.php:66
msgid "Unknown filetype"
-msgstr ""
+msgstr "نوع Ùایل ناشناخته"
#: private/avatar.php:71
msgid "Invalid image"
-msgstr ""
+msgstr "عکس نامعتبر"
#: private/defaults.php:35
msgid "web services under your control"
msgstr "سرویس های تØت وب در کنترل شما"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "دانلود به صورت Ùشرده غیر Ùعال است"
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Ùایل ها باید به صورت یکی یکی دانلود شوند"
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "بازگشت به Ùایل ها"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Ùایل های انتخاب شده بزرگتر از آن هستند Ú©Ù‡ بتوان یک Ùایل Ùشرده تولید کرد"
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -279,127 +279,138 @@ msgstr "یک نام کاربری برای مدیر تنظیم نمایید."
msgid "Set an admin password."
msgstr "یک رمزعبور برای مدیر تنظیم نمایید."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "اØتمالاً وب سرور شما طوری تنظیم نشده است Ú©Ù‡ اجازه ÛŒ همگام سازی Ùایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار اÙتاده است."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "لطÙاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s به اشتراک گذاشته شده است »%s« توسط شما"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "دسته بندی %s یاÙت نشد"
@@ -411,12 +422,12 @@ msgstr "ثانیه‌ها پیش"
#: private/template/functions.php:135
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n دقیقه قبل"
#: private/template/functions.php:136
msgid "%n hour ago"
msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n ساعت قبل"
#: private/template/functions.php:137
msgid "today"
@@ -429,7 +440,7 @@ msgstr "دیروز"
#: private/template/functions.php:140
msgid "%n day go"
msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n روز قبل"
#: private/template/functions.php:142
msgid "last month"
@@ -438,7 +449,7 @@ msgstr "ماه قبل"
#: private/template/functions.php:143
msgid "%n month ago"
msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n ماه قبل"
#: private/template/functions.php:145
msgid "last year"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 5599402145f5ad263e7f99bcf0274c8b6412f383..07089a7cf011bf9a86e86e3d7b55c19de10b4ef6 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -50,15 +50,15 @@ msgstr "ایمیل ارسال شد"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "رمزگذاری"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -101,6 +101,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "ایمیل ذخیره شد"
@@ -117,6 +127,16 @@ msgstr "Øذ٠گروه امکان پذیر نیست"
msgid "Unable to delete user"
msgstr "Øذ٠کاربر امکان پذیر نیست"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "زبان تغییر کرد"
@@ -172,7 +192,7 @@ msgstr "سیستم مدیریتی امکان تغییر رمز را پشتیبا
msgid "Unable to change password"
msgstr "نمی‌توان رمز را تغییر داد"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -228,34 +248,42 @@ msgstr "به روز رسانی"
msgid "Updated"
msgstr "بروز رسانی انجام شد"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "انتخاب تصویر پروÙایل"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
-msgstr ""
+msgstr "رمز عبور ضعیÙ"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
-msgstr ""
+msgstr "رمز عبور متوسط"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
-msgstr ""
+msgstr "رمز عبور خوب"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
-msgstr ""
+msgstr "رمز عبور قوی"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "در Øال بازگشایی رمز Ùایل‌ها... لطÙاً صبر نمایید. این امر ممکن است مدتی زمان ببرد."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "Øذ٠شده"
@@ -268,8 +296,8 @@ msgstr "بازگشت"
msgid "Unable to remove user"
msgstr "Øذ٠کاربر امکان پذیر نیست"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "گروه ها"
@@ -301,7 +329,7 @@ msgstr "رمز عبور صØÛŒØ Ø¨Ø§ÛŒØ¯ وارد شود"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "اخطار: پوشه‌ی خانه برای کاربر \"{user}\" در Øال Øاضر وجود دارد"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__language_name__"
@@ -369,7 +397,7 @@ msgid ""
"root."
msgstr "به اØتمال زیاد پوشه‌ی data Ùˆ Ùایل‌های شما از طریق اینترنت قابل دسترسی هستند. Ùایل .htaccess برنامه کار نمی‌کند. ما شدیداً توصیه Ù…ÛŒ کنیم Ú©Ù‡ شما وب سرور خودتان را طوری تنظیم کنید Ú©Ù‡ پوشه‌ی data شما غیر قابل دسترسی باشد یا اینکه پوشه‌‎ی data را به خارج از ریشه‌ی اصلی وب سرور انتقال دهید."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "هشدار راه اندازی"
@@ -384,53 +412,65 @@ msgstr "اØتمالاً وب سرور شما طوری تنظیم نشده اس
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "لطÙاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "ماژول 'fileinfo' از کار اÙتاده"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "ماژول 'fileinfo' PHP از کار اÙتاده است.ما اکیدا توصیه Ù…ÛŒ کنیم Ú©Ù‡ این ماژول را Ùعال کنید تا نتایج بهتری به وسیله ÛŒ mime-type detection دریاÙت کنید."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "زبان Ù…ØÙ„ÛŒ کار نمی کند."
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "اتصال اینترنت کار نمی کند"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -439,198 +479,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "این سرور ارتباط اینترنتی ندارد. این بدین معناست Ú©Ù‡ بعضی از امکانات نظیر مرتبط سازی یک منبع ذخیره‌ی خارجی، اطلاعات رسانی در مورد بروزرسانی‌ها یا نصب برنامه های جانبی کار نمی‌کنند. دسترسی به Ùایل ها از راه دور Ùˆ ارسال اطلاع رسانی توسط ایمیل ممکن است همچنان کار نکند. ما پیشنهاد می‌کنیم Ú©Ù‡ ارتباط اینترنتی مربوط به این سرور را Ùعال کنید تا تمامی امکانات را در اختیار داشته باشید."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "زمانبند"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "اجرای یک وظیÙÙ‡ با هر بار بارگذاری صÙØÙ‡"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php در یک سرویس webcron ثبت شده است Ú©Ù‡ هر 15 دقیقه یک بار بر روی بستر http Ùراخوانی شود."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "از سرویس کرون سرور استÙاده شده است Ú©Ù‡ Ùایل cron.php را هر 15 دقیقه یک بار Ùراخوانی کند."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "اشتراک گذاری"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Ùعال کردن API اشتراک گذاری"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "اجازه ÛŒ برنامه ها برای استÙاده از API اشتراک گذاری"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "اجازه ی لینک ها"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "اجازه بارگذاری عمومی"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "به کاربران اجازه داده شود Ú©Ù‡ امکان بارگذاری در پوشه هایی Ú©Ù‡ بصورت عمومی به اشتراک گذاشته اند را برای سایرین Ùعال سازند"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها"
-#: templates/admin.php:235
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "مجوز اشتراک گذاری مجدد"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "اجازه به کاربران برای اشتراک گذاری دوباره با آنها"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "اجازه به کابران برای اشتراک گذاری با همه"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "اجازه به کاربران برای اشتراک گذاری ، تنها با دیگر کابران گروه خودشان"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "مجاز نمودن اطلاع رسانی توسط ایمیل"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "امنیت"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "وادار کردن HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "کلاینت‌ها را مجبور Ú©Ù† Ú©Ù‡ از یک ارتباط رمزنگاری شده برای اتصال به %s استÙاده کنند."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "برای Ùعال سازی یا عدم Ùعال سازی اجبار استÙاده از SSLØŒ لطÙاً از طریق HTTPS به %s وصل شوید."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "آدرس سرور"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "درگاه"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "اعتبارهای"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "کارنامه"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Ø³Ø·Ø ÙˆØ±ÙˆØ¯"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "بیش‌تر"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "کم‌تر"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "نسخه"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -783,29 +831,33 @@ msgstr "زبان"
msgid "Help translate"
msgstr "به ترجمه آن کمک کنید"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "از این آدرس استÙاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به Ùایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "رمز ورود"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "تمام Ùایلها رمزگشایی شود"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "نام کاربری"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index c72973ce0b224d309d798acd1c24233d8a054f67..eeceb60b119c8baaea855c99d94275b57db1af50 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr ""
msgid "Keep settings?"
msgstr "آیا تنظیمات ذخیره شود ؟"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "نمی توان پیکربندی سرور را اضاÙÙ‡ نمود"
@@ -87,6 +91,18 @@ msgstr "موÙقیت"
msgid "Error"
msgstr "خطا"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -127,26 +143,42 @@ msgstr "آیا واقعا می خواهید پیکربندی کنونی سرور
msgid "Confirm Deletion"
msgstr "تایید ØØ°Ù"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Ùیلتر گروه"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "ذخیره"
@@ -219,10 +251,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "اÙزودن پیکربندی سرور"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "میزبانی"
@@ -284,8 +329,16 @@ msgstr "بازگشت"
#: templates/part.wizardcontrols.php:8
msgid "Continue"
+msgstr "ادامه"
+
+#: templates/settings.php:7
+msgid "Expert"
msgstr ""
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "پیشرÙته"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 277f6de7866ebdc87664656a8decd2bb51c92097..254c0b6a45990a53aa0f69ccee162a6d9ca4eba4 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 06:21+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"
@@ -20,11 +20,11 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "Päättymispäivä on menneisyydessä."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s"
@@ -41,6 +41,11 @@ msgstr "Ylläpitotila laitettu pois päältä"
msgid "Updated database"
msgstr "Tietokanta ajan tasalla"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr "Yhteensopimattomat sovellukset poistettiin käytöstä: %s"
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Kuvaa tai tiedostoa ei määritelty"
@@ -61,207 +66,207 @@ msgstr "Väliaikaista profiilikuvaa ei ole käytettävissä, yritä uudelleen"
msgid "No crop data provided"
msgstr "Puutteellinen tieto"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "sunnuntai"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "maanantai"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "tiistai"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "keskiviikko"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "torstai"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "perjantai"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "lauantai"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "tammikuu"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "helmikuu"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "maaliskuu"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "huhtikuu"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "toukokuu"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "kesäkuu"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "heinäkuu"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "elokuu"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "syyskuu"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "lokakuu"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "marraskuu"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "joulukuu"
-#: js/js.js:483
+#: js/js.js:496
msgid "Settings"
msgstr "Asetukset"
-#: js/js.js:583
+#: js/js.js:596
msgid "Saving..."
msgstr "Tallennetaan..."
-#: js/js.js:1240
+#: js/js.js:1220
msgid "seconds ago"
msgstr "sekuntia sitten"
-#: js/js.js:1241
+#: js/js.js:1221
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuutti sitten"
msgstr[1] "%n minuuttia sitten"
-#: js/js.js:1242
+#: js/js.js:1222
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n tunti sitten"
msgstr[1] "%n tuntia sitten"
-#: js/js.js:1243
+#: js/js.js:1223
msgid "today"
msgstr "tänään"
-#: js/js.js:1244
+#: js/js.js:1224
msgid "yesterday"
msgstr "eilen"
-#: js/js.js:1245
+#: js/js.js:1225
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n päivä sitten"
msgstr[1] "%n päivää sitten"
-#: js/js.js:1246
+#: js/js.js:1226
msgid "last month"
msgstr "viime kuussa"
-#: js/js.js:1247
+#: js/js.js:1227
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n kuukausi sitten"
msgstr[1] "%n kuukautta sitten"
-#: js/js.js:1248
+#: js/js.js:1228
msgid "last year"
msgstr "viime vuonna"
-#: js/js.js:1249
+#: js/js.js:1229
msgid "years ago"
msgstr "vuotta sitten"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Valitse"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Virhe ladatessa tiedostopohjia: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Kyllä"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ei"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Valitse"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Virhe ladatessa tiedostopohjia: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Virhe ladatessa viestipohjaa: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} tiedoston ristiriita"
msgstr[1] "{count} tiedoston ristiriita"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Yhden tiedoston ristiriita"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Uudet tiedostot"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Jo olemassa olevat tiedostot"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Mitkä tiedostot haluat säilyttää?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Jos valitset kummatkin versiot, kopioidun tiedoston nimeen lisätään numero."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Peru"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Jatka"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(kaikki valittu)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} valittu)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Virhe ladatessa mallipohjaa"
@@ -285,148 +290,157 @@ msgstr "Hyvä salasana"
msgid "Strong password"
msgstr "Vahva salasana"
-#: js/share.js:51 js/share.js:66 js/share.js:106
+#: js/share.js:69 js/share.js:84 js/share.js:127
msgid "Shared"
msgstr "Jaettu"
-#: js/share.js:109
+#: js/share.js:130
msgid "Share"
msgstr "Jaa"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:195 js/share.js:208 js/share.js:215 js/share.js:822
#: templates/installation.php:10
msgid "Error"
msgstr "Virhe"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:197 js/share.js:885
msgid "Error while sharing"
msgstr "Virhe jaettaessa"
-#: js/share.js:171
+#: js/share.js:208
msgid "Error while unsharing"
msgstr "Virhe jakoa peruttaessa"
-#: js/share.js:178
+#: js/share.js:215
msgid "Error while changing permissions"
msgstr "Virhe oikeuksia muuttaessa"
-#: js/share.js:188
+#: js/share.js:225
msgid "Shared with you and the group {group} by {owner}"
msgstr "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta"
-#: js/share.js:190
+#: js/share.js:227
msgid "Shared with you by {owner}"
msgstr "Jaettu kanssasi käyttäjän {owner} toimesta"
-#: js/share.js:214
+#: js/share.js:251
msgid "Share with user or group …"
msgstr "Jaa käyttäjän tai ryhmän kanssa…"
-#: js/share.js:220
+#: js/share.js:257
msgid "Share link"
msgstr "Jaa linkki"
-#: js/share.js:223
+#: js/share.js:263
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta"
+
+#: js/share.js:265
+msgid "By default the public link will expire after {days} days"
+msgstr "Oletuksena julkinen linkki vanhenee {days} päivässä"
+
+#: js/share.js:270
msgid "Password protect"
msgstr "Suojaa salasanalla"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Salasana"
+#: js/share.js:272
+msgid "Choose a password for the public link"
+msgstr "Valitse salasana julkiselle linkille"
-#: js/share.js:230
+#: js/share.js:278
msgid "Allow Public Upload"
msgstr "Salli julkinen lähetys"
-#: js/share.js:234
+#: js/share.js:282
msgid "Email link to person"
msgstr "Lähetä linkki sähköpostitse"
-#: js/share.js:235
+#: js/share.js:283
msgid "Send"
msgstr "Lähetä"
-#: js/share.js:240
+#: js/share.js:288
msgid "Set expiration date"
msgstr "Aseta päättymispäivä"
-#: js/share.js:241
+#: js/share.js:289
msgid "Expiration date"
msgstr "Päättymispäivä"
-#: js/share.js:277
+#: js/share.js:326
msgid "Share via email:"
msgstr "Jaa sähköpostilla:"
-#: js/share.js:280
+#: js/share.js:329
msgid "No people found"
msgstr "Henkilöitä ei löytynyt"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:377 js/share.js:438
msgid "group"
msgstr "ryhmä"
-#: js/share.js:357
+#: js/share.js:410
msgid "Resharing is not allowed"
msgstr "Jakaminen uudelleen ei ole salittu"
-#: js/share.js:401
+#: js/share.js:454
msgid "Shared in {item} with {user}"
msgstr "{item} on jaettu {user} kanssa"
-#: js/share.js:423
+#: js/share.js:476
msgid "Unshare"
msgstr "Peru jakaminen"
-#: js/share.js:431
+#: js/share.js:484
msgid "notify by email"
msgstr "ilmoita sähköpostitse"
-#: js/share.js:434
+#: js/share.js:487
msgid "can edit"
msgstr "voi muokata"
-#: js/share.js:436
+#: js/share.js:489
msgid "access control"
msgstr "Pääsyn hallinta"
-#: js/share.js:439
+#: js/share.js:492
msgid "create"
msgstr "luo"
-#: js/share.js:442
+#: js/share.js:495
msgid "update"
msgstr "päivitä"
-#: js/share.js:445
+#: js/share.js:498
msgid "delete"
msgstr "poista"
-#: js/share.js:448
+#: js/share.js:501
msgid "share"
msgstr "jaa"
-#: js/share.js:721
+#: js/share.js:803
msgid "Password protected"
msgstr "Salasanasuojattu"
-#: js/share.js:734
+#: js/share.js:822
msgid "Error unsetting expiration date"
msgstr "Virhe purettaessa eräpäivää"
-#: js/share.js:752
+#: js/share.js:843
msgid "Error setting expiration date"
msgstr "Virhe päättymispäivää asettaessa"
-#: js/share.js:777
+#: js/share.js:872
msgid "Sending ..."
msgstr "Lähetetään..."
-#: js/share.js:788
+#: js/share.js:883
msgid "Email sent"
msgstr "Sähköposti lähetetty"
-#: js/share.js:812
+#: js/share.js:907
msgid "Warning"
msgstr "Varoitus"
@@ -458,18 +472,19 @@ msgstr "Virhe ladatessa keskustelupohja: {error}"
msgid "No tags selected for deletion."
msgstr "Tunnisteita ei valittu poistettavaksi."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken."
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Päivitä sivu."
-#: 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 "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-yhteisölle</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr "Päivitys epäonnistui."
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi."
@@ -670,6 +685,10 @@ msgstr "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a
msgid "Create an <strong>admin account</strong>"
msgstr "Luo <strong>ylläpitäjän tunnus</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Salasana"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Tallennus ja tietokanta"
@@ -795,8 +814,27 @@ msgstr "Kiitos kärsivällisyydestäsi."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Päivitetään ownCloud versioon %s, tämä saattaa kestää hetken."
+msgid "%s will be updated to version %s."
+msgstr "%s päivitetään versioon %s."
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr "Seuraavat sovellukset poistetaan käytöstä:"
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr "Teema %s on poistettu käytöstä."
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr "Varmista ennen jatkamista, että tietokanta, asetuskansio ja datakansio on varmuuskopioitu."
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr "Käynnistä päivitys"
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 8ab13ecaa1a6b19cc02cc05b964f2aa81ecde3ae..fe979d4060dc87550603ca643a9f7f2d72878217 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 10:04+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"
@@ -31,7 +31,7 @@ msgstr "Kohteen %s siirto ei onnistunut - Tiedosto samalla nimellä on jo olemas
msgid "Could not move %s"
msgstr "Kohteen %s siirto ei onnistunut"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Tiedoston nimi ei voi olla tyhjä."
@@ -40,18 +40,18 @@ msgstr "Tiedoston nimi ei voi olla tyhjä."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" on virheellinen tiedostonimi."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "Kohdekansio on siirretty tai poistettu."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -127,44 +127,48 @@ msgstr "Tilapäiskansio puuttuu"
msgid "Failed to write to disk"
msgstr "Levylle kirjoitus epäonnistui"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Tallennustilaa ei ole riittävästi käytettävissä"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty."
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Virheellinen kansio."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Tiedostot"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Kaikki tiedostot"
+
+#: js/file-upload.js:257
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:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "Yhteiskoko {size1} ylittää lähetysrajan {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Lähetys peruttu."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Tuloksien saaminen palvelimelta ei onnistunut."
@@ -177,120 +181,120 @@ msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedos
msgid "URL cannot be empty"
msgstr "Osoite ei voi olla tyhjä"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} on jo olemassa"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Tiedoston luominen epäonnistui"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Kansion luominen epäonnistui"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Virhe noutaessa verkko-osoitetta"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Jaa"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Poista pysyvästi"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Nimeä uudelleen"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Odottaa"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr "Virhe tiedostoa siirrettäessä."
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Virhe tiedostoa siirrettäessä"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Virhe"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Tiedoston nimeäminen uudelleen epäonnistui"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Virhe tiedostoa poistaessa."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Nimi"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Koko"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Muokattu"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n kansio"
msgstr[1] "%n kansiota"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n tiedosto"
msgstr[1] "%n tiedostoa"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Lähetetään %n tiedosto"
msgstr[1] "Lähetetään %n tiedostoa"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" on virheellinen tiedostonimi."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Tallennustila on melkein loppu ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen."
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Salaussovelluksen salausavain on virheellinen. Ole hyvä ja päivitä salausavain henkilökohtaisissa asetuksissasi jotta voit taas avata salatuskirjoitetut tiedostosi."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -300,12 +304,12 @@ msgstr "Salaus poistettiin käytöstä, mutta tiedostosi ovat edelleen salattuin
msgid "{dirs} and {files}"
msgstr "{dirs} ja {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "kohteen %s nimeäminen uudelleen epäonnistui"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Lähetys (enintään %s)"
@@ -342,68 +346,75 @@ msgstr "ZIP-tiedostojen enimmäiskoko"
msgid "Save"
msgstr "Tallenna"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\">käyttääksesi tiedostojasi WebDAVin kautta</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Uusi"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Uusi tekstitiedosto"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Tekstitiedosto"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Uusi kansio"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Kansio"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Linkistä"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Poistetut tiedostot"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Peru lähetys"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Käyttöoikeutesi eivät riitä tiedostojen lähettämiseen tai kansioiden luomiseen tähän sijaintiin"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Täällä ei ole mitään. Lähetä tänne jotakin!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Lataa"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Poista"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Lähetettävä tiedosto on liian suuri"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Tiedostoja tarkistetaan, odota hetki."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Tämänhetkinen tutkinta"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr "Tutkitaan parhaillaan"
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index c9a41514ac4ace2f3f26eea984314f12b34c27c8..d3f114f8c9a8be99c8b0006d89274e451f3ce689 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.po
@@ -4,15 +4,15 @@
#
# Translators:
# muro <janne.morsky@metropolia.fi>, 2013
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013-2014
# nahka <nahkaz@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:13+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"
@@ -79,9 +79,9 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr ""
+msgstr "Tuntematon virhe. Tarkista järjestelmän asetukset tai ole yhteydessä ylläpitäjään."
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -94,17 +94,17 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Seuraavat käyttäjät eivät ole määrittäneet salausta:"
#: js/detect-migration.js:21
msgid "Initial encryption started... This can take some time. Please wait."
-msgstr ""
+msgstr "Ensimmäinen salauskerta käynnistetty... Tämä saattaa kestää hetken."
#: js/detect-migration.js:25
msgid "Initial encryption running... Please try again later."
-msgstr ""
+msgstr "Ensimmäinen salauskerta on meneillään... Yritä myöhemmin uudelleen."
#: templates/invalid_private_key.php:8
msgid "Go directly to your "
@@ -114,91 +114,91 @@ msgstr ""
msgid "personal settings"
msgstr "henkilökohtaiset asetukset"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Salaus"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Palautusavaimen salasana"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Käytössä"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Ei käytössä"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Vaihda palautusavaimen salasana:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Vanha palautusavaimen salasana"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Uusi palautusavaimen salasana"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Vaihda salasana"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Yksityisen avaimesi salasana ei enää täsmää kirjautumisen salasanaasi:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
-msgstr ""
+msgstr "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Vanha kirjautumis-salasana"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Nykyinen kirjautumis-salasana"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
-msgstr ""
+msgstr "Päivitä yksityisen avaimen salasana"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Ota salasanan palautus käyttöön:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
-msgstr ""
+msgstr "Tiedostopalautuksen asetukset päivitetty"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index a46743cda1587e6dd170c10db388569db3834bb6..67f1b9fe779ec21c99351a2b9c7612ebfdd1322c 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:21+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"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "Verkko-osoite"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Isäntä"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,9 +166,13 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "Verkko-osoite"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
-msgstr ""
+msgstr "Salattu https://"
#: appinfo/app.php:144
msgid "Remote subfolder"
@@ -198,29 +202,29 @@ msgstr "Virhe Google Drive levyn asetuksia tehtäessä"
msgid "Saved"
msgstr "Tallennettu"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr "<b>Huomio:</b> "
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr "ja"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön."
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Huomio:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön."
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index 0e5f159e745ced674402147948203b2a09cefdd3..4a54371a227e8491122a5898f765aaf16e30f19c 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Jakanut {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Tämä jako on suojattu salasanalla"
@@ -34,6 +58,14 @@ msgstr "Väärä salasana. Yritä uudelleen."
msgid "Password"
msgstr "Salasana"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Valitettavasti linkki ei vaikuta enää toimivan."
@@ -62,11 +94,11 @@ msgstr "Kysy lisätietoja henkilöltä, jolta sait linkin."
msgid "Download"
msgstr "Lataa"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Lataa %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Suora linkki"
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index acc0233212b5d24981ebdd55aec3a9fce84104ac..cbb0cb8f8eb925be4a8b27b271baee30a664646c 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "Kohdetta %s ei voitu poistaa pysyvästi"
msgid "Couldn't restore %s"
msgstr "Kohteen %s palautus epäonnistui"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Poistetut tiedostot"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Palauta"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Virhe"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Poistetut tiedostot"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "palautettu"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Tyhjää täynnä! Roskakorissa ei ole mitään."
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nimi"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Palauta"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Poistettu"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Poista"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 7bb2dd601ac63f882a2c6c8d5c846f5faaf7b5c5..f05dda6a8f1bc4ebc7a15534dccaf699ddf7450c 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 07:20+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -18,11 +18,11 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:712
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:713
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -77,23 +77,23 @@ msgstr "Virheellinen kuva"
msgid "web services under your control"
msgstr "verkkopalvelut hallinnassasi"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP-lataus on poistettu käytöstä."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Tiedostot on ladattava yksittäin."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Takaisin tiedostoihin"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -290,116 +290,127 @@ msgstr "Web-palvelimen asetukset eivät ole kelvolliset tiedostojen synkronointi
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s jakoi kohteen »%s« kanssasi"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr "Kohteen %s jakaminen epäonnistui, koska tiedostoa ei ole olemassa"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s on kohteen omistaja"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "Kohteen %s jakaminen epäonnistui, koska käyttäjää %s ei ole olemassa"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjän %s kanssa"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "Kohteen %s jakaminen epäonnistui, koska ryhmää %s ei ole olemassa"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s ei ole ryhmän %s jäsen"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "Kohteen %s jakaminen epäonnistui, koska jakaminen linkkejä käyttäen ei ole sallittu"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "Kohteen %s oikeuksien asettaminen epäonnistui, koska kohdetta ei löytynyt"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s on alkuperäinen jakaja"
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr "Kohteen %s jakaminen epäonnistui, koska jakaminen uudelleen ei ole sallittu"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr "Kohteen %s jakaminen epäonnistui, koska tiedostoa ei löytynyt tiedostovälimuistista"
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Luokkaa \"%s\" ei löytynyt"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index df0802f9aae69e183a15426103c16622b19a2f2c..110f8f8ac7cf19fdd15bb95a5e9d96c5260e9bfe 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 09:59+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -48,15 +48,15 @@ msgstr "Sähköposti lähetetty"
msgid "You need to set your user email before being able to send test emails."
msgstr "Aseta sähköpostiosoite, jotta voit testata sähköpostin toimivuutta."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Lähetystila"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Salaus"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Tunnistautumistapa"
@@ -99,6 +99,16 @@ msgstr "Tiedostojen salauksen purkaminen epäonnistui. Tarkista owncloud.log-tie
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yritä uudelleen"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Salausavaimet poistettiin pysyvästi"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Sähköposti tallennettu"
@@ -115,6 +125,16 @@ msgstr "Ryhmän poisto epäonnistui"
msgid "Unable to delete user"
msgstr "Käyttäjän poisto epäonnistui"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Varmuuskopiot palautettiin onnistuneesti"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Kieli on vaihdettu"
@@ -170,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr "Salasanan vaihto ei onnistunut"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Lähetetään..."
@@ -226,34 +246,42 @@ msgstr "Päivitä"
msgid "Updated"
msgstr "Päivitetty"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Valitse profiilikuva"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Erittäin heikko salasana"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Heikko salasana"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Kohtalainen salasana"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Hyvä salasana"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Vahva salasana"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Poista salausavaimet pysyvästi."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Palauta salausavaimet."
+
#: js/users.js:47
msgid "deleted"
msgstr "poistettu"
@@ -266,8 +294,8 @@ msgstr "kumoa"
msgid "Unable to remove user"
msgstr "Käyttäjän poistaminen ei onnistunut"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Ryhmät"
@@ -299,7 +327,7 @@ msgstr "Anna kelvollinen salasana"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Varoitus: käyttäjällä \"{user}\" on jo olemassa kotikansio"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "_kielen_nimi_"
@@ -367,7 +395,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Asetusvaroitus"
@@ -382,53 +410,65 @@ msgstr "Web-palvelimen asetukset eivät ole kelvolliset tiedostojen synkronointi
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "Lue <a href=\"%s\">asennusohjeet</a> tarkasti."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Moduuli 'fileinfo' puuttuu"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "PHP-moduuli \"fileinfo\" puuttuu. Sen käyttö on erittäin suositeltavaa, jotta MIME-tyypin havaitseminen onnistuu parhaalla mahdollisella tavalla."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Käytössä oleva PHP-versio on vanhentunut"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Käytössä oleva PHP on vanhentunut. Päivitä versioon 5.3.8 tai uudempaan, koska aiemmat versiot eivät ole toimivia. On mahdollista, että tämä ownCloud-asennus ei toimi kunnolla."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Maa-asetus ei toimi"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Järjestelmän maa-asetusta ei voi asettaa UTF-8:aa tukevaksi."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Tämä tarkoittaa, että tiettyjen merkkien kanssa tiedostojen nimissä saattaa olla ongelmia."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Suosittelemme vahvasti asentamaan vaaditut paketit järjestelmään, jotta jotain seuraavista maa-asetuksista on mahdollista tukea: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Internet-yhteys ei toimi"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -437,198 +477,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "Viimeisin cron suoritettiin %s."
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "Viimeisin cron suoritettiin %s. Siitä on yli tunti aikaa, joten jokin näyttää olevan pielessä."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "Cronia ei suoritettu vielä!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumiseen 15 minuutin välein"
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Jakaminen"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Käytä jakamisen ohjelmointirajapintaa"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Salli linkit"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Salli käyttäjien jakaa kohteita käyttäen linkkejä"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Salli julkiset lähetykset"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "Aseta oletusvanhenemispäivä"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Vanhenna"
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "päivän jälkeen"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Pakota vanhenemispäivä"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Salli käyttäjien jakaa kohteita käyttäen linkkejä"
-#: templates/admin.php:235
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Salli uudelleenjakaminen"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Mahdollistaa käyttäjien jakavan uudelleen heidän kanssaan jaettuja kohteita"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Salli käyttäjien jakaa kenen tahansa kanssa"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Salli jakaminen vain samoissa ryhmissä olevien käyttäjien kesken"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Salli sähköposti-ilmoitukset"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Salli käyttäjien lähettää sähköposti-ilmoituksia jaetuista tiedostoista"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr "Aseta oletusvanhenemispäivä"
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Vanhenna"
-
-#: templates/admin.php:266
-msgid "days"
-msgstr "päivän jälkeen"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr "Kiellä ryhmiä jakamasta"
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr "Pakota vanhenemispäivä"
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Vanhenna jaot oletuksena N päivän jälkeen"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Nämä ryhmät kykenevät vastaanottamaan jakoja, mutta eivät kuitenkaan itse pysty luoda jakoja."
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Tietoturva"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Pakota HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Yhdistä %siin HTTPS-yhteydellä ottaaksesi käyttöön tai poistaaksesi käytöstä SSL-pakotteen."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Sähköpostipalvelin"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "Tätä käytetään ilmoitusten lähettämiseen."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Lähettäjän osoite"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Tunnistautuminen vaaditaan"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Palvelimen osoite"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Portti"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Tilitiedot"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "SMTP-käyttäjätunnus"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "SMTP-salasana"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Testaa sähköpostiasetukset"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Lähetä sähköpostiviesti"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Loki"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Lokitaso"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Enemmän"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Vähemmän"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versio"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +829,33 @@ msgstr "Kieli"
msgid "Help translate"
msgstr "Auta kääntämisessä"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\">käyttääksesi tiedostojasi WebDAVin kautta</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Kirjautumissalasana"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Pura kaikkien tiedostojen salaus"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Palauta salausavaimet"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Poista salausavaimet"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Kirjautumisnimi"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index fc226db095549a9d8fb17ab04d0db529be909410..c9b39c1bbb5882129426fc9db369f04145d267db 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 09:59+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:12+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,11 +24,11 @@ msgstr ""
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Palvelinmäärityksen poistaminen epäonnistui"
#: ajax/testConfiguration.php:39
msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Määritys on kelvollinen ja yhteys kyettiin muodostamaan!"
#: ajax/testConfiguration.php:42
msgid ""
@@ -70,6 +71,10 @@ msgstr ""
msgid "Keep settings?"
msgstr "Säilytetäänkö asetukset?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Palvelinasetusten lisäys epäonnistui"
@@ -86,17 +91,29 @@ msgstr "Onnistui!"
msgid "Error"
msgstr "Virhe"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Määritä portti"
+
#: js/settings.js:780
msgid "Configuration OK"
-msgstr ""
+msgstr "Määritykset OK"
#: js/settings.js:789
msgid "Configuration incorrect"
-msgstr ""
+msgstr "Määritykset väärin"
#: js/settings.js:798
msgid "Configuration incomplete"
-msgstr ""
+msgstr "Määritykset puutteelliset"
#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
@@ -120,41 +137,57 @@ msgstr "Yhteystesti epäonnistui"
#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Haluatko varmasti poistaa nykyisen palvelinmäärityksen?"
#: js/settings.js:865
msgid "Confirm Deletion"
msgstr "Vahvista poisto"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s ryhmä löytynyt"
+msgstr[1] "%s ryhmää löytynyt"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s käyttäjä löytynyt"
+msgstr[1] "%s käyttäjää löytynyt"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr "Palvelin"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Ryhmien suodatus"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Tallenna"
#: templates/part.settingcontrols.php:4
msgid "Test Configuration"
-msgstr ""
+msgstr "Testaa määritys"
#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
msgid "Help"
@@ -195,7 +228,7 @@ msgstr ""
#: templates/part.wizard-groupfilter.php:38
msgid "groups found"
-msgstr ""
+msgstr "ryhmää löytynyt"
#: templates/part.wizard-loginfilter.php:4
msgid "Users login with this attribute:"
@@ -203,11 +236,11 @@ msgstr ""
#: templates/part.wizard-loginfilter.php:8
msgid "LDAP Username:"
-msgstr ""
+msgstr "LDAP-käyttäjätunnus:"
#: templates/part.wizard-loginfilter.php:16
msgid "LDAP Email Address:"
-msgstr ""
+msgstr "LDAP-sähköpostiosoite:"
#: templates/part.wizard-loginfilter.php:24
msgid "Other Attributes:"
@@ -220,9 +253,22 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Palvelin"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Palvelin:"
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
-msgstr ""
+msgstr "Lisää palvelinmääritys"
+
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Poista määritys"
#: templates/part.wizard-server.php:30
msgid "Host"
@@ -277,7 +323,7 @@ msgstr ""
#: templates/part.wizard-userfilter.php:38
msgid "users found"
-msgstr ""
+msgstr "käyttäjää löytynyt"
#: templates/part.wizardcontrols.php:5
msgid "Back"
@@ -287,6 +333,14 @@ msgstr "Takaisin"
msgid "Continue"
msgstr "Jatka"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Lisäasetukset"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
@@ -324,7 +378,7 @@ msgstr ""
#: templates/settings.php:24
msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Varmuuskopioinnin (replikoinnin) portti"
#: templates/settings.php:25
msgid "Disable Main Server"
@@ -332,11 +386,11 @@ msgstr "Poista pääpalvelin käytöstä"
#: templates/settings.php:25
msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Yhdistä vain replikointipalvelimeen."
#: templates/settings.php:26
msgid "Case insensitive LDAP server (Windows)"
-msgstr ""
+msgstr "Kirjainkoosta piittamaton LDAP-palvelin (Windows)"
#: templates/settings.php:27
msgid "Turn off SSL certificate validation."
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index ff8ddd4492c66680476746349febd991498dde96..129a5986da32b710341724f6181e5524145e133c 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -6,8 +6,9 @@
# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
# Christophe Lherieau <skimpax@gmail.com>, 2013-2014
# etiess <etiess@gmail.com>, 2013
+# Gauth <gauthier@openux.org>, 2014
# msoko <sokolovitch@yahoo.com>, 2013
-# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
+# ogre_sympathique, 2013-2014
# plachance <patlachance@gmail.com>, 2013
# red0ne <red-0ne@smarty-concept.com>, 2013
# RyDroid <rydroid_trans@yahoo.fr>, 2013
@@ -15,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 08:51+0000\n"
+"Last-Translator: ogre_sympathique\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"
@@ -25,11 +26,11 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "La date d'expiration est dans le passé."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Impossible d'envoyer un mail aux utilisateurs suivant : %s"
@@ -46,6 +47,11 @@ msgstr "Basculé en mode production (non maintenance)"
msgid "Updated database"
msgstr "Base de données mise à jour"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr "Applications incompatibles désactivées: %s"
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Aucune image ou fichier fourni"
@@ -66,207 +72,207 @@ msgstr "Aucune image temporaire disponible pour le profil. Essayez à nouveau."
msgid "No crop data provided"
msgstr "Aucune donnée de culture fournie"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Dimanche"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Lundi"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Mardi"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mercredi"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Jeudi"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Vendredi"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Samedi"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "janvier"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "février"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "mars"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "avril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "juin"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "juillet"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "août"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "septembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "octobre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "novembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "décembre"
-#: js/js.js:483
+#: js/js.js:496
msgid "Settings"
msgstr "Paramètres"
-#: js/js.js:583
+#: js/js.js:596
msgid "Saving..."
msgstr "Enregistrement..."
-#: js/js.js:1240
+#: js/js.js:1220
msgid "seconds ago"
msgstr "il y a quelques secondes"
-#: js/js.js:1241
+#: js/js.js:1221
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "il y a %n minute"
msgstr[1] "il y a %n minutes"
-#: js/js.js:1242
+#: js/js.js:1222
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Il y a %n heure"
msgstr[1] "Il y a %n heures"
-#: js/js.js:1243
+#: js/js.js:1223
msgid "today"
msgstr "aujourd'hui"
-#: js/js.js:1244
+#: js/js.js:1224
msgid "yesterday"
msgstr "hier"
-#: js/js.js:1245
+#: js/js.js:1225
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "il y a %n jour"
msgstr[1] "il y a %n jours"
-#: js/js.js:1246
+#: js/js.js:1226
msgid "last month"
msgstr "le mois dernier"
-#: js/js.js:1247
+#: js/js.js:1227
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Il y a %n mois"
msgstr[1] "Il y a %n mois"
-#: js/js.js:1248
+#: js/js.js:1228
msgid "last year"
msgstr "l'année dernière"
-#: js/js.js:1249
+#: js/js.js:1229
msgid "years ago"
msgstr "il y a plusieurs années"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Choisir"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Erreur de chargement du modèle de sélectionneur de fichiers : {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Oui"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Choisir"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Erreur de chargement du modèle de sélectionneur de fichiers : {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Erreur de chargement du modèle de message : {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
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:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Un conflit de fichier"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nouveaux fichiers"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Fichiers déjà existants"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Quels fichiers désirez-vous garder ?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
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:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Annuler"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Poursuivre"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(tous sélectionnés)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} sélectionnés)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Erreur de chargement du modèle de fichier existant"
@@ -290,148 +296,157 @@ msgstr "Mot de passe de sécurité suffisante"
msgid "Strong password"
msgstr "Mot de passe de forte sécurité"
-#: js/share.js:51 js/share.js:66 js/share.js:106
+#: js/share.js:69 js/share.js:84 js/share.js:127
msgid "Shared"
msgstr "Partagé"
-#: js/share.js:109
+#: js/share.js:130
msgid "Share"
msgstr "Partager"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:195 js/share.js:208 js/share.js:215 js/share.js:822
#: templates/installation.php:10
msgid "Error"
msgstr "Erreur"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:197 js/share.js:885
msgid "Error while sharing"
msgstr "Erreur lors de la mise en partage"
-#: js/share.js:171
+#: js/share.js:208
msgid "Error while unsharing"
msgstr "Erreur lors de l'annulation du partage"
-#: js/share.js:178
+#: js/share.js:215
msgid "Error while changing permissions"
msgstr "Erreur lors du changement des permissions"
-#: js/share.js:188
+#: js/share.js:225
msgid "Shared with you and the group {group} by {owner}"
msgstr "Partagé par {owner} avec vous et le groupe {group}"
-#: js/share.js:190
+#: js/share.js:227
msgid "Shared with you by {owner}"
msgstr "Partagé avec vous par {owner}"
-#: js/share.js:214
+#: js/share.js:251
msgid "Share with user or group …"
msgstr "Partager avec un utilisateur ou un groupe..."
-#: js/share.js:220
+#: js/share.js:257
msgid "Share link"
msgstr "Partager le lien"
-#: js/share.js:223
+#: js/share.js:263
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Ce lien public expirera au plus tard, dans {days} jours après sa création."
+
+#: js/share.js:265
+msgid "By default the public link will expire after {days} days"
+msgstr "Par défaut, le lien public expire après {days} jour(s)."
+
+#: js/share.js:270
msgid "Password protect"
msgstr "Protéger par un mot de passe"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Mot de passe"
+#: js/share.js:272
+msgid "Choose a password for the public link"
+msgstr "Choisissez un mot de passe pour le lien public."
-#: js/share.js:230
+#: js/share.js:278
msgid "Allow Public Upload"
msgstr "Autoriser l'upload par les utilisateurs non enregistrés"
-#: js/share.js:234
+#: js/share.js:282
msgid "Email link to person"
msgstr "Envoyez le lien par email"
-#: js/share.js:235
+#: js/share.js:283
msgid "Send"
msgstr "Envoyer"
-#: js/share.js:240
+#: js/share.js:288
msgid "Set expiration date"
msgstr "Spécifier la date d'expiration"
-#: js/share.js:241
+#: js/share.js:289
msgid "Expiration date"
msgstr "Date d'expiration"
-#: js/share.js:277
+#: js/share.js:326
msgid "Share via email:"
msgstr "Partager via e-mail :"
-#: js/share.js:280
+#: js/share.js:329
msgid "No people found"
msgstr "Aucun utilisateur trouvé"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:377 js/share.js:438
msgid "group"
msgstr "groupe"
-#: js/share.js:357
+#: js/share.js:410
msgid "Resharing is not allowed"
msgstr "Le repartage n'est pas autorisé"
-#: js/share.js:401
+#: js/share.js:454
msgid "Shared in {item} with {user}"
msgstr "Partagé dans {item} avec {user}"
-#: js/share.js:423
+#: js/share.js:476
msgid "Unshare"
msgstr "Ne plus partager"
-#: js/share.js:431
+#: js/share.js:484
msgid "notify by email"
msgstr "Notifier par email"
-#: js/share.js:434
+#: js/share.js:487
msgid "can edit"
msgstr "édition autorisée"
-#: js/share.js:436
+#: js/share.js:489
msgid "access control"
msgstr "contrôle des accès"
-#: js/share.js:439
+#: js/share.js:492
msgid "create"
msgstr "créer"
-#: js/share.js:442
+#: js/share.js:495
msgid "update"
msgstr "mettre à jour"
-#: js/share.js:445
+#: js/share.js:498
msgid "delete"
msgstr "supprimer"
-#: js/share.js:448
+#: js/share.js:501
msgid "share"
msgstr "partager"
-#: js/share.js:721
+#: js/share.js:803
msgid "Password protected"
msgstr "Protégé par un mot de passe"
-#: js/share.js:734
+#: js/share.js:822
msgid "Error unsetting expiration date"
msgstr "Une erreur est survenue pendant la suppression de la date d'expiration"
-#: js/share.js:752
+#: js/share.js:843
msgid "Error setting expiration date"
msgstr "Erreur lors de la spécification de la date d'expiration"
-#: js/share.js:777
+#: js/share.js:872
msgid "Sending ..."
msgstr "En cours d'envoi ..."
-#: js/share.js:788
+#: js/share.js:883
msgid "Email sent"
msgstr "Email envoyé"
-#: js/share.js:812
+#: js/share.js:907
msgid "Warning"
msgstr "Attention"
@@ -463,18 +478,19 @@ msgstr "Erreur de chargement du modèle de dialogue : {error}"
msgid "No tags selected for deletion."
msgstr "Aucune balise sélectionnée pour la suppression."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr "Mise à jour en cours de {productName} vers la version {version}, cela peut prendre du temps."
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Veuillez recharger la page."
-#: 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 "La mise à jour a échoué. Veuillez signaler ce problème à la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communauté ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr "La mise à jour a échoué."
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud."
@@ -675,6 +691,10 @@ msgstr "Pour les informations de configuration de votre serveur, veuillez lire l
msgid "Create an <strong>admin account</strong>"
msgstr "Créer un <strong>compte administrateur</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Mot de passe"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Support de stockage & base de données"
@@ -800,8 +820,27 @@ msgstr "Merci de votre patience."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Mise à jour en cours d'ownCloud vers la version %s, cela peut prendre du temps."
+msgid "%s will be updated to version %s."
+msgstr "%s sera mis à jour vers la version %s."
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr "Les applications suivantes seront désactivées :"
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr "Le thème %s a été désactivé."
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr "Veuillez vous assurer qu'une copie de sauvegarde de la base de données, du dossier de configuration et du dossier de données a été réalisée avant le commencement de la procédure."
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr "Démarrer la mise à jour."
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 0adf80d9994d33c820a6c909bc2701bc02c40c81..34f47eb8648b7bfe083de893f149352f1210a215 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -7,15 +7,16 @@
# Christophe Lherieau <skimpax@gmail.com>, 2013-2014
# etiess <etiess@gmail.com>, 2013
# ptit_boogy <ptit.boogy@gmail.com>, 2014
+# Gauth <gauthier@openux.org>, 2014
# MathieuP, 2013
# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
-"Last-Translator: ptit_boogy <ptit.boogy@gmail.com>\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 09:52+0000\n"
+"Last-Translator: Gauth <gauthier@openux.org>\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"
@@ -33,7 +34,7 @@ msgstr "Impossible de déplacer %s - Un fichier possédant ce nom existe déjà "
msgid "Could not move %s"
msgstr "Impossible de déplacer %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Le nom de fichier ne peut être vide."
@@ -42,18 +43,18 @@ msgstr "Le nom de fichier ne peut être vide."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" n'est pas un nom de fichier valide."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "Le dossier cible a été déplacé ou supprimé."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -129,44 +130,48 @@ msgstr "Absence de dossier temporaire."
msgid "Failed to write to disk"
msgstr "Erreur d'écriture sur le disque"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Plus assez d'espace de stockage disponible"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "L'envoi a échoué. Impossible de trouver le fichier envoyé."
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "L'envoi a échoué. Impossible d'obtenir les informations du fichier."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Dossier invalide."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Fichiers"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Tous les fichiers"
+
+#: js/file-upload.js:257
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:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Espace insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Envoi annulé."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Ne peut recevoir les résultats du serveur."
@@ -179,120 +184,120 @@ msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera
msgid "URL cannot be empty"
msgstr "L'URL ne peut pas être vide"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} existe déjà "
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Impossible de créer le fichier"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Impossible de créer le dossier"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Erreur d'accès à l'URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Partager"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Supprimer de façon définitive"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Renommer"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "En attente"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr "Erreur lors du déplacement du fichier."
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Erreur lors du déplacement du fichier"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Erreur"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Impossible de renommer le fichier"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Erreur pendant la suppression du fichier."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Nom"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Taille"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Modifié"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n dossier"
msgstr[1] "%n dossiers"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fichier"
msgstr[1] "%n fichiers"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Téléversement de %n fichier"
msgstr[1] "Téléversement de %n fichiers"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" n'est pas un nom de fichier valide."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Votre espace de stockage est presque plein ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "L'application de chiffrement est activée mais vos clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter."
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Votre clef privée pour l'application de chiffrement est invalide ! Veuillez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -302,12 +307,12 @@ msgstr "Le chiffrement était désactivé mais vos fichiers sont toujours chiffr
msgid "{dirs} and {files}"
msgstr "{dirs} et {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s ne peut être renommé"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Envoi (max. %s)"
@@ -344,68 +349,75 @@ msgstr "Taille maximale pour les fichiers ZIP"
msgid "Save"
msgstr "Sauvegarder"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Utiliser cette adresse pour <a href=\"%s\" target=\"_blank\"> accéder à vos fichiers par WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Nouveau"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Nouveau fichier texte"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Fichier texte"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Nouveau dossier"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Dossier"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Depuis le lien"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Fichiers supprimés"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Annuler l'envoi"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Vous n'avez pas la permission de téléverser ou de créer des fichiers ici"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Télécharger"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Supprimer"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Téléversement trop volumineux"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Analyse en cours"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr "Analyse en cours de traitement"
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index a780215e4d1c29d3e3b33c338c3c428bc9d9e0b9..62b7334466ce62a69227f5f7868a8cb8ee9406a9 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -8,14 +8,14 @@
# etiess <etiess@gmail.com>, 2013
# froozeify <froozeify@mail.com>, 2013
# lyly95, 2013
-# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
+# ogre_sympathique, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 15:59+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 08:51+0000\n"
+"Last-Translator: ogre_sympathique\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"
@@ -82,9 +82,9 @@ msgstr "Impossible de déchiffrer ce fichier, il s'agit probablement d'un fichie
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Erreur inconnue. Veuillez vérifier vos paramètres système ou contacter votre administrateur."
+msgstr "Erreur inconnue. Veuillez vérifier vos paramètres système ou contacter un administrateur."
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -97,7 +97,7 @@ msgid ""
" the encryption app has been disabled."
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:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :"
@@ -117,91 +117,91 @@ msgstr "Allez directement à votre"
msgid "personal settings"
msgstr "paramètres personnel"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Chiffrement"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe)."
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Mot de passe de la clef de récupération"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Répétez le mot de passe de la clé de récupération"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Activer"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Désactiver"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Modifier le mot de passe de la clef de récupération :"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Ancien mot de passe de la clef de récupération"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Nouveau mot de passe de la clef de récupération"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Répétez le nouveau mot de passe de la clé de récupération"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Changer de mot de passe"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion :"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Configurez le mot de passe de votre ancienne clef privée avec votre mot de passe courant de connexion. "
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Ancien mot de passe de connexion"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Actuel mot de passe de connexion"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Mettre à jour le mot de passe de votre clé privée"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Activer la récupération du mot de passe :"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Paramètres de récupération de fichiers mis à jour"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Ne peut pas remettre à jour les fichiers de récupération"
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index b0df2811d38d5b4d50213601c457f3cdc6d8595d..1fa7b348d7c860e2fc2298cc86478e2db0f69015 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -3,16 +3,18 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# ReDiX <froment.a@gmail.com>, 2014
# timelord <bruno@timelord.fr>, 2014
# Christophe Lherieau <skimpax@gmail.com>, 2014
# ptit_boogy <ptit.boogy@gmail.com>, 2014
+# Gauth <gauthier@openux.org>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 11:49+0000\n"
-"Last-Translator: ptit_boogy <ptit.boogy@gmail.com>\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 09:52+0000\n"
+"Last-Translator: Gauth <gauthier@openux.org>\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"
@@ -24,157 +26,161 @@ msgstr ""
msgid "Local"
msgstr "Local"
-#: appinfo/app.php:36
+#: appinfo/app.php:37
msgid "Location"
msgstr "Emplacement"
-#: appinfo/app.php:39
+#: appinfo/app.php:40
msgid "Amazon S3"
msgstr "Amazon S3"
-#: appinfo/app.php:41
+#: appinfo/app.php:43
msgid "Key"
msgstr "Clé"
-#: appinfo/app.php:42
+#: appinfo/app.php:44
msgid "Secret"
-msgstr ""
+msgstr "Secret"
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
msgid "Bucket"
msgstr ""
-#: appinfo/app.php:47
+#: appinfo/app.php:49
msgid "Amazon S3 and compliant"
-msgstr ""
+msgstr "Compatible avec Amazon S3"
-#: appinfo/app.php:49
+#: appinfo/app.php:52
msgid "Access Key"
msgstr "Clé d'accès"
-#: appinfo/app.php:50
+#: appinfo/app.php:53
msgid "Secret Key"
-msgstr ""
+msgstr "Clé secrète"
-#: appinfo/app.php:52
+#: appinfo/app.php:55
msgid "Hostname (optional)"
-msgstr ""
+msgstr "Nom machine (optionnel)"
-#: appinfo/app.php:53
+#: appinfo/app.php:56
msgid "Port (optional)"
-msgstr ""
+msgstr "Port (optionnel)"
-#: appinfo/app.php:54
+#: appinfo/app.php:57
msgid "Region (optional)"
-msgstr ""
+msgstr "Région (facultatif)"
-#: appinfo/app.php:55
+#: appinfo/app.php:58
msgid "Enable SSL"
-msgstr ""
+msgstr "Activer SSL"
-#: appinfo/app.php:56
+#: appinfo/app.php:59
msgid "Enable Path Style"
-msgstr ""
+msgstr "Activer le style de chemin"
-#: appinfo/app.php:63
+#: appinfo/app.php:67
msgid "App key"
-msgstr ""
+msgstr "Clé App"
-#: appinfo/app.php:64
+#: appinfo/app.php:68
msgid "App secret"
msgstr ""
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
+msgid "Host"
+msgstr "Hôte"
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
msgid "Username"
msgstr "Nom d'utilisateur"
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
msgid "Password"
msgstr "Mot de passe"
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
msgid "Root"
-msgstr ""
+msgstr "Root"
-#: appinfo/app.php:77
+#: appinfo/app.php:82
msgid "Secure ftps://"
-msgstr ""
+msgstr "Sécuriser via ftps://"
-#: appinfo/app.php:84
+#: appinfo/app.php:90
msgid "Client ID"
-msgstr ""
+msgstr "ID Client"
-#: appinfo/app.php:85
+#: appinfo/app.php:91
msgid "Client secret"
msgstr ""
-#: appinfo/app.php:92
+#: appinfo/app.php:98
msgid "OpenStack Object Storage"
msgstr ""
-#: appinfo/app.php:94
+#: appinfo/app.php:101
msgid "Username (required)"
-msgstr ""
+msgstr "Nom d'utilisation (requis)"
-#: appinfo/app.php:95
+#: appinfo/app.php:102
msgid "Bucket (required)"
msgstr ""
-#: appinfo/app.php:96
+#: appinfo/app.php:103
msgid "Region (optional for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:97
+#: appinfo/app.php:104
msgid "API Key (required for Rackspace Cloud Files)"
-msgstr ""
+msgstr "Clé API (requis pour Rackspace Cloud Files)"
-#: appinfo/app.php:98
+#: appinfo/app.php:105
msgid "Tenantname (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Nom du locataire (requis pour le stockage OpenStack)"
-#: appinfo/app.php:99
+#: appinfo/app.php:106
msgid "Password (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Mot de passe (requis pour OpenStack Object Storage)"
-#: appinfo/app.php:100
+#: appinfo/app.php:107
msgid "Service Name (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Nom du service (requit pour le stockage OpenStack)"
-#: appinfo/app.php:101
+#: appinfo/app.php:108
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:102
+#: appinfo/app.php:109
msgid "Timeout of HTTP requests in seconds (optional)"
-msgstr ""
+msgstr "Temps maximal de requête HTTP en seconde (facultatif)"
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
msgid "Share"
msgstr "Partager"
-#: appinfo/app.php:119
+#: appinfo/app.php:127
msgid "SMB / CIFS using OC login"
-msgstr ""
+msgstr "SMB / CIFS utilise le nom d'utilisateur OC"
-#: appinfo/app.php:122
+#: appinfo/app.php:131
msgid "Username as share"
-msgstr ""
+msgstr "Nom d'utilisateur du partage"
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:141 appinfo/app.php:152
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:145 appinfo/app.php:156
msgid "Secure https://"
-msgstr ""
+msgstr "Sécurisation https://"
-#: appinfo/app.php:144
+#: appinfo/app.php:155
msgid "Remote subfolder"
-msgstr ""
+msgstr "Sous-dossier distant"
#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
msgid "Access granted"
@@ -200,29 +206,29 @@ msgstr "Erreur lors de la configuration du support de stockage Google Drive"
msgid "Saved"
msgstr "Sauvegarder"
-#: lib/config.php:598
+#: lib/config.php:674
msgid "<b>Note:</b> "
msgstr "<b>Attention :</b>"
-#: lib/config.php:608
+#: lib/config.php:684
msgid " and "
msgstr "et"
-#: lib/config.php:630
+#: lib/config.php:706
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Attention :</b> Le support de cURL de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer."
-#: lib/config.php:632
+#: lib/config.php:708
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Attention : </b> Le support FTP de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer."
-#: lib/config.php:634
+#: lib/config.php:710
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index cc538116e13f94f682e75c9e69508d5160c305a6..1989bd347604be239d856180621ed151dafb452b 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -6,13 +6,13 @@
# square <benben390-390@yahoo.fr>, 2013
# Christophe Lherieau <skimpax@gmail.com>, 2013
# etiess <etiess@gmail.com>, 2013-2014
-# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
+# ogre_sympathique, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -21,10 +21,34 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Partagé par {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Ce partage est protégé par un mot de passe"
@@ -37,6 +61,14 @@ msgstr "Le mot de passe est incorrect. Veuillez réessayer."
msgid "Password"
msgstr "Mot de passe"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Désolé, mais le lien semble ne plus fonctionner."
@@ -65,11 +97,11 @@ msgstr "Pour plus d'informations, veuillez contacter la personne qui a envoyé c
msgid "Download"
msgstr "Télécharger"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Télécharger %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Lien direct"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index 310713d5dd97cb46220786d86ce599ea8a29df4c..3671ca8060689f822086f2c9b177bef08ec79161 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "Impossible d'effacer %s de façon permanente"
msgid "Couldn't restore %s"
msgstr "Impossible de restaurer %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Fichiers supprimés"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Restaurer"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Erreur"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Fichiers effacés"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "restauré"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Il n'y a rien ici. Votre corbeille est vide !"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nom"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Restaurer"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Effacé"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Supprimer"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index b78ac6316b5055f00cc151ca946ec5a6ba380c7a..7443f63b4ab092004dcb5c8bd01618c18ef3757d 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -7,14 +7,15 @@
# Cyril Glapa <kyriog@gmail.com>, 2013
# etiess <etiess@gmail.com>, 2013
# ptit_boogy <ptit.boogy@gmail.com>, 2014
+# Gauth <gauthier@openux.org>, 2014
# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 09:52+0000\n"
+"Last-Translator: Gauth <gauthier@openux.org>\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"
@@ -22,16 +23,16 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr "Vous accédez au serveur à partir d'un domaine non-approuvé."
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
"example configuration is provided in config/config.sample.php."
-msgstr ""
+msgstr "Veuillez contacter votre administrateur. Si vous être l'administrateur de cette instance, il faut configurer la variable \"trusted_domain\" dans le fichier config/config.php. Un exemple de configuration est fournit dans le fichier config/config.sample.php."
#: private/app.php:236
#, php-format
@@ -81,23 +82,23 @@ msgstr "Image invalide"
msgid "web services under your control"
msgstr "services web sous votre contrôle"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Téléchargement ZIP désactivé."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Les fichiers nécessitent d'être téléchargés un par un."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Retour aux Fichiers"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -283,127 +284,138 @@ msgstr "Spécifiez un nom d'utilisateur pour l'administrateur."
msgid "Set an admin password."
msgstr "Spécifiez un mot de passe administrateur."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
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>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s partagé »%s« avec vous"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr "Le partage de %s a échoué car le fichier n'existe pas"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Vous n'êtes pas autorisé à partager %s"
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "Le partage de %s a échoué car l'utilisateur %s est le propriétaire de l'objet"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "Le partage de %s a échoué car l'utilisateur %s n'existe pas"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr "Le partage de %s a échoué car l'utilisateur %s n'est membre d'aucun groupe auquel %s appartient"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "Le partage de %s a échoué car cet objet est déjà partagé avec %s"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "Le partage de %s a échoué car le groupe %s n'existe pas"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "Le partage de %s a échoué car %s n'est pas membre du groupe %s"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Vous devez fournir un mot de passe pour créer un lien public, seul les liens protégés sont autorisées."
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "Le partage de %s a échoué car un partage de lien n'est pas permis"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr "Le type de partage %s n'est pas valide pour %s"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr "Le réglage des permissions pour %s a échoué car les permissions dépassent celle accordée à %s"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "Le réglage des permissions pour %s a échoué car l'objet n'a pas été trouvé"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
-msgstr ""
+msgstr "L'emplacement du partage %s doit implémenter l'interface OCP\\Share_Backend"
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
-msgstr ""
+msgstr "Emplacement de partage %s introuvable"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
-msgstr ""
+msgstr "L'emplacement du partage %s est introuvable"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr "Le partage de %s a échoué car l'utilisateur %s est déjà l'utilisateur à l'origine du partage."
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr "Le partage de %s a échoué car les permissions dépassent les permissions accordées à %s"
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr "Le partage de %s a échoué car le repartage n'est pas autorisé"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
-msgstr ""
+msgstr "Le partage %s a échoué parce que la source n'a été trouvée pour le partage %s."
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr "Le partage de %s a échoué car le fichier n'a pas été trouvé dans les fichiers mis en cache."
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Impossible de trouver la catégorie \"%s\""
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 244790b6b21745c72ba1753112afa1d194d30002..c6e3e98547a70e49de80fc5e8e36b9777b349423 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -8,9 +8,10 @@
# Christophe Lherieau <skimpax@gmail.com>, 2013-2014
# etiess <etiess@gmail.com>, 2013
# ptit_boogy <ptit.boogy@gmail.com>, 2014
+# Gauth <gauthier@openux.org>, 2014
# lyly95, 2013
# Mystyle <maelvstyle@gmail.com>, 2013
-# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
+# ogre_sympathique, 2013-2014
# red0ne <red-0ne@smarty-concept.com>, 2013
# RyDroid <rydroid_trans@yahoo.fr>, 2013-2014
# tcit <thomas.citharet@gmail.com>, 2014
@@ -19,9 +20,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2014-04-30 06:40+0000\n"
-"Last-Translator: ptit_boogy <ptit.boogy@gmail.com>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -59,15 +60,15 @@ msgstr "Email envoyé"
msgid "You need to set your user email before being able to send test emails."
msgstr "Vous devez configurer votre e-mail d'utilisateur avant de pouvoir envoyer des e-mails de test."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Mode d'envoi"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Chiffrement"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Méthode d'authentification"
@@ -110,6 +111,16 @@ msgstr "Impossible de décrypter vos fichiers, veuillez vérifier votre owncloud
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et essayez à nouveau"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Clés de chiffrement définitivement supprimées."
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Impossible de supprimer définitivement vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur"
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "E-mail sauvegardé"
@@ -126,6 +137,16 @@ msgstr "Impossible de supprimer le groupe"
msgid "Unable to delete user"
msgstr "Impossible de supprimer l'utilisateur"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "La sauvegarde a été restaurée avec succès"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Impossible de restaurer vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur"
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Langue changée"
@@ -181,7 +202,7 @@ msgstr "L'infrastructure d'arrière-plan ne supporte pas la modification de mot
msgid "Unable to change password"
msgstr "Impossible de modifier le mot de passe"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Envoi en cours..."
@@ -237,34 +258,42 @@ msgstr "Mettre à jour"
msgid "Updated"
msgstr "Mise à jour effectuée avec succès"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Selectionner une photo de profil "
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Mot de passe de très faible sécurité"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Mot de passe de faible sécurité"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Mot de passe de sécurité tout juste acceptable"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Mot de passe de sécurité suffisante"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Mot de passe de forte sécurité"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Déchiffrement en cours... Cela peut prendre un certain temps."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Supprimer définitivement les clés de chiffrement"
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Restaurer les clés de chiffrement"
+
#: js/users.js:47
msgid "deleted"
msgstr "supprimé"
@@ -277,8 +306,8 @@ msgstr "annuler"
msgid "Unable to remove user"
msgstr "Impossible de retirer l'utilisateur"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Groupes"
@@ -310,7 +339,7 @@ msgstr "Un mot de passe valide doit être saisi"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Attention : Le dossier Home pour l'utilisateur \"{user}\" existe déjà "
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Français"
@@ -378,7 +407,7 @@ msgid ""
"root."
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:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Avertissement, problème de configuration"
@@ -393,53 +422,65 @@ 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 consulter à nouveau les <a href=\"%s\">guides d'installation</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Module 'fileinfo' manquant"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "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."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Votre version de PHP est trop ancienne"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Votre version de PHP est trop ancienne. Nous vous recommandons fortement de migrer vers une version 5.3.8 ou plus récente encore, car les versions antérieures sont réputées problématiques. Il est possible que cette installation ne fonctionne pas correctement."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Localisation non fonctionnelle"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Les paramètres régionaux ne peuvent pas être configurés avec un qui supporte UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichier."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Nous conseillons vivement d'installer les paquets requis sur votre système pour supporter l'un des paramètres régionaux suivants : %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "La connexion internet ne fonctionne pas"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -448,198 +489,206 @@ msgid ""
"internet connection for this server if you want to have all features."
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:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "Le dernier cron s'est exécuté à %s."
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "Le dernier cron s'est exécuté à %s. Cela fait plus d'une heure, quelque chose a du mal se passer."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "Le cron n'a pas encore été exécuté !"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Exécute une tâche à chaque chargement de page"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php est enregistré en tant que service webcron pour appeler cron.php toutes les 15 minutes via http."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Utilise le service cron du système pour appeler le fichier cron.php toutes les 15 minutes."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Partage"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Activer l'API de partage"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Autoriser les applications à utiliser l'API de partage"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Autoriser les liens"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr "Appliquer la protection par mot de passe"
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Autoriser les téléversements publics"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permet d'autoriser les autres utilisateurs à téléverser dans le dossier partagé public de l'utilisateur"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "Spécifier la date d'expiration par défaut"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Expire après"
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "jours"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Impose la date d'expiration"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens"
-#: templates/admin.php:235
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Autoriser le repartage"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Autoriser les utilisateurs à partager avec tout le monde"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Autoriser les notifications par couriel"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Autoriser les utilisateurs à envoyer une notification par courriel concernant les fichiers partagés"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr "Spécifier la date d'expiration par défaut"
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Expire après"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr "Exclure les groupes du partage"
-#: templates/admin.php:266
-msgid "days"
-msgstr "jours"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr "Impose la date d'expiration"
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Par défaut, les partages expireront après N jours"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Ces groupes restent autorisés à partager, mais ne peuvent pas les initier"
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Sécurité"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Forcer HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Forcer les clients à se connecter à %s via une connexion chiffrée."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Serveur mail"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "Ceci est utilisé pour l'envoi des notifications."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Adresse source"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr "courriel"
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Authentification requise"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Adresse du serveur"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Port"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Informations d'identification"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "Nom d'utilisateur SMTP"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "Mot de passe SMTP"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Paramètres de test d'e-mail"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Envoyer un e-mail"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Log"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Niveau de log"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Plus"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Moins"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Version"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -792,29 +841,33 @@ msgstr "Langue"
msgid "Help translate"
msgstr "Aidez à traduire"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Utiliser cette adresse pour <a href=\"%s\" target=\"_blank\"> accéder à vos fichiers par WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "L'app de chiffrement n’est plus activée, veuillez déchiffrer tous vos fichiers"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Mot de passe de connexion"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Déchiffrer tous les fichiers"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Vos clés de chiffrement ont été déplacées dans l'emplacement de backup. Si quelque chose devait mal se passer, vous pouvez restaurer les clés. Choisissez la suppression permanente seulement si vous êtes sûr que tous les fichiers ont été déchiffrés correctement."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Restaurer les clés de chiffrement"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Supprimer les clés de chiffrement"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Nom d'utilisateur"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 8b9bc24183cf6580bf94f9b96f0e8337c7043cd0..65c8308d78e6fd7a3135873e190af3bbe11626f0 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -5,15 +5,17 @@
# Translators:
# Christophe Lherieau <skimpax@gmail.com>, 2013-2014
# etiess <etiess@gmail.com>, 2013
+# Gauth <gauthier@openux.org>, 2014
+# ogre_sympathique, 2014
# plachance <patlachance@gmail.com>, 2013
# RyDroid <rydroid_trans@yahoo.fr>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: RyDroid <rydroid_trans@yahoo.fr>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 09:15+0000\n"
+"Last-Translator: ogre_sympathique\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"
@@ -74,6 +76,10 @@ msgstr "Récupérer les paramètres depuis une configuration récente du serveur
msgid "Keep settings?"
msgstr "Garder ces paramètres ?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Serveur"
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Impossible d'ajouter la configuration du serveur"
@@ -90,6 +96,18 @@ msgstr "Succès"
msgid "Error"
msgstr "Erreur"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Veuillez indiquer le port"
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Configuration OK"
@@ -130,28 +148,44 @@ msgstr "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du
msgid "Confirm Deletion"
msgstr "Confirmer la suppression"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s groupe trouvé"
msgstr[1] "%s groupes trouvés"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s utilisateur trouvé"
msgstr[1] "%s utilisateurs trouvés"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Hôte invalide"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Impossible de trouver la fonction souhaitée"
+#: settings.php:52
+msgid "Server"
+msgstr "Serveur"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Filtre utilisateur"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Filtre par nom d'utilisateur"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtre de groupes"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Sauvegarder"
@@ -224,10 +258,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
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/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Serveur"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Serveur:"
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Ajouter une configuration du serveur"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Suppression de la configuration"
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Hôte"
@@ -291,6 +338,14 @@ msgstr "Retour"
msgid "Continue"
msgstr "Poursuivre"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Expert"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avancé"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/fr_CA/core.po b/l10n/fr_CA/core.po
index 53de5d6a0db24149ec1fcbaef0468bf34773622a..1b3352eb8612c6eb1b9ca16bb1f9f0b37bca1ce7 100644
--- a/l10n/fr_CA/core.po
+++ b/l10n/fr_CA/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: fr_CA\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/fr_CA/files.po b/l10n/fr_CA/files.po
index ffb647a363967f3f472919bd3f6658c9d1ea7cfe..a94a3b76682defe94bbb47b5c015db5397fb421b 100644
--- a/l10n/fr_CA/files.po
+++ b/l10n/fr_CA/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/fr_CA/files_encryption.po b/l10n/fr_CA/files_encryption.po
index f7097194662f6cbc44716fb060902f30b0755f9f..7a9fa82571efd356a2c10dccc252797ffdc1c43d 100644
--- a/l10n/fr_CA/files_encryption.po
+++ b/l10n/fr_CA/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/fr_CA/files_external.po b/l10n/fr_CA/files_external.po
index 5b04a98f0f3dbd172a073032177d95dab98254f5..f9cb77ad2f4e233cefa67ddd818d9931211e3c2d 100644
--- a/l10n/fr_CA/files_external.po
+++ b/l10n/fr_CA/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/fr_CA/files_sharing.po b/l10n/fr_CA/files_sharing.po
index 91851282b9abd5eab37b43db7bfc7e80890d19dd..cef9ff0c63be64f44c2f069cf50c20a62defea95 100644
--- a/l10n/fr_CA/files_sharing.po
+++ b/l10n/fr_CA/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: fr_CA\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/fr_CA/files_trashbin.po b/l10n/fr_CA/files_trashbin.po
index 79e8ab337e4676d9d875245404f7cc045cc64f4d..389e4d3cb309458e48e590b904b6bfb42a3bdf24 100644
--- a/l10n/fr_CA/files_trashbin.po
+++ b/l10n/fr_CA/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/fr_CA/lib.po b/l10n/fr_CA/lib.po
index 892ad1e11eb9b5e8290267a9d0743d88bfd406e1..600df1183ff0ddc2d0b0abfed495831a1667b1fe 100644
--- a/l10n/fr_CA/lib.po
+++ b/l10n/fr_CA/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: fr_CA\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/fr_CA/settings.po b/l10n/fr_CA/settings.po
index 951ff58a54cccf311d7b17565c33f2a0e2c105e5..bf909fd3204ab5dd37ce9bf1184ea136c4915abe 100644
--- a/l10n/fr_CA/settings.po
+++ b/l10n/fr_CA/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/fr_CA/user_ldap.po b/l10n/fr_CA/user_ldap.po
index 2c1745b5fcee201fb7dffc8f6b1cfcebdbc37c44..988ad812596dd175da359a40da747ee637d68fa1 100644
--- a/l10n/fr_CA/user_ldap.po
+++ b/l10n/fr_CA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index d1a58fca05c2b73930293f41eb8abbf19f6e1ade..16b9f203590df969ccc2d5ec58d6626f056213ae 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 09:59+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 07:32+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"
@@ -19,11 +19,11 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "A data de caducidade está no pasado."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Non é posÃbel enviar correo aos usuarios seguintes: %s"
@@ -40,6 +40,11 @@ msgstr "Modo de mantemento desactivado"
msgid "Updated database"
msgstr "Base de datos actualizada"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr "Aplicativos incompatÃbeis desactivados: %s"
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Non forneceu ningunha imaxe ou ficheiro"
@@ -60,207 +65,207 @@ msgstr "Non hai unha imaxe temporal de perfil dispoñÃbel, volva tentalo"
msgid "No crop data provided"
msgstr "Non indicou como recortar"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "domingo"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "luns"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "martes"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "mércores"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "xoves"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "venres"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "sábado"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "xaneiro"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "febreiro"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "marzo"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "maio"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "xuño"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "xullo"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "agosto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "setembro"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "outubro"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "novembro"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "decembro"
-#: js/js.js:483
+#: js/js.js:496
msgid "Settings"
msgstr "Axustes"
-#: js/js.js:583
+#: js/js.js:596
msgid "Saving..."
msgstr "Gardando..."
-#: js/js.js:1240
+#: js/js.js:1220
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:1241
+#: js/js.js:1221
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "hai %n minuto"
msgstr[1] "hai %n minutos"
-#: js/js.js:1242
+#: js/js.js:1222
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "hai %n hora"
msgstr[1] "hai %n horas"
-#: js/js.js:1243
+#: js/js.js:1223
msgid "today"
msgstr "hoxe"
-#: js/js.js:1244
+#: js/js.js:1224
msgid "yesterday"
msgstr "onte"
-#: js/js.js:1245
+#: js/js.js:1225
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "hai %n dÃa"
msgstr[1] "vai %n dÃas"
-#: js/js.js:1246
+#: js/js.js:1226
msgid "last month"
msgstr "último mes"
-#: js/js.js:1247
+#: js/js.js:1227
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "hai %n mes"
msgstr[1] "hai %n meses"
-#: js/js.js:1248
+#: js/js.js:1228
msgid "last year"
msgstr "último ano"
-#: js/js.js:1249
+#: js/js.js:1229
msgid "years ago"
msgstr "anos atrás"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Escoller"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Produciuse un erro ao cargar o modelo do selector: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Si"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Escoller"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Produciuse un erro ao cargar o modelo do selector: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Aceptar"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Produciuse un erro ao cargar o modelo da mensaxe: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
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:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Un conflito de ficheiro"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Ficheiros novos"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Ficheiros xa existentes"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Que ficheiros quere conservar?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
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:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(todo o seleccionado)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Produciuse un erro ao cargar o modelo de ficheiro existente"
@@ -284,148 +289,157 @@ msgstr "Bo contrasinal"
msgid "Strong password"
msgstr "Contrasinal forte"
-#: js/share.js:51 js/share.js:66 js/share.js:106
+#: js/share.js:69 js/share.js:84 js/share.js:127
msgid "Shared"
msgstr "Compartir"
-#: js/share.js:109
+#: js/share.js:130
msgid "Share"
msgstr "Compartir"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:195 js/share.js:208 js/share.js:215 js/share.js:822
#: templates/installation.php:10
msgid "Error"
msgstr "Erro"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:197 js/share.js:885
msgid "Error while sharing"
msgstr "Produciuse un erro ao compartir"
-#: js/share.js:171
+#: js/share.js:208
msgid "Error while unsharing"
msgstr "Produciuse un erro ao deixar de compartir"
-#: js/share.js:178
+#: js/share.js:215
msgid "Error while changing permissions"
msgstr "Produciuse un erro ao cambiar os permisos"
-#: js/share.js:188
+#: js/share.js:225
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartido con vostede e co grupo {group} por {owner}"
-#: js/share.js:190
+#: js/share.js:227
msgid "Shared with you by {owner}"
msgstr "Compartido con vostede por {owner}"
-#: js/share.js:214
+#: js/share.js:251
msgid "Share with user or group …"
msgstr "Compartir cun usuario ou grupo ..."
-#: js/share.js:220
+#: js/share.js:257
msgid "Share link"
msgstr "Ligazón para compartir"
-#: js/share.js:223
+#: js/share.js:263
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "A ligazón pública caducará, a máis tardar, {days} dÃas após a súa creación"
+
+#: js/share.js:265
+msgid "By default the public link will expire after {days} days"
+msgstr "De xeito predeterminado, a ligazón pública caduca aos {days} dÃas"
+
+#: js/share.js:270
msgid "Password protect"
msgstr "Protexido con contrasinais"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Contrasinal"
+#: js/share.js:272
+msgid "Choose a password for the public link"
+msgstr "Escolla un contrasinal para a ligazón pública"
-#: js/share.js:230
+#: js/share.js:278
msgid "Allow Public Upload"
msgstr "Permitir o envÃo público"
-#: js/share.js:234
+#: js/share.js:282
msgid "Email link to person"
msgstr "Enviar ligazón por correo"
-#: js/share.js:235
+#: js/share.js:283
msgid "Send"
msgstr "Enviar"
-#: js/share.js:240
+#: js/share.js:288
msgid "Set expiration date"
msgstr "Definir a data de caducidade"
-#: js/share.js:241
+#: js/share.js:289
msgid "Expiration date"
msgstr "Data de caducidade"
-#: js/share.js:277
+#: js/share.js:326
msgid "Share via email:"
msgstr "Compartir por correo:"
-#: js/share.js:280
+#: js/share.js:329
msgid "No people found"
msgstr "Non se atopou xente"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:377 js/share.js:438
msgid "group"
msgstr "grupo"
-#: js/share.js:357
+#: js/share.js:410
msgid "Resharing is not allowed"
msgstr "Non se permite volver a compartir"
-#: js/share.js:401
+#: js/share.js:454
msgid "Shared in {item} with {user}"
msgstr "Compartido en {item} con {user}"
-#: js/share.js:423
+#: js/share.js:476
msgid "Unshare"
msgstr "Deixar de compartir"
-#: js/share.js:431
+#: js/share.js:484
msgid "notify by email"
msgstr "notificar por correo"
-#: js/share.js:434
+#: js/share.js:487
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:436
+#: js/share.js:489
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:439
+#: js/share.js:492
msgid "create"
msgstr "crear"
-#: js/share.js:442
+#: js/share.js:495
msgid "update"
msgstr "actualizar"
-#: js/share.js:445
+#: js/share.js:498
msgid "delete"
msgstr "eliminar"
-#: js/share.js:448
+#: js/share.js:501
msgid "share"
msgstr "compartir"
-#: js/share.js:721
+#: js/share.js:803
msgid "Password protected"
msgstr "Protexido con contrasinal"
-#: js/share.js:734
+#: js/share.js:822
msgid "Error unsetting expiration date"
msgstr "Produciuse un erro ao retirar a data de caducidade"
-#: js/share.js:752
+#: js/share.js:843
msgid "Error setting expiration date"
msgstr "Produciuse un erro ao definir a data de caducidade"
-#: js/share.js:777
+#: js/share.js:872
msgid "Sending ..."
msgstr "Enviando..."
-#: js/share.js:788
+#: js/share.js:883
msgid "Email sent"
msgstr "Correo enviado"
-#: js/share.js:812
+#: js/share.js:907
msgid "Warning"
msgstr "Aviso"
@@ -457,18 +471,19 @@ msgstr "Produciuse un erro ao cargar o modelo do dialogo: {error}"
msgid "No tags selected for deletion."
msgstr "Non se seleccionaron etiquetas para borrado."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr "Actualizando {productName} a versión {version}, isto pode levar un anaco."
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Volva a cargar a páxina."
-#: 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 "A actualización non foi satisfactoria, informe deste problema á <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade de ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr "A actualización foi satisfactoria."
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A actualización realizouse correctamente. RedirixÃndoo agora á ownCloud."
@@ -669,6 +684,10 @@ msgstr "Para obter información sobre como como configurar axeitadamente o seu s
msgid "Create an <strong>admin account</strong>"
msgstr "Crear unha <strong>contra de administrador</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Contrasinal"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Almacenamento e base de datos"
@@ -794,8 +813,27 @@ msgstr "Grazas pola súa paciencia."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Actualizando ownCloud a versión %s, esto pode levar un anaco."
+msgid "%s will be updated to version %s."
+msgstr "%s actualizarase á versión %s."
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr "Os seguintes aplicativos van desactivarse:"
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr "O tema %s foi desactivado."
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr "Asegúrese de ter feito unha copia de seguranza da base de datos, do cartafol de configuración e do cartafol de datos, antes de proceder."
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr "Iniciar a actualización"
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index df8a13b7e7b25a639424171ebb87391c68f8ec24..2ecb0e3fdf4f6f1f54f4f77657754f578bdecbb3 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 07:11+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"
@@ -29,7 +29,7 @@ msgstr "Non foi posÃbel mover %s; Xa existe un ficheiro con ese nome."
msgid "Could not move %s"
msgstr "Non foi posÃbel mover %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "O nome de ficheiro non pode estar baleiro"
@@ -38,18 +38,18 @@ msgstr "O nome de ficheiro non pode estar baleiro"
msgid "\"%s\" is an invalid file name."
msgstr "«%s» é un nome incorrecto de ficheiro."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*»."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "O cartafol de destino foi movido ou eliminado."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -125,44 +125,48 @@ msgstr "Falta o cartafol temporal"
msgid "Failed to write to disk"
msgstr "Produciuse un erro ao escribir no disco"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Non hai espazo de almacenamento abondo"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "O envÃo fracasou. Non foi posÃbel atopar o ficheiro enviado"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
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:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "O directorio é incorrecto."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Ficheiros"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Todos os ficheiros"
+
+#: js/file-upload.js:257
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:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "O tamaño total do ficheiro {size1} excede do lÃmite de envÃo {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Non hai espazo libre abondo, o seu envÃo é de {size1} mais só dispón de {size2}"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "EnvÃo cancelado."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Non foi posÃbel obter o resultado do servidor."
@@ -175,120 +179,120 @@ msgstr "O envÃo do ficheiro está en proceso. SaÃr agora da páxina cancelará
msgid "URL cannot be empty"
msgstr "O URL non pode quedar en branco."
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "Xa existe un {new_name}"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Non foi posÃbel crear o ficheiro"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Non foi posÃbel crear o cartafol"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Produciuse un erro ao obter o URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Compartir"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Renomear"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Pendentes"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr "Produciuse un erro ao mover o ficheiro."
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Produciuse un erro ao mover o ficheiro"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Erro"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Non foi posÃbel renomear o ficheiro"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Produciuse un erro ao eliminar o ficheiro."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Nome"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Tamaño"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Modificado"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n cartafol"
msgstr[1] "%n cartafoles"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n ficheiro"
msgstr[1] "%n ficheiros"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Cargando %n ficheiro"
msgstr[1] "Cargando %n ficheiros"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "«{name}» é un nome incorrecto de ficheiro."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "O aplicativo de cifrado está activado, mais as chaves non foron inicializadas, saia da sesión e volva a acceder de novo"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "A chave privada para o aplicativo de cifrado non é correcta. Actualice o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -298,12 +302,12 @@ msgstr "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á co
msgid "{dirs} and {files}"
msgstr "{dirs} e {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s non pode cambiar de nome"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "EnvÃo (máx. %s)"
@@ -340,68 +344,75 @@ msgstr "Tamaño máximo de descarga para os ficheiros ZIP"
msgid "Save"
msgstr "Gardar"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Empregue esta ligazón para <a href=\"%s\" target=\"_blank\">acceder aos seus ficheiros mediante WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Novo"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Ficheiro novo de texto"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Ficheiro de texto"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Novo cartafol"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Cartafol"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Desde a ligazón"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Ficheiros eliminados"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Cancelar o envÃo"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Non ten permisos para enviar ou crear ficheiros aquÃ."
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Aquà non hai nada. EnvÃe algo."
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Descargar"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Eliminar"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "EnvÃo demasiado grande"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Estanse analizando os ficheiros. Agarde."
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr "Análise actual"
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index 13db5afaa5711ebee2330b1b97a87b3ade940157..8f6fc65aba59e377025502ee01fc789938715570 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.po
@@ -6,12 +6,13 @@
# mbouzada <mbouzada@gmail.com>, 2013
# mbouzada <mbouzada@gmail.com>, 2013
# mbouzada <mbouzada@gmail.com>, 2013-2014
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 08:50+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:07+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"
@@ -79,9 +80,9 @@ msgstr "Non foi posÃbel descifrar o ficheiro, probabelmente tratase dun ficheir
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Produciuse un erro descoñecido. Comprobe os axustes do sistema ou póñase en contacto co administrador"
+msgstr "Produciuse un erro descoñecido. Comprobe os axustes do sistema ou contacte co administrador"
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -94,7 +95,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de o OpenSSL xunto coa extensión PHP estean activados e configurados correctamente. Polo de agora foi desactivado o aplicativo de cifrado."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Os seguintes usuarios non teñen configuración para o cifrado:"
@@ -114,91 +115,91 @@ msgstr "Vaia directamente ao seu"
msgid "personal settings"
msgstr "axustes persoais"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Cifrado"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Contrasinal da chave de recuperación"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Repita o contrasinal da chave da recuperación"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Activado"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Desactivado"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Cambiar o contrasinal da chave de la recuperación:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Antigo contrasinal da chave de recuperación"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Novo contrasinal da chave de recuperación"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Repita o novo contrasinal da chave da recuperación"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Cambiar o contrasinal"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso."
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Estabeleza o seu contrasinal antigo da chave de recuperación ao seu contrasinal de acceso actual"
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr " Se non lembra o seu antigo contrasinal pode pedÃrllelo ao seu administrador para recuperar os seus ficheiros."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Contrasinal de acceso antigo"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Contrasinal de acceso actual"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Actualizar o contrasinal da chave privada"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Activar o contrasinal de recuperación:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados no caso de perda do contrasinal"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Actualizouse o ficheiro de axustes de recuperación"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Non foi posÃbel actualizar o ficheiro de recuperación"
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index bce563e094300c94e6afb79646d339a52aae97ea..18333792607b718651fe4ed37fb42e6f44de2582 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/files_external.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 09:59+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: I Robot\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"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr "Secreto do aplicativo"
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Servidor"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,6 +166,10 @@ msgstr "SMB / CIFS usando acceso OC"
msgid "Username as share"
msgstr "Nome de usuario como compartición"
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr "https:// seguro"
@@ -198,29 +202,29 @@ msgstr "Produciuse un erro ao configurar o almacenamento en Google Drive"
msgid "Saved"
msgstr "Gardado"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr "<b>Nota:</b> "
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr "e"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Nota:</b> A compatibilidade de cURL en PHP non está activada, ou non está instalado. Non é posÃbel a montaxe de %s. Consulte co administrador do sistema como instalalo."
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Nota:</b> A compatibilidade de FTP en PHP non está activada, ou non está instalado. Non é posÃbel a montaxe de %s. Consulte co administrador do sistema como instalalo."
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index f51fc31940fd46a4ed2a886ec7ac7f6826ee334f..c8b5c038147d3017929818e8156962a1041cd5db 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,34 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Compartido por {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Esta compartición está protexida con contrasinal"
@@ -35,6 +59,14 @@ msgstr "O contrasinal é incorrecto. Ténteo de novo."
msgid "Password"
msgstr "Contrasinal"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Semella que esta ligazón non funciona."
@@ -63,11 +95,11 @@ msgstr "Para obter máis información, pregúntelle á persoa que lle enviou a l
msgid "Download"
msgstr "Descargar"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Descargar %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Ligazón directa"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index ce244ca039c2a4aa48c334d8aed4503fdb2628db..8800ee24e1d3004ff5cedf30cf68bd31217ad376 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "Non foi posÃbel eliminar %s permanente"
msgid "Couldn't restore %s"
msgstr "Non foi posÃbel restaurar %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Ficheiros eliminados"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Restablecer"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Erro"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Ficheiros eliminados"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "restaurado"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Aquà non hai nada. O cesto do lixo está baleiro!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nome"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Restablecer"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Eliminado"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Eliminar"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index 51aad893aaf519554285e035afe2becfa200b25a..a8d533a1e6bd10645738a8e9d6969901592c48ac 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 06:40+0000\n"
+"POT-Creation-Date: 2014-05-25 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 08:21+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"
@@ -19,11 +19,11 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:712
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr "Esta accedendo desde un dominio non fiábel."
-#: base.php:713
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -78,23 +78,23 @@ msgstr "Imaxe incorrecta"
msgid "web services under your control"
msgstr "servizos web baixo o seu control"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "As descargas ZIP están desactivadas."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Os ficheiros necesitan seren descargados dun en un."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Volver aos ficheiros"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -291,116 +291,127 @@ 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>"
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s compartiu «%s» con vostede"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr "Fallou a compartición de %s, o ficheiro non existe"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Non ten permiso para compartir %s"
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "Fallou a compartición de %s, o propietario do elemento é o usuario %s"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "Fallou a compartición de %s, o usuario %s non existe"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr "Fallou a compartición de %s, o usuario %s non é membro de ningún grupo que sexa membro de %s"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "Fallou a compartición de %s, este elemento xa está compartido con %s"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "Fallou a compartición de %s, o grupo %s non existe"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "Fallou a compartición de %s, %s non é membro do grupo %s"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Ten que fornecer un contrasinal para a ligazón pública, só se permiten ligazóns protexidas"
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "Fallou a compartición de %s, non está permitido compartir con ligazóns"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr "Non se admite a compartición do tipo %s para %s"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr "Non é posÃbel estabelecer permisos para %s, os permisos superan os permisos concedidos a %s"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "Non é posÃbel estabelecer permisos para %s, non se atopa o elemento"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr "A infraestrutura de compartición %s ten que implementar a interface OCP\\Share_Backend"
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr "Non se atopou a infraestrutura de compartición %s"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr "Non se atopou a infraestrutura de compartición para %s"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr "Fallou a compartición de %s, compartición orixinal é do usuario %s"
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr "Fallou a compartición de %s, os permisos superan os permisos concedidos a %s"
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr "Fallou a compartición de %s, non está permitido repetir a compartción"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr "Fallou a compartición de %s, a infraestrutura de compartición para %s non foi quen de atopar a orixe"
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr "Fallou a compartición de %s, non foi posÃbel atopar o ficheiro na caché de ficheiros"
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Non foi posÃbel atopar a categorÃa «%s»"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 1a4f0d205f5b5dee9e0553e8fcf8f8360b735c86..6c46dd65cd8ef7ae4c42a30a5b2be53d76a3b081 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 09:59+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -49,15 +49,15 @@ msgstr "Correo enviado"
msgid "You need to set your user email before being able to send test emails."
msgstr "É necesario configurar o correo do usuario antes de poder enviar mensaxes de correo de proba."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Modo de envÃo"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Cifrado"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Método de autenticación"
@@ -100,6 +100,16 @@ msgstr "Non foi posÃbel descifrar os seus ficheiros. revise o ficheiro de rexis
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "Non foi posÃbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "As chaves de cifrado foron eliminadas permanentemente"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Non foi posÃbel eliminar permanentemente as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador"
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Correo gardado"
@@ -116,6 +126,16 @@ msgstr "Non é posÃbel eliminar o grupo."
msgid "Unable to delete user"
msgstr "Non é posÃbel eliminar o usuario"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "As copias de seguranza foron restauradas satisfactoriamente"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Non foi posÃbel restaurar as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador"
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "O idioma cambiou"
@@ -171,7 +191,7 @@ msgstr "A infraestrutura non admite o cambio de contrasinal, mais a chave de cif
msgid "Unable to change password"
msgstr "Non é posÃbel cambiar o contrasinal"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Enviando..."
@@ -227,34 +247,42 @@ msgstr "Actualizar"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Seleccione unha imaxe para o perfil"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Contrasinal moi feble"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Contrasinal feble"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Contrasinal non moi aló"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Bo contrasinal"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Contrasinal forte"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Descifrando ficheiros... isto pode levar un anaco."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Eliminar permanentemente as chaves de cifrado."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Restaurar as chaves de cifrado."
+
#: js/users.js:47
msgid "deleted"
msgstr "eliminado"
@@ -267,8 +295,8 @@ msgstr "desfacer"
msgid "Unable to remove user"
msgstr "Non é posÃbel retirar o usuario"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupos"
@@ -300,7 +328,7 @@ msgstr "Debe fornecer un contrasinal"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Aviso: O directorio persoal para o usuario «{user}» xa existe"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Galego"
@@ -368,7 +396,7 @@ msgid ""
"root."
msgstr "O seu cartafol de datos e os seus ficheiros probabelmente sexan accesÃbeis a través de internet. O ficheiro .htaccess non está a traballar. SuxerÃmoslle que configure o seu servidor web de tal maneira que o cartafol de datos non estea accesÃbel ou que mova o o directorio de datos fóra da raÃz de documentos do servidor web."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Configurar os avisos"
@@ -383,53 +411,65 @@ 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>"
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Non se atopou o módulo «fileinfo»"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "A versión de PHP está desactualizada"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "A versión de PHP está desactualizada. Recomendámoslle que a actualice á versión 5.3.8 ou posterior xa que as versións anteriores son coñecidas por estragarse. É probábel que esta instalación no estea a funcionar correctamente."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "A configuración rexional non funciona"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Non é posÃbel estabelecer a configuración rexional do sistema a unha que admita UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Isto significa que pode haber problemas con certos caracteres en nomes de ficheiro."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Recomendamoslle que instale no sistema os paquetes necesarios para admitir unha das seguintes configuracións rexionais: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "A conexión á Internet non funciona"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -438,198 +478,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Este servidor non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicativos de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envÃo de mensaxes de notificación poderÃan non funcionar. SuxerÃmoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "O último «cron» executouse ás %s."
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "O último «cron» executouse ás %s. Isto supón que pasou máis dunha hora. polo que semella que algo vai mal."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "«Cron» aÃnda non foi executado!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Executar unha tarefa con cada páxina cargada"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Use o servizo de sistema cron para chamar ao ficheiro cron.php cada 15 minutos."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Compartindo"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Activar o API para compartir"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Permitir que os aplicativos empreguen o API para compartir"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Permitir ligazóns"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permitir que os usuarios compartan elementos ao público con ligazóns"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr "Forzar a protección por contrasinal"
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Permitir os envÃos públicos"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permitir que os usuarios lle permitan a outros enviar aos seus cartafoles compartidos publicamente"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "Definir a data predeterminada de caducidade"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Caduca após"
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "dÃas"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Obrigar a data de caducidade"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Permitir que os usuarios compartan elementos ao público con ligazóns"
-#: templates/admin.php:235
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Permitir compartir"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Permitir que os usuarios compartan de novo os elementos compartidos con eles"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Permitir que os usuarios compartan con calquera"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Permitir que os usuarios compartan só cos usuarios dos seus grupos"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Permitir o envÃo de notificacións por correo"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr "Definir a data predeterminada de caducidade"
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Caduca após"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr "ExcluÃr grupos da compartición"
-#: templates/admin.php:266
-msgid "days"
-msgstr "dÃas"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr "Obrigar a data de caducidade"
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "As comparticións, de xeito predeterminado, caducan aos N dÃas"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Estes grupos poderán recibir comparticións, mais non inicialas."
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Seguranza"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Forzar HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Forzar que os clientes se conecten a %s empregando unha conexión cifrada."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Conéctese a %s empregando HTTPS para activar ou desactivar o forzado de SSL."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Servidor de correo"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "Isto utilizase para o envÃo de notificacións."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Desde o enderezo"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr "correo"
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "RequÃrese autenticación"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Enderezo do servidor"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Porto"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Credenciais"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "Nome de usuario SMTP"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "Contrasinal SMTP"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Correo de proba dos axustes"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Enviar o correo"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Rexistro"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Nivel de rexistro"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Máis"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -782,29 +830,33 @@ msgstr "Idioma"
msgid "Help translate"
msgstr "Axude na tradución"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Empregue esta ligazón <a href=\"%s\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "O aplicativo de cifrado non está activado, descifre todos os ficheiros"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Contrasinal de acceso"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Descifrar todos os ficheiros"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posÃbel descifrar correctamente todos os ficheiros."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Restaurar as chaves de cifrado"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Eliminar as chaves de cifrado"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Nome de acceso"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 8a61171fc30f84458441377fac3094c9c4ead851..543fbf1df202cfbe64ea898d61ccadbb3e0acdb3 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -5,12 +5,13 @@
# Translators:
# mbouzada <mbouzada@gmail.com>, 2013
# mbouzada <mbouzada@gmail.com>, 2014
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 09:59+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:07+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"
@@ -72,6 +73,10 @@ msgstr "Tomar os recentes axustes de configuración do servidor?"
msgid "Keep settings?"
msgstr "Manter os axustes?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Servidor"
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Non é posÃbel engadir a configuración do servidor"
@@ -88,6 +93,18 @@ msgstr "Correcto"
msgid "Error"
msgstr "Erro"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Por favor indique un DN base"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Non se puido determinar o DN base"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Por favor indique un porto"
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Configuración correcta"
@@ -128,28 +145,44 @@ msgstr "Confirma que quere eliminar a configuración actual do servidor?"
msgid "Confirm Deletion"
msgstr "Confirmar a eliminación"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "Atopouse %s grupo"
msgstr[1] "Atopáronse %s grupos"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "Atopouse %s usuario"
msgstr[1] "Atopáronse %s usuarios"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Máquina incorrecta"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Non foi posÃbel atopar a función desexada"
+#: settings.php:52
+msgid "Server"
+msgstr "Servidor"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Filtro do usuario"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Filtro de acceso"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtro de grupo"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Gardar"
@@ -222,10 +255,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso. Exemplo: «uid=%%uid»"
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Servidor"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Servidor:"
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Engadir a configuración do servidor"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Eliminar a configuración"
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Servidor"
@@ -289,6 +335,14 @@ msgstr "Atrás"
msgid "Continue"
msgstr "Continuar"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Experto"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avanzado"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 0c1bcd3e2b9f49a03c493f53c7c6e9dae76302dd..d0df944bd3ea55aac37fd11e4581a21fbc12e673 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -40,6 +40,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -60,207 +65,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "×™×•× ×¨×שון"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "×™×•× ×©× ×™"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "×™×•× ×©×œ×™×©×™"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "×™×•× ×¨×‘×™×¢×™"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "×™×•× ×—×ž×™×©×™"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "×™×•× ×©×™×©×™"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "שבת"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "×™× ×•×ר"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "פברו×ר"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "מרץ"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "×פריל"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "מ××™"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "×™×•× ×™"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "יולי"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "×וגוסט"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "ספטמבר"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "×וקטובר"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "× ×•×‘×ž×‘×¨"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "דצמבר"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "הגדרות"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "שמירה…"
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "×©× ×™×•×ª"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "×œ×¤× ×™ %n דקה"
msgstr[1] "×œ×¤× ×™ %n דקות"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "×œ×¤× ×™ %n שעה"
msgstr[1] "×œ×¤× ×™ %n שעות"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "היו×"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "×תמול"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "×œ×¤× ×™ %n יו×"
msgstr[1] "×œ×¤× ×™ %n ימי×"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "חודש שעבר"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "×œ×¤× ×™ %n חודש"
msgstr[1] "×œ×¤× ×™ %n חודשי×"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "×©× ×” שעברה"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "×©× ×™×"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "בחירה"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "כן"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "ל×"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "בחירה"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "בסדר"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "×§×‘×¦×™× ×—×“×©×™×"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "ביטול"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -292,140 +297,149 @@ msgstr "שותף"
msgid "Share"
msgstr "שתף"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "שגי××”"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "שגי××” במהלך השיתוף"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "שגי××” במהלך ביטול השיתוף"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "שגי××” במהלך ×©×™× ×•×™ ההגדרות"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "שותף ×תך ×•×¢× ×”×§×‘×•×¦×” {group} שבבעלות {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "שותף ×תך על ידי {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "×”×’× ×” בססמה"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "סיסמ×"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "שליחת קישור בדו×״ל למשתמש"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "שליחה"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "הגדרת ת×ריך תפוגה"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "ת×ריך התפוגה"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "שיתוף ב×מצעות דו×״ל:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "×œ× × ×ž×¦×ו ×× ×©×™×"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "קבוצה"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "×סור לעשות שיתוף מחדש"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "שותף תחת {item} ×¢× {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "הסר שיתוף"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "× ×™×ª×Ÿ לערוך"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "בקרת גישה"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "יצירה"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "עדכון"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "מחיקה"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "שיתוף"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "מוגן בססמה"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "×ירעה שגי××” בביטול ת×ריך התפוגה"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "×ירעה שגי××” בעת הגדרת ת×ריך התפוגה"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "מתבצעת שליחה ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "הודעת הדו×״ל × ×©×œ×—×”"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "×זהרה"
@@ -457,18 +471,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "תהליך העדכון ×œ× ×”×•×©×œ× ×‘×”×¦×œ×—×”. × × ×“×•×•×— ×ת הבעיה ב<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">קהילת ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "תהליך העדכון ×”×¡×ª×™×™× ×‘×”×¦×œ×—×”. עכשיו ×ž× ×ª×‘ ×ותך ×ל ownCloud."
@@ -669,6 +684,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "יצירת <strong>חשבון ×ž× ×”×œ</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "סיסמ×"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -794,8 +813,27 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "מעדכן ×ת ownCloud ×ל ×’×¨×¡× %s, ×–×” עלול לקחת זמן מה."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/he/files.po b/l10n/he/files.po
index da41dbd1866cf7746de8fb9bab680a523f090a8c..850f1b2a11b14262928f60db160e0e3f302dbf89 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr "×œ× × ×™×ª×Ÿ להעביר ×ת %s - קובץ ×‘×©× ×”×–×” כבר קי
msgid "Could not move %s"
msgstr "×œ× × ×™×ª×Ÿ להעביר ×ת %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "×©× ×§×•×‘×¥ ××™× ×• יכול להיות ריק"
@@ -38,18 +38,18 @@ msgstr "×©× ×§×•×‘×¥ ××™× ×• יכול להיות ריק"
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "×”×©× ×©×’×•×™, ×סור להשתמש ×‘×ª×•×•×™× '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -125,44 +125,48 @@ msgstr "תקיה ×–×ž× ×™×ª חסרה"
msgid "Failed to write to disk"
msgstr "הכתיבה ×œ×›×•× ×Ÿ × ×›×©×œ×”"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "×ין די שטח ×¤× ×•×™ ב×חסון"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "העל××” × ×›×©×œ×”. ×œ× × ×™×ª×Ÿ להשיג ×ת פרטי הקובץ."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "תיקייה שגויה."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "קבצי×"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "ההעל××” בוטלה."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "×œ× × ×™×ª×Ÿ לגשת לתוצ×ות מהשרת."
@@ -175,120 +179,120 @@ msgstr "מתבצעת כעת העל×ת קבצי×. עזיבה של העמוד ת
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} כבר קיי×"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "שתף"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "מחק לצמיתות"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "×©×™× ×•×™ ש×"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "ממתין"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "שגי××”"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "ש×"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "גודל"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "זמן ×©×™× ×•×™"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "שטח ×”×חסון שלך כמעט ×ž×œ× ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -298,12 +302,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -340,68 +344,75 @@ msgstr "גודל הקלט המרבי לקובצי ZIP"
msgid "Save"
msgstr "שמירה"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "חדש"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "קובץ טקסט"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "תיקייה"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "מקישור"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "×§×‘×¦×™× ×©× ×ž×—×§×•"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "ביטול ההעל××”"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "×ין ×›×ן ×©×•× ×“×‘×¨. ×ולי ×‘×¨×¦×•× ×š להעלות משהו?"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "הורדה"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "מחיקה"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "העל××” גדולה מידי"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "×”×§×‘×¦×™× ×©× ×™×¡×™×ª להעלות חרגו מהגודל המקסימלי להעל×ת ×§×‘×¦×™× ×¢×œ שרת ×–×”."
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "×”×§×‘×¦×™× × ×¡×¨×§×™×, × × ×œ×”×ž×ª×™×Ÿ."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "הסריקה ×”× ×•×›×—×™×ª"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index c401f90b5f359ca46cd1096fecbfa1ca05a9c691..264c161a9f5dbac46cd83c4cb594fb34779fb4d0 100644
--- a/l10n/he/files_encryption.po
+++ b/l10n/he/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "×”×¦×¤× ×”"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index f108a6be95f3ca6a0667dd3620459977e0e74bb7..4860886ee3892777b3562f48dd2ef914e90268ca 100644
--- a/l10n/he/files_external.po
+++ b/l10n/he/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "כתובת"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "מ×רח"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "כתובת"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr "×ירעה שגי××” בעת הגדרת ×חסון ב־Google Drive"
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index 6d584900a50e4089e69c4236a74963a62a481cd2..b73588e396fad5b4d78c0db9ae807ffe328f3fc9 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "שותף בידי {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "סיסמ×"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "הורדה"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index 7c8a27c14a525fc88fa40ee097879ab308b51c82..37e63ba407aa8fa8ea8c3c40b77356224986c07f 100644
--- a/l10n/he/files_trashbin.po
+++ b/l10n/he/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -29,38 +29,34 @@ msgstr "×œ× × ×™×ª×Ÿ למחוק ×ת %s לצמיתות"
msgid "Couldn't restore %s"
msgstr "×œ× × ×™×ª×Ÿ לשחזר ×ת %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "×§×‘×¦×™× ×©× ×ž×—×§×•"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "שחזור"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "שגי××”"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "×§×‘×¦×™× ×©× ×ž×—×§×•"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "שוחזר"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "×ין ×›×ן ×©×•× ×“×‘×¨. סל המיחזור שלך ריק!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "ש×"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "שחזור"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "× ×ž×—×§"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "מחיקה"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index 99ddf4108a107edd8bb71625eb5bc5b068eaf706..b5cc029f2b11746b268f679e6411ae1551f1e40f 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr "שירותי רשת תחת השליטה שלך"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "הורדת ZIP כבויה"
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "יש להוריד ×ת ×”×§×‘×¦×™× ×חד ×חרי ×”×©× ×™."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "חזרה לקבצי×"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "×”×§×‘×¦×™× ×”× ×‘×—×¨×™× ×’×“×•×œ×™× ×ž×™×“×™ ליצירת קובץ zip."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "שרת ×”××™× ×˜×¨× ×˜ שלך ××™× ×• מוגדר לצורכי ×¡× ×›×¨×•×Ÿ ×§×‘×¦×™× ×¢×“×™×™×Ÿ כיוון ×©×ž× ×©×§ ×”Ö¾WebDAV ×›× ×¨××” ××™× ×• תקין."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "× × ×œ×¢×™×™×Ÿ שוב ב<a href='%s'>מדריכי ×”×”×ª×§× ×”</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s שיתף/שיתפה ×יתך ×ת »%s«"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "×œ× × ×™×ª×Ÿ ×œ×ž×¦×•× ×ת הקטגוריה „%s“"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 25c7982331117435da332ac9ae0cb60d1c05f7a1..1cb91987071471ce236a972c5878e776cf5283ce 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "הודעת הדו×״ל × ×©×œ×—×”"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "×”×¦×¤× ×”"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -99,6 +99,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "הדו×״ל × ×©×ž×¨"
@@ -115,6 +125,16 @@ msgstr "×œ× × ×™×ª×Ÿ למחוק ×ת הקבוצה"
msgid "Unable to delete user"
msgstr "×œ× × ×™×ª×Ÿ למחוק ×ת המשתמש"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "שפה ×”×©×ª× ×ª×”"
@@ -170,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -226,34 +246,42 @@ msgstr "עדכון"
msgid "Updated"
msgstr "מעודכן"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "× ×ž×—×§"
@@ -266,8 +294,8 @@ msgstr "ביטול"
msgid "Unable to remove user"
msgstr "×œ× × ×™×ª×Ÿ להסיר ×ת המשתמש"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "קבוצות"
@@ -299,7 +327,7 @@ msgstr "יש לספק ססמה ×ª×§× ×™×ª"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "עברית"
@@ -367,7 +395,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "שגי×ת הגדרה"
@@ -382,53 +410,65 @@ msgstr "שרת ×”××™× ×˜×¨× ×˜ שלך ××™× ×• מוגדר לצורכי ×¡× ×›×¨
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "המודול „fileinfo“ חסר"
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "החיבור ל××™× ×˜×¨× ×˜ ××™× ×• פעיל"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -437,198 +477,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "יש להפעיל משימה ×חת ×¢× ×›×œ עמוד ×©× ×˜×¢×Ÿ"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "שיתוף"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "הפעלת API השיתוף"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "ל×פשר ×œ×™×™×©×•× ×œ×”×©×ª×ž×© ב־API השיתוף"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "ל×פשר קישורי×"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "ל×פשר ×œ×ž×©×ª×ž×©×™× ×œ×©×ª×£ ×¤×¨×™×˜×™× "
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "ל×פשר ×œ×ž×©×ª×ž×©×™× ×œ×©×ª×£ ×¤×¨×™×˜×™× "
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "ל×פשר שיתוף מחדש"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "ל×פשר ×œ×ž×©×ª×ž×©×™× ×œ×©×ª×£ הל××” ×¤×¨×™×˜×™× ×©×©×•×ª×¤×• ×ת×"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "ל×פשר ×œ×ž×©×ª×ž×©×™× ×œ×©×ª×£ ×¢× ×›×œ ×חד"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "ל×פשר ×œ×ž×©×ª×ž×©×™× ×œ×©×ª×£ ×¢× ×ž×©×ª×ž×©×™× ×‘×§×‘×•×¦×•×ª ×©×œ×”× ×‘×œ×‘×“"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "×בטחה"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "ל×לץ HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "כתובת שרת"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "פורט"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "פרטי גישה"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "יומן"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "רמת הדיווח"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "יותר"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "פחות"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "גרס×"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +829,33 @@ msgstr "פה"
msgid "Help translate"
msgstr "עזרה בתרגו×"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr ""
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr ""
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "×©× ×›× ×™×¡×”"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 8b3b7cf4ecf00138b86f6e6313bfa5822eee0fc8..5d06254e50ae1081d29558e40b30fd111e6a3ad0 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr ""
msgid "Keep settings?"
msgstr "×”×× ×œ×©×ž×•×¨ ×ת ההגדרות?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "×œ× × ×™×ª×Ÿ להוסיף ×ת הגדרות השרת"
@@ -87,6 +91,18 @@ msgstr ""
msgid "Error"
msgstr "שגי××”"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -127,28 +143,44 @@ msgstr "×”×× ×כן למחוק ×ת הגדרות השרת ×”× ×•×›×—×™×•×ª?"
msgid "Confirm Deletion"
msgstr "×ישור המחיקה"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "×¡× ×Ÿ קבוצה"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "שמירה"
@@ -221,10 +253,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "הוספת הגדרות השרת"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "מ×רח"
@@ -288,6 +333,14 @@ msgstr "×חורה"
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "מתקד×"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 4473eb226f6091b058d99fcbc3731a39899a18a0..a31447e6b21ab293e9dfb194722b4815d4fce6ac 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -40,6 +40,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -60,207 +65,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "रविवार"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "सोमवार"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "मंगलवार"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "बà¥à¤§à¤µà¤¾à¤°"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "बृहसà¥à¤ªà¤¤à¤¿à¤µà¤¾à¤°"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "शà¥à¤•à¥à¤°à¤µà¤¾à¤°"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "शनिवार"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "जनवरी"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "फरवरी"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "मारà¥à¤š"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "अपà¥à¤°à¥ˆà¤²"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "मई"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "जून"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "जà¥à¤²à¤¾à¤ˆ"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "अगसà¥à¤¤"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "सितमà¥à¤¬à¤°"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "अकà¥à¤Ÿà¥‚बर"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "नवंबर"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "दिसमà¥à¤¬à¤°"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "सेटिंगà¥à¤¸"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -292,140 +297,149 @@ msgstr ""
msgid "Share"
msgstr "साà¤à¤¾ करें"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "तà¥à¤°à¥à¤Ÿà¤¿"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "पासवरà¥à¤¡"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "à¤à¥‡à¤œà¥‡à¤‚"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "कोई वà¥à¤¯à¤•à¥à¤¤à¤¿ नहीं मिले "
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "à¤à¥‡à¤œà¤¾ जा रहा है"
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "ईमेल à¤à¥‡à¤œ दिया गया है "
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "चेतावनी "
@@ -457,18 +471,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -669,6 +684,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "वà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾à¤ªà¤• खाता बनाà¤à¤"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "पासवरà¥à¤¡"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -794,7 +813,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index cbc1e690120b7afb263a15c913d7fdede4d0293b..e5ef5a27782613ed526f330035e85a32766e5f6f 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "साà¤à¤¾ करें"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "तà¥à¤°à¥à¤Ÿà¤¿"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr "सहेजें"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
index 104713bda5236328b24a7a5db5d5e9cd36c83827..53023152cba9319ffaeca21a58a8c7a85d026751 100644
--- a/l10n/hi/files_encryption.po
+++ b/l10n/hi/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/hi/files_external.po b/l10n/hi/files_external.po
index 04f3394a00461a1471d2103ac54513765e738817..e91207b3c255526e3d7937f9775f11aeae6572ee 100644
--- a/l10n/hi/files_external.po
+++ b/l10n/hi/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index 30d97d9bab6885184aacd1958577f5f8e8e9178f..d43fe747d484576dc14474fba9fd6802b8d795a7 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "पासवरà¥à¤¡"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po
index 52aeadc9bab7d0434a9eee899c48db262421c862..f6d80739015f1b89ed0c70cc242cb8af51021094 100644
--- a/l10n/hi/files_trashbin.po
+++ b/l10n/hi/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "तà¥à¤°à¥à¤Ÿà¤¿"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index fcdf83fbe958fdafa9481cdac20bf527ca906855..d5b0726cb5ba652db1579aa962c7fdd774e42f4d 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index a9baff8ff4c3ca367bf3488d1b8d1d24b01d3bde..86ff6a11127ded99f5744d77defbd29ef518e67a 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "ईमेल à¤à¥‡à¤œ दिया गया है "
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr "अदà¥à¤¯à¤¤à¤¨"
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 160ec120ad8d3f9f2070f17c3c23be2e88aa38d0..4faae997df8d0cf19878bea3ca26f491b6de7ea1 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "तà¥à¤°à¥à¤Ÿà¤¿"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "सहेजें"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "उनà¥à¤¨à¤¤"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/hi_IN/core.po b/l10n/hi_IN/core.po
index 4f30be9a5f41411875a60b16bcbfe7bab349d26e..48297c5806ab757d622201d9d7adae41086ebd53 100644
--- a/l10n/hi_IN/core.po
+++ b/l10n/hi_IN/core.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: hi_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/hi_IN/files.po b/l10n/hi_IN/files.po
index 9d2bc85b7fc8000c7cda79446dcfe65c56289574..b7855ecc3b396bb480dbba7ca0b9deb827fb06da 100644
--- a/l10n/hi_IN/files.po
+++ b/l10n/hi_IN/files.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/hi_IN/files_encryption.po b/l10n/hi_IN/files_encryption.po
index aaaade5301bc749826965ba9cf618c82de96fb87..2e3ec67f708ecab6149d9b9ed45eee3783e35b89 100644
--- a/l10n/hi_IN/files_encryption.po
+++ b/l10n/hi_IN/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/hi_IN/files_external.po b/l10n/hi_IN/files_external.po
index ea9c72f4436b618525de6d271a0d9484b0049cb9..b6de970ffe2d35654cad59825e81194af1e32190 100644
--- a/l10n/hi_IN/files_external.po
+++ b/l10n/hi_IN/files_external.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/hi_IN/files_sharing.po b/l10n/hi_IN/files_sharing.po
index f8e42e4b8211ffceaa32574c6e6222da175d379f..69ca3dbf30694aab4a7a6aadc273a23bbd1edabb 100644
--- a/l10n/hi_IN/files_sharing.po
+++ b/l10n/hi_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: hi_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/hi_IN/files_trashbin.po b/l10n/hi_IN/files_trashbin.po
index 9e755abe4423ce8e401d120eab21299c1ed23e6b..abb5d87ac5f2bb18e815d80970c35e708531f718 100644
--- a/l10n/hi_IN/files_trashbin.po
+++ b/l10n/hi_IN/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/filelist.js:88 js/filelist.js:132 js/filelist.js:181
-msgid "Error"
-msgstr ""
-
-#: js/trash.js:48 templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
msgid "Restore"
msgstr ""
-#: js/trash.js:107
-msgid "Deleted Files"
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
msgstr ""
#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
diff --git a/l10n/hi_IN/lib.po b/l10n/hi_IN/lib.po
index bdbc1e8aec5604dc1d864638412e126a0f20fca1..7bdd0ad7ece3ca538d1a17650937747732ace9fe 100644
--- a/l10n/hi_IN/lib.po
+++ b/l10n/hi_IN/lib.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: hi_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:712
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:713
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -289,116 +289,127 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/hi_IN/settings.po b/l10n/hi_IN/settings.po
index 148419f9261f81eab0faaf819505c6a4b73225eb..41120d38033fdb95a385d0724c7f03e8f5fd4556 100644
--- a/l10n/hi_IN/settings.po
+++ b/l10n/hi_IN/settings.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/hi_IN/user_ldap.po b/l10n/hi_IN/user_ldap.po
index 29026c512f7a7880890bd7dbf09a6fc567bbd9bd..fd1e491c3e14ccbaa11ae26fc7bd4dbd83ae6d8e 100644
--- a/l10n/hi_IN/user_ldap.po
+++ b/l10n/hi_IN/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr ""
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 451dd20c3d236c31be8e517b40715c9ff994bc08..96adbb5a8c5ab8ef46f2646042d780d6465f9d6e 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: hr\n"
"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;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,212 +63,212 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "nedelja"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "ponedeljak"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "utorak"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "srijeda"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Äetvrtak"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "petak"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "subota"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "SijeÄanj"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "VeljaÄa"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Ožujak"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Travanj"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Svibanj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Lipanj"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Srpanj"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Kolovoz"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Rujan"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Listopad"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Studeni"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Prosinac"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Postavke"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Spremanje..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "sekundi prije"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "danas"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "juÄer"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "prošli mjesec"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "prošlu godinu"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "godina"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Izaberi"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Izaberi"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "U redu"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Odustani"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -295,140 +300,149 @@ msgstr ""
msgid "Share"
msgstr "Podijeli"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Greška"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Greška prilikom djeljenja"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "GreÅ¡ka prilikom iskljuÄivanja djeljenja"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Greška prilikom promjena prava"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Zaštiti lozinkom"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Lozinka"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Postavi datum isteka"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Datum isteka"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Dijeli preko email-a:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Osobe nisu pronađene"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Ponovo dijeljenje nije dopušteno"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Makni djeljenje"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "može mjenjat"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "kontrola pristupa"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "kreiraj"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "ažuriraj"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "izbriši"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "djeli"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Zaštita lozinkom"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Greška prilikom brisanja datuma isteka"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Greška prilikom postavljanja datuma isteka"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -460,18 +474,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -672,6 +687,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Stvori <strong>administratorski raÄun</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Lozinka"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -797,7 +816,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index a1b83821589d2692926c1170edb663a5350cdc10..e47d2025836482aa10e25e6ef58332a1e6b868f3 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr "Nedostaje privremeni direktorij"
msgid "Failed to write to disk"
msgstr "Neuspjelo pisanje na disk"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Datoteke"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Slanje poništeno."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,123 +177,123 @@ msgstr "UÄitavanje datoteke. NapuÅ¡tanjem stranice će prekinuti uÄitavanje."
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Podijeli"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Promjeni ime"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "U tijeku"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Greška"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Ime"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "VeliÄina"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Zadnja promjena"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -299,12 +303,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -341,68 +345,75 @@ msgstr "Maksimalna veliÄina za ZIP datoteke"
msgid "Save"
msgstr "Snimi"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "novo"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "tekstualna datoteka"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "mapa"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Prekini upload"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Nema niÄega u ovoj mapi. PoÅ¡alji neÅ¡to!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Preuzimanje"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Obriši"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Prijenos je preobiman"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Datoteke se skeniraju, molimo priÄekajte."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Trenutno skeniranje"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
index c74c2e8dffc22e97739d6eacad3fdb4f294148a7..99329d32d46682a183bd4eaaa482226f813d5568 100644
--- a/l10n/hr/files_encryption.po
+++ b/l10n/hr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index 9c56b0b0cd837409b7a6170c2c688d3a306bf2a0..d11898f05d862aca142b2796b1e71d77da316892 100644
--- a/l10n/hr/files_external.po
+++ b/l10n/hr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:10+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 61ea14d646596112fe777f8bb28b3db292a67bf0..743985ef7c53457758a2522e223f209328286a30 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: hr\n"
"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;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "Lozinka"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "Preuzimanje"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index dad78c7dfa3bb24e91b43ba176be6f40fa9ab53e..446092abefd68287cf8103c999692160850dc9ee 100644
--- a/l10n/hr/files_trashbin.po
+++ b/l10n/hr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Greška"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Ime"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Obriši"
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index 51b1eede43e514a0140c3e0b10a2cb674aee20e3..87c4c38f653299f3c280aaebc4415b18541aa453 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: hr\n"
"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;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr "web usluge pod vašom kontrolom"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 2adeb872451a6f3cb72bbf46ab31ec5f6b44b73f..d4c01ea39c236d0b77031fff47419ab48030c1c7 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Email spremljen"
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Jezik promijenjen"
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "izbrisano"
@@ -265,8 +293,8 @@ msgstr "vrati"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupe"
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__ime_jezika__"
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "dnevnik"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "više"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr "Jezik"
msgid "Help translate"
msgstr "Pomoć prevesti"
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index d109f42db8b07787194bf2d4fa7e20b865c25c14..cc68e26044f440cc8188e67f1a904a63f0e01312 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "Greška"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,7 +142,7 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -134,7 +150,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -142,14 +158,30 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Snimi"
@@ -222,10 +254,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -289,6 +334,14 @@ msgstr "Natrag"
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Napredno"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index d59e9bcc35c82f294358e85db077014cce4f6d0c..902ea2874c94afc3b0cb113d69545be67ea635f7 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -6,14 +6,14 @@
# sherlock79 <inactive+sherlock79@transifex.com>, 2013
# ebela <bela@dandre.hu>, 2013
# aries1980 <feher.janos@mindworks.hu>, 2014
-# Laszlo Tornoci <torlasz@gmail.com>, 2013
+# Laszlo Tornoci <torlasz@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
-"Last-Translator: aries1980 <feher.janos@mindworks.hu>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -21,11 +21,11 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "Múltbéli lejárati idő."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s"
@@ -40,7 +40,12 @@ msgstr "A karbantartási mód kikapcsolva"
#: ajax/update.php:16
msgid "Updated database"
-msgstr "FrissÃtet adatbázis"
+msgstr "Az adatbázis frissÃtése megtörtént"
+
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
#: avatar/controller.php:62
msgid "No image or file provided"
@@ -48,7 +53,7 @@ msgstr "Nincs kép vagy file megadva"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr "Ismeretlen file tipús"
+msgstr "Ismeretlen fájltÃpus"
#: avatar/controller.php:85
msgid "Invalid image"
@@ -56,215 +61,215 @@ 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"
+msgstr "Az átmeneti profilkép nem elérhető, próbálja újra"
#: avatar/controller.php:135
msgid "No crop data provided"
msgstr "Vágáshoz nincs adat megadva"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "vasárnap"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "hétfő"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "kedd"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "szerda"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "csütörtök"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "péntek"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "szombat"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "január"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "február"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "március"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "április"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "május"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "június"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "július"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "augusztus"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "szeptember"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "október"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "november"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "december"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "BeállÃtások"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Mentés..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "pár másodperce"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n perccel ezelőtt"
msgstr[1] "%n perccel ezelőtt"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n órával ezelőtt"
msgstr[1] "%n órával ezelőtt"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "ma"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "tegnap"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n nappal ezelőtt"
msgstr[1] "%n nappal ezelőtt"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "múlt hónapban"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n hónappal ezelőtt"
msgstr[1] "%n hónappal ezelőtt"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "tavaly"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "több éve"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Válasszon"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Nem sikerült betölteni a fájlkiválasztó sablont: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Igen"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nem"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Válasszon"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Nem sikerült betölteni a fájlkiválasztó sablont: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Nem sikerült betölteni az üzenet sablont: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} fájl ütközik"
msgstr[1] "{count} fájl ütközik"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Egy file ütközik"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Új fájlok"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
-msgstr "A fájlok már láteznek"
+msgstr "A fájlok már léteznek"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
-msgstr "Melyik file-okat akarod megtartani?"
+msgstr "Melyik fájlokat akarja megtartani?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
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."
+msgstr "Ha mindkét verziót kiválasztja, a másolt fájlok neve sorszámozva lesz."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Mégsem"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Folytatás"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(az összes ki lett választva)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} lett kiválasztva)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
-msgstr "Hiba a létező sablon betöltésekor"
+msgstr "Hiba a létezőfájl-sablon betöltésekor"
#: js/setup.js:84
msgid "Very weak password"
@@ -294,140 +299,149 @@ msgstr "Megosztott"
msgid "Share"
msgstr "Megosztás"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Hiba"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Nem sikerült létrehozni a megosztást"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Nem sikerült visszavonni a megosztást"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Nem sikerült módosÃtani a jogosultságokat"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Megosztotta Önnel és a(z) {group} csoporttal: {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Megosztotta Önnel: {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "Megosztani egy felhasználóval vagy csoporttal ..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Megosztás hivatkozással"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le"
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr "A nyilvános link érvényessége alapértelmezetten {days} nap múlva jár le"
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Jelszóval is védem"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Jelszó"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr "Válasszon egy jelszót a nyilvános linkhez"
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Feltöltést is engedélyezek"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Email cÃmre küldjük el"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Küldjük el"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Legyen lejárati idő"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "A lejárati idő"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Megosztás emaillel:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Nincs találat"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "csoport"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Megosztva {item}-ben {user}-rel"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "A megosztás visszavonása"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "email értesÃtés"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "módosÃthat"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "jogosultság"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "létrehoz"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "szerkeszt"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "töröl"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "megoszt"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Jelszóval van védve"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Nem sikerült a lejárati időt törölni"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Nem sikerült a lejárati idÅ‘t beállÃtani"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Küldés ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Az emailt elküldtük"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Figyelmeztetés"
@@ -459,18 +473,19 @@ msgstr "Hiba a párbeszédpanel-sablon betöltésekor: {error}"
msgid "No tags selected for deletion."
msgstr "Nincs törlésre kijelölt cÃmke."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
-msgstr "Kérlek tölts be újra az oldalt"
+msgstr "Kérjük frissÃtse az oldalt!"
-#: 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 "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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
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."
@@ -527,7 +542,7 @@ msgstr "VisszaállÃtás"
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
-msgstr "Jelszó megváltoztatva"
+msgstr "A jelszava megváltozott"
#: lostpassword/templates/resetpassword.php:5
msgid "To login page"
@@ -617,7 +632,7 @@ msgid ""
"just letting you know that %s shared %s with you.\n"
"View it: %s\n"
"\n"
-msgstr "Szia!\\n\n\\n\nÉrtesÃtünk, hogy %s megosztotta veled a következÅ‘t: %s.\\n\nItt tudod megnézni: %s\\n\n\\n"
+msgstr "Ãœdv!\\n\n\\n\nÉrtesÃtjük, hogy %s megosztotta Önnel a következÅ‘t: %s.\\n\nItt lehet megnézni: %s\\n\n\\n"
#: templates/altmail.php:4 templates/mail.php:17
#, php-format
@@ -671,9 +686,13 @@ msgstr "A kiszolgáló megfelelÅ‘ beállÃtásához kérjük olvassa el a <a hre
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>Rendszergazdai belépés</strong> létrehozása"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Jelszó"
+
#: templates/installation.php:70
msgid "Storage & database"
-msgstr "Tárolás & adatbázis"
+msgstr "Tárolás és adatbázis"
#: templates/installation.php:77
msgid "Data folder"
@@ -720,7 +739,7 @@ msgid ""
"This application requires JavaScript to be enabled for correct operation. "
"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
"JavaScript</a> and re-load this interface."
-msgstr "Az alkalmazás megfelelő működéséhez szükség van JavaScript-re. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Engedélyezd a JavaScript-et</a> és töltsd újra az interfészt."
+msgstr "Az alkalmazás megfelelÅ‘ működéséhez szükség van JavaScriptre. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Engedélyezze a JavaScriptet</a> és frissÃtse az oldalt!"
#: templates/layout.user.php:44
#, php-format
@@ -774,11 +793,11 @@ msgstr "AlternatÃv bejelentkezés"
msgid ""
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
"with you.<br><a href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Ãœdvözöljük!<br><br>\n\nÉrtesÃtjük, hogy %s megosztotta Önnel ezt az állományt: <strong>%s</strong><br>\n<a href=\"%s\">Itt lehet megnézni!</a><br><br>"
#: templates/singleuser.user.php:3
msgid "This ownCloud instance is currently in single user mode."
-msgstr "Az Owncloud frissÃtés elezdÅ‘dött egy felhasználós módban."
+msgstr "Ez az ownCloud szolgáltatás jelenleg egyfelhasználós üzemmódban működik."
#: templates/singleuser.user.php:4
msgid "This means only administrators can use the instance."
@@ -788,7 +807,7 @@ msgstr "Ez azt jelenti, hogy csak az adminisztrátor használhatja ezt a példá
msgid ""
"Contact your system administrator if this message persists or appeared "
"unexpectedly."
-msgstr "Ha ezt az üzenetet már többször látod akkor keresd meg a rendszer adminját."
+msgstr "Ha ez az üzenet ismételten vagy indokolatlanul megjelenik, akkor keresse a rendszergazda segÃtségét!"
#: templates/singleuser.user.php:7 templates/update.user.php:6
msgid "Thank you for your patience."
@@ -796,14 +815,33 @@ msgstr "Köszönjük a türelmét."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Owncloud frissÃtés a %s verzióra folyamatban. Kis türelmet."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
"This ownCloud instance is currently being updated, which may take a while."
-msgstr "Az Owncloud frissÃtés elezdÅ‘dött, eltarthat egy ideig."
+msgstr "Az ownCloud frissÃtés elkezdÅ‘dött, ez eltarthat egy ideig."
#: templates/update.user.php:4
msgid "Please reload this page after a short time to continue using ownCloud."
-msgstr "Frissitsd az oldalt ha \"Please reload this page after a short time to continue using ownCloud. \""
+msgstr "Frissitse az oldalt egy kis idÅ‘ múlva, ha folytatni kÃvánja az ownCloud használatát."
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 5a32398159ecfcc70e5971d142650de517ca916e..34e0a70cfbee53a09dc967c7ae85ab7783ec661f 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a név
msgid "Could not move %s"
msgstr "Nem sikerült %s áthelyezése"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "A fájlnév nem lehet semmi."
@@ -38,18 +38,18 @@ msgstr "A fájlnév nem lehet semmi."
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'"
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -125,44 +125,48 @@ msgstr "Hiányzik egy ideiglenes mappa"
msgid "Failed to write to disk"
msgstr "Nem sikerült a lemezre történÅ‘ Ãrás"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Nincs elég szabad hely."
-#: ajax/upload.php:169
+#: ajax/upload.php:171
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:179
+#: ajax/upload.php:181
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:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Érvénytelen mappa."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Fájlok"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
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:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "A feltöltést megszakÃtottuk."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "A kiszolgálótól nem kapható meg az eredmény."
@@ -175,120 +179,120 @@ msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakÃtja a fel
msgid "URL cannot be empty"
msgstr "Az URL-cÃm nem maradhat kitöltetlenül"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} már létezik"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Az állomány nem hozható létre"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "A mappa nem hozható létre"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "A megadott URL-ről nem sikerül adatokat kapni"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Megosztás"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Végleges törlés"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Ãtnevezés"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Folyamatban"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Az állomány áthelyezése nem sikerült."
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Hiba"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Az állomány nem nevezhető át"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Hiba a file törlése közben."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Név"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Méret"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "MódosÃtva"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n mappa"
msgstr[1] "%n mappa"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n állomány"
msgstr[1] "%n állomány"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n állomány feltöltése"
msgstr[1] "%n állomány feltöltése"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "A tároló majdnem tele van ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Az állományok titkosÃtása engedélyezve van, de az Ön titkos kulcsai nincsenek beállÃtva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Az állományok titkosÃtásához használt titkos kulcsa érvénytelen. Kérjük frissÃtse a titkos kulcs jelszót a személyes beállÃtásokban, hogy ismét hozzáférjen a titkosÃtott állományaihoz!"
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -298,12 +302,12 @@ msgstr "A titkosÃtási funkciót kikapcsolták, de az Ön állományai még min
msgid "{dirs} and {files}"
msgstr "{dirs} és {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s átnevezése nem sikerült"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -340,68 +344,75 @@ msgstr "ZIP-fájlok maximális kiindulási mérete"
msgid "Save"
msgstr "Mentés"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Ezt a cÃmet használd, hogy <a href=\"%s\" target=\"_blank\">hozzáférj a fileokhoz WebDAV-on keresztül</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Új"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Új szöveges file"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Szövegfájl"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Új mappa"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Mappa"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Feltöltés linkről"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Törölt fájlok"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "A feltöltés megszakÃtása"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Önnek nincs jogosultsága ahhoz, hogy ide állományokat töltsön föl, vagy itt újakat hozzon létre"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Itt nincs semmi. Töltsön fel valamit!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Letöltés"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Törlés"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "A feltöltés túl nagy"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "A fájllista ellenőrzése zajlik, kis türelmet!"
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Ellenőrzés alatt"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index 1623bca05435da500d59d3e9c0e5cf0f0edf43db..acbee89e1a8db29135696681fce90d739f0f7016 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-03 01:55-0400\n"
-"PO-Revision-Date: 2014-04-02 20:30+0000\n"
-"Last-Translator: osztraksajt <osztraksajt@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -80,9 +80,9 @@ msgstr "Az állományt nem sikerült dekódolni, valószÃnűleg ez egy megoszto
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Ismeretlen hiba. EllenÅ‘rizze a rendszer beállÃtásait vagy forduljon a rendszergazdához!"
+msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -95,7 +95,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "Kérem gondoskodjon arról, hogy PHP 5.3.3 vagy annál frissebb legyen telepÃtve, továbbá az OpenSSL a megfelelÅ‘ PHP-bÅ‘vÃtménnyel együtt rendelkezésre álljon és helyesen legyen konfigurálva! A titkosÃtó modul egyelÅ‘re kikapcsolásra került."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "A következÅ‘ felhasználók nem állÃtották be a titkosÃtást:"
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index ffa1c9e20c241a793e9fd9e9fdd2a4f7ae30104e..b55fa68968d0a67529582530743e6aef4cf2c404 100644
--- a/l10n/hu_HU/files_external.po
+++ b/l10n/hu_HU/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Kiszolgáló"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,6 +166,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -198,29 +202,29 @@ msgstr "A Google Drive tárolót nem sikerült beállÃtani"
msgid "Saved"
msgstr "Elmentve"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index 5f7118543ea6cbb9dc75d93683764b6a3b1c80a5..3aeed6d2fd38d26fc300182f2aeee7fe01c1cecf 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Megosztotta: {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Ez egy jelszóval védett megosztás"
@@ -34,6 +58,14 @@ msgstr "A megadott jelszó nem megfelelő. Próbálja újra!"
msgid "Password"
msgstr "Jelszó"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Sajnos úgy tűnik, ez a link már nem működik."
@@ -62,11 +94,11 @@ msgstr "További információért forduljon ahhoz, aki ezt a linket küldte Önn
msgid "Download"
msgstr "Letöltés"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Közvetlen link"
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index f8d7db50eb8fddf5145cf2677849e38d20d567e6..99148cee1bd14f63d266f8d0f359bdac0b213e79 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:55+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ 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/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Törölt fájlok"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "VisszaállÃtás"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Hiba"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Törölt fájlok"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "visszaállÃtva"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Itt nincs semmi. Az Ön szemetes mappája üres!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Név"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "VisszaállÃtás"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Törölve"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Törlés"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index d8249e9f3d772346fd828711cd79cacc54b692d8..3e8290b2fbc8d38a1741486b6fd2c86328adf098 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:04+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -79,23 +79,23 @@ msgstr "Hibás kép"
msgid "web services under your control"
msgstr "webszolgáltatások saját kézben"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "A ZIP-letöltés nincs engedélyezve."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "A fájlokat egyenként kell letölteni."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Vissza a Fájlokhoz"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "A kiválasztott fájlok túl nagyok a zip tömörÃtéshez."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -130,29 +130,29 @@ msgstr "Az alkalmazás nem szolgáltatott info.xml file-t"
msgid "App can't be installed because of not allowed code in the App"
msgstr "Az alkalmazást nem lehet telepÃteni, mert abban nem engedélyezett programkód szerepel"
-#: private/installer.php:141
+#: private/installer.php:138
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "Az alalmazás nem telepÃthetÅ‘, mert nem kompatibilis az ownClod ezzel a verziójával."
-#: private/installer.php:147
+#: private/installer.php:144
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "Az alkalmazást nem lehet telepÃteni, mert tartalmazza a \n<shipped>\ntrue\n</shipped>\ncÃmkét, ami a nem szállÃtott alkalmazások esetén nem engedélyezett"
-#: private/installer.php:160
+#: private/installer.php:157
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 "Az alkalmazást nem lehet telepÃteni, mert az info.xml/version-ben megadott verzió nem egyezik az alkalmazás-áruházban feltüntetett verzióval."
-#: private/installer.php:170
+#: private/installer.php:167
msgid "App directory already exists"
msgstr "Az alkalmazás mappája már létezik"
-#: private/installer.php:183
+#: private/installer.php:180
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Nem lehetett létrehozni az alkalmzás mappáját. Kérlek ellenőrizd a jogosultásgokat. %s"
@@ -281,127 +281,138 @@ msgstr "ÃllÃtson be egy felhasználói nevet az adminisztrációhoz."
msgid "Set an admin password."
msgstr "ÃllÃtson be egy jelszót az adminisztrációhoz."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "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."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
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>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s megosztotta Önnel ezt: »%s«"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Ez a kategória nem található: \"%s\""
@@ -454,20 +465,20 @@ msgstr "tavaly"
msgid "years ago"
msgstr "több éve"
-#: private/user/manager.php:232
+#: private/user/manager.php:238
msgid ""
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
"\"0-9\", and \"_.@-\""
msgstr ""
-#: private/user/manager.php:237
+#: private/user/manager.php:243
msgid "A valid username must be provided"
msgstr "Érvényes felhasználónevet kell megadnia"
-#: private/user/manager.php:241
+#: private/user/manager.php:247
msgid "A valid password must be provided"
msgstr "Érvényes jelszót kell megadnia"
-#: private/user/manager.php:246
+#: private/user/manager.php:252
msgid "The username is already being used"
msgstr "Ez a bejelentkezési név már foglalt"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index c35c140aea74bcaf5443eb77745d6b93feda7a36..1375fa2155c76e4554bb300310c6b46a4c550b6f 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: ebela <bela@dandre.hu>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -51,15 +51,15 @@ msgstr "Az emailt elküldtük"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "TitkosÃtás"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -102,6 +102,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Email mentve"
@@ -118,6 +128,16 @@ msgstr "A csoport nem törölhető"
msgid "Unable to delete user"
msgstr "A felhasználó nem törölhető"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "A nyelv megváltozott"
@@ -173,7 +193,7 @@ msgstr "A back-end nem támogatja a jelszó módosÃtást, de felhasználó titk
msgid "Unable to change password"
msgstr "Nem sikerült megváltoztatni a jelszót"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -229,34 +249,42 @@ msgstr "FrissÃtés"
msgid "Updated"
msgstr "FrissÃtve"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Válassz profil képet"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Nagyon gyenge jelszó"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Gyenge jelszó"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Nem túl jó jelszó"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Jó jelszó"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Erős jelszó"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "File-ok kititkosÃtása folyamatban... Kérlek várj, ez hosszabb ideig is eltarthat ..."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "törölve"
@@ -269,8 +297,8 @@ msgstr "visszavonás"
msgid "Unable to remove user"
msgstr "A felhasználót nem sikerült eltávolÃtáni"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Csoportok"
@@ -302,7 +330,7 @@ msgstr "Érvényes jelszót kell megadnia"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Figyelmeztetés: A felhasználó \"{user}\" kezdő könyvtára már létezett"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__language_name__"
@@ -370,7 +398,7 @@ msgid ""
"root."
msgstr "Az adatkönytára és az itt levÅ‘ fájlok valószÃnűleg elérhetÅ‘k az internetrÅ‘l. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon erÅ‘sen ajánlott, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár ne legyen közvetlenül kÃvülrÅ‘l elérhetÅ‘, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kÃvülre."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "A beállÃtással kapcsolatos figyelmeztetés"
@@ -385,53 +413,65 @@ 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>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "A 'fileinfo' modul hiányzik"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "A 'fileinfo' PHP modul hiányzik. ErÅ‘sen javasolt ennek a modulnak a telepÃtése a MIME-tÃpusok felismerésének eredményessé tételéhez."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "A PHP verzió túl régi"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "A PHP verzió túl régi. Nagyon ajánlott legalább az 5.3.8-as vagy újabb verzióra frissÃteni, mert a régebbi verziónál léteznek ismert hibák. Ezért lehet a telepÃtésed elkézelhetÅ‘, hogy nem müködik majd megfelelÅ‘en."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "A nyelvi lokalizáció nem működik"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "A rendszer lokálok nem lehetett olyat beállÃtani ami támogatja az UTF-8-at."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Ez arra utal, hogy probléma lehet néhány karakterrel a file neveiben."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "ErÅ‘sen ajánlott telepÃteni a szükséges csomagokat a rendszeredbe amely támogat egyet a következÅ‘ helyi beállÃtások közül: %s"
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Az internet kapcsolat nem működik"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -440,198 +480,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "A kiszolgálónak nincs müködÅ‘ internet kapcsolata. Ez azt jelenti, hogy néhány képességét a kiszolgálónak mint például becsatolni egy külsÅ‘ tárolót, értesÃtések külsÅ‘ gyártók programjának frissÃtésérÅ‘l nem fog müködni. A távolról való elérése a fileoknak és email értesÃtések küldése szintén nem fog müködni. Ha használni szeretnéd mindezeket a képességeit a szervernek, ahoz javasoljuk, hogy engedélyezzed az internet elérését a szervernek."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Ãœtemezett feladatok"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Használjuk a rendszer cron szolgáltatását, hogy 15 percenként egyszer futtassa le a cron.php-t."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Megosztás"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "A megosztás API-jának engedélyezése"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Linkek engedélyezése"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "LehetÅ‘vé teszi, hogy a felhasználók linkek segÃtségével külsÅ‘sökkel is megoszthassák az adataikat"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Feltöltést engedélyezése mindenki számára"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Engedélyezni a felhasználóknak, hogy beállÃithassák, hogy mások feltölthetnek a nyilvánosan megosztott mappákba."
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "LehetÅ‘vé teszi, hogy a felhasználók linkek segÃtségével külsÅ‘sökkel is megoszthassák az adataikat"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "A továbbosztás engedélyezése"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Lehetővé teszi, hogy a felhasználók a velük megosztott állományokat megosszák egy további, harmadik féllel"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "A felhasználók bárkivel megoszthatják állományaikat"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "A felhasználók csak olyanokkal oszthatják meg állományaikat, akikkel közös csoportban vannak"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "E-mail értesÃtések engedélyezése"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Biztonság"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Kötelező HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "KötelezÅ‘vé teszi, hogy a böngészÅ‘programok titkosÃtott csatornán kapcsolódjanak a %s szolgáltatáshoz."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Kérjük kapcsolodjon a %s rendszerhez HTTPS protokollon keresztül, hogy be vagy ki kapcsoljaa kötelezÅ‘ SSL beállÃtást."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "A kiszolgáló cÃme"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Port"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "AzonosÃtók"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Naplózás"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Naplózási szint"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Több"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Kevesebb"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Verzió"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -784,29 +832,33 @@ msgstr "Nyelv"
msgid "Help translate"
msgstr "SegÃtsen a fordÃtásban!"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Ezt a cÃmet használd, hogy <a href=\"%s\" target=\"_blank\">hozzáférj a fileokhoz WebDAV-on keresztül</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "A titkosÃtó alkalmazás továbbiakban nem lesz engedélyezve, szüntesd meg a titkosÃtását a file-jaidnak."
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Bejelentkezési jelszó"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "KititkosÃtja az összes file-t"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Bejelentkezési név"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 7c9c530c63a65060994ecd9df7401a03779a70b0..34af0a20c32ebb29d8fbf5d5e59332c434ba793f 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: ebela <bela@dandre.hu>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -72,6 +72,10 @@ msgstr "Vegyük át a beállÃtásokat az elÅ‘zÅ‘ konfigurációból?"
msgid "Keep settings?"
msgstr "Tartsuk meg a beállÃtásokat?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Az új kiszolgáló konfigurációja nem hozható létre"
@@ -88,6 +92,18 @@ msgstr "Sikeres végrehajtás"
msgid "Error"
msgstr "Hiba"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Konfiguráció OK"
@@ -128,28 +144,44 @@ msgstr "Tényleg törölni szeretné a kiszolgáló beállÃtásait?"
msgid "Confirm Deletion"
msgstr "A törlés megerÅ‘sÃtése"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s csoport van"
msgstr[1] "%s csoport van"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s felhasználó van"
msgstr[1] "%s felhasználó van"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Érvénytelen gépnév"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "A kÃvánt funkció nem található"
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "A csoportok szűrője"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Mentés"
@@ -222,10 +254,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
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/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Új kiszolgáló beállÃtásának hozzáadása"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Kiszolgáló"
@@ -289,6 +334,14 @@ msgstr "Vissza"
msgid "Continue"
msgstr "Folytatás"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Haladó"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index dc7320cd4d5c9863315765f7b435469bdd3a7219..e588cd09142ace3da02428f830505bdbf4d4d719 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: hy\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Ô¿Õ«Ö€Õ¡Õ¯Õ«"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "ÔµÖ€Õ¯Õ¸Ö‚Õ·Õ¡Õ¢Õ©Õ«"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "ÔµÖ€Õ¥Ö„Õ·Õ¡Õ¢Õ©Õ«"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Õ‰Õ¸Ö€Õ¥Ö„Õ·Õ¡Õ¢Õ©Õ«"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Õ€Õ«Õ¶Õ£Õ·Õ¡Õ¢Õ©Õ«"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "ÕˆÖ‚Ö€Õ¢Õ¡Õ©"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Õ‡Õ¡Õ¢Õ¡Õ©"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Õ€Õ¸Ö‚Õ¶Õ¾Õ¡Ö€"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Õ“Õ¥Õ¿Ö€Õ¾Õ¡Ö€"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Õ„Õ¡Ö€Õ¿"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Ô±ÕºÖ€Õ«Õ¬"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Õ„Õ¡ÕµÕ«Õ½"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Õ€Õ¸Ö‚Õ¶Õ«Õ½"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Õ€Õ¸Ö‚Õ¬Õ«Õ½"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Õ•Õ£Õ¸Õ½Õ¿Õ¸Õ½"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "ÕÕ¥ÕºÕ¿Õ¥Õ´Õ¢Õ¥Ö€"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Õ€Õ¸Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Õ†Õ¸ÕµÕ¥Õ´Õ¢Õ¥Ö€"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Ô´Õ¥Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€"
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 106e741d99b2358f0fd7040bfb7df2d17b514fe4..2c424ac840109dbea883ddb3c896ab77f8dece5e 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr "ÕŠÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/hy/files_encryption.po b/l10n/hy/files_encryption.po
index 6379ac121a6bf269ccbc3421d387085391335621..3e24ddda16b94245ab6a3cb78d3f27ff58f34e98 100644
--- a/l10n/hy/files_encryption.po
+++ b/l10n/hy/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
index 56425dc73708ff04ac02ae09beda7d83f280d271..bcebe524b50be4f585a2332071c09427c8dcdd2a 100644
--- a/l10n/hy/files_external.po
+++ b/l10n/hy/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index 72f66cb45370bf1e6f26730efc47a58f765a8927..c82fe5c91bdd9ffa126e2e76afc4beed3ea02fa5 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: hy\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/hy/files_trashbin.po b/l10n/hy/files_trashbin.po
index f41cdd779887396212ff43968bd2323ecfaffb44..869e6b5ce225f8ad9c497d3ea2cf19d9c734ee25 100644
--- a/l10n/hy/files_trashbin.po
+++ b/l10n/hy/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index 119f580fb4c8636c6f59628321b334d895c764b5..0e88f2068e28c015990cc77e755a145dfa0142da 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: hy\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index b80e564d9e5ab560216ca09979f90af38b161e82..72191e537a45358a49294afb1d10c3b0dd97f071 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
index 62b001503121d4e0b48f8333df2ca8e2b452cf47..6d63d6d7d73569aafdcc901d204ad5dd4a7c59c4 100644
--- a/l10n/hy/user_ldap.po
+++ b/l10n/hy/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "ÕŠÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 7e373705a73f025a114209831b28291a6a7a927a..bb9dfcc8408b1bbc9c0742215840f5c31dd17195 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
-"Last-Translator: giogio <g.sora@tiscali.it>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "Data de expiration es in le passato."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -39,6 +39,11 @@ msgstr "De-activar modo de mantenentia"
msgid "Updated database"
msgstr "Base de datos actualisate"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Il forniva necun imagine o file"
@@ -59,207 +64,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Dominica"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Lunedi"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Martedi"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mercuridi"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Jovedi"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Venerdi"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sabbato"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "januario"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februario"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Martio"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Junio"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Julio"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Augusto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Septembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Octobre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Novembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Decembre"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Configurationes"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Salveguardante..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "secundas passate"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuta passate"
msgstr[1] "%n minutas passate"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n hora passate"
msgstr[1] "%n horas passate"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "hodie"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "heri"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "ultime mense"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "ultime anno"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "annos passate"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Seliger"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Si"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Seliger"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflicto de file"
msgstr[1] "{count} conflictos de file"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Un conflicto de file"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nove files"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Files jam existente"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Qual files tu vole mantener?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancellar"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Error quando on incargava patrono de file existente"
@@ -291,140 +296,149 @@ msgstr "Compartite"
msgid "Share"
msgstr "Compartir"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Error quando on compartiva"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Error quando on levava le compartir"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Error quando on modificava permissiones"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartite con te e le gruppo {group} per {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Compartite con te per {owner} "
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "Compartir con usator o gruppo ..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Compartir ligamine"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Protegite per contrasigno"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Contrasigno"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Permitter incargamento public"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Ligamine de e-posta a persona"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Invia"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Fixa data de expiration"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Data de expiration"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Compartir via e-posta:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Il trovava nulle persona"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "gruppo"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Il non es permittite compartir plus que un vice"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Compartite in {item} con {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Leva compartir"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "notificar per message de e-posta"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "pote modificar"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "controlo de accesso"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "crear"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "actualisar"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "deler"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "compartir"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Proteger con contrasigno"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Error quando on levava le data de expiration"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Error quando on fixava le data de expiration"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Inviante ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Message de e-posta inviate"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Aviso"
@@ -456,18 +470,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Pro favor recarga le pagina."
-#: 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 "Le actualisation terminava sin successo. Pro favor tu reporta iste problema al <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Le actualisation terminava con successo. On redirige nunc a tu ownCloud."
@@ -668,6 +683,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Crear un <strong>conto de administration</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Contrasigno"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Immagazinage & base de datos"
@@ -793,7 +812,26 @@ msgstr "Gratias pro tu patientia."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 3e88c641b128be8a48b0d69e6a1e716ec02bc22f..11178fe2eb45f2794e85b678eb2abf3af051eee1 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr "Manca un dossier temporari"
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Files"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Compartir"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Error"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Nomine"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Dimension"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Modificate"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr "Salveguardar"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "Nove"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "File de texto"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Nove dossier"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Dossier"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Nihil hic. Incarga alcun cosa!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Discargar"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Deler"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Incargamento troppo longe"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
index ef8a1d96f554397e058a42d31922d3af233876bf..177892043c60421ac038c143a92a88ea1deac67f 100644
--- a/l10n/ia/files_encryption.po
+++ b/l10n/ia/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index ee4c065513e275ed475804b81ddeb7578dad6b32..e033b8dc53f3f16fb72bff5a713ab6973a7f3f12 100644
--- a/l10n/ia/files_external.po
+++ b/l10n/ia/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:10+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index f8132fbbea41e6efea633c42c2c0111f0c57cbd1..782656ef74fd372995057b22388e05cbd6d823ea 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "Contrasigno"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "Discargar"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index 729956da0295bc276997cfd30df7e5366a6aae14..555a2b40efe3413dcb0ddbcb0cc0e53606bbf97b 100644
--- a/l10n/ia/files_trashbin.po
+++ b/l10n/ia/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Error"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nomine"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Deler"
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index cf7c8957e907dd29215b06e7c721e28a0044c4af..6bfbff1bdcd3c306a5ad1fdb56380bebfd2a1a3f 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr "Imagine invalide"
msgid "web services under your control"
msgstr "servicios web sub tu controlo"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 60002004a158b32b8358b828d6a35f61a43021c9..9553df3ec59adfa1f09dd69af92e8715ceaff1b8 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "Message de e-posta inviate"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Linguage cambiate"
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr "Actualisar"
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Contrasigno multo debile"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Contrasigno debile"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Contrasigno passabile"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Contrasigno bon"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Contrasigno forte"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Gruppos"
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Interlingua"
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Registro"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Plus"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr "Linguage"
msgid "Help translate"
msgstr "Adjuta a traducer"
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 881569c39a0ec0057b7f259d24bf242f8a147762..aad09d7e300b68dfde10f6f3d5550fa693d1810d 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "Error"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Salveguardar"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr "Retro"
msgid "Continue"
msgstr "Continuar"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avantiate"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index c4e0ad9fb8176a74ae7e5e2cf008add50dce10ca..6abe3485494ac500c33e44bf3eb31f7feec022f4 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Arif Budiman <arifpedia@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +18,11 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Tidak dapat mengirim Email ke pengguna berikut: %s"
@@ -38,6 +39,11 @@ msgstr "Matikan mode perawatan"
msgid "Updated database"
msgstr "Basis data terbaru"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Tidak ada gambar atau file yang disediakan"
@@ -58,224 +64,224 @@ msgstr "Tidak ada gambar profil sementara yang tersedia, coba lagi"
msgid "No crop data provided"
msgstr "Tidak ada data krop tersedia"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Minggu"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Senin"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Selasa"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Rabu"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Kamis"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Jumat"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sabtu"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januari"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februari"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Maret"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mei"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Agustus"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Desember"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Pengaturan"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Menyimpan..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "beberapa detik yang lalu"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n menit yang lalu"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n jam yang lalu"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "hari ini"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "kemarin"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n hari yang lalu"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "bulan kemarin"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n bulan yang lalu"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "tahun kemarin"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "beberapa tahun lalu"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Pilih"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Galat memuat templat berkas pemilih: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ya"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Tidak"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Pilih"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Galat memuat templat berkas pemilih: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Oke"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Galat memuat templat pesan: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} berkas konflik"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Satu berkas konflik"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
-msgstr ""
+msgstr "Berkas Baru"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
-msgstr ""
+msgstr "Berkas sudah ada"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Berkas mana yang ingin anda pertahankan?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Jika anda memilih kedua versi, berkas yang disalin akan memiliki nomor yang ditambahkan sesuai namanya."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Batal"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Lanjutkan"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(semua terpilih)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} terpilih)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Galat memuat templat berkas yang sudah ada"
#: js/setup.js:84
msgid "Very weak password"
-msgstr ""
+msgstr "Sandi sangat lemah"
#: js/setup.js:85
msgid "Weak password"
-msgstr ""
+msgstr "Sandi lemah"
#: js/setup.js:86
msgid "So-so password"
-msgstr ""
+msgstr "Sandi lumayan"
#: js/setup.js:87
msgid "Good password"
-msgstr ""
+msgstr "Sandi baik"
#: js/setup.js:88
msgid "Strong password"
-msgstr ""
+msgstr "Sandi kuat"
#: js/share.js:51 js/share.js:66 js/share.js:106
msgid "Shared"
@@ -285,140 +291,149 @@ msgstr "Dibagikan"
msgid "Share"
msgstr "Bagikan"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Galat"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Galat ketika membagikan"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Galat ketika membatalkan pembagian"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Galat ketika mengubah izin"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Dibagikan dengan anda dan grup {group} oleh {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Dibagikan dengan anda oleh {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "Bagikan dengan pengguna atau grup ..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Bagikan tautan"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Lindungi dengan sandi"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Sandi"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Izinkan Unggahan Publik"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Emailkan tautan ini ke orang"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Kirim"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Atur tanggal kedaluwarsa"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Tanggal kedaluwarsa"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Bagian lewat email:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Tidak ada orang ditemukan"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "grup"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Berbagi ulang tidak diizinkan"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Dibagikan dalam {item} dengan {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Batalkan berbagi"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "notifikasi via email"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "dapat sunting"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "kontrol akses"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "buat"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "perbarui"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "hapus"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "bagikan"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Sandi dilindungi"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Galat ketika menghapus tanggal kedaluwarsa"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Galat ketika mengatur tanggal kedaluwarsa"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Mengirim ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Email terkirim"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Peringatan"
@@ -450,18 +465,19 @@ msgstr "Galat memuat templat dialog: {error}"
msgid "No tags selected for deletion."
msgstr "Tidak ada tag yang terpilih untuk dihapus."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Silakan muat ulang halaman."
-#: 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 "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitas ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud."
@@ -474,7 +490,7 @@ msgstr "%s sandi diatur ulang"
msgid ""
"A problem has occurred whilst sending the email, please contact your "
"administrator."
-msgstr ""
+msgstr "Terjadi masalah saat mengirim email, silakan hubungi administrator Anda."
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -537,12 +553,12 @@ msgstr "Atur ulang sandi"
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
-msgstr ""
+msgstr "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!"
#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
-msgstr ""
+msgstr "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. "
#: strings.php:5
msgid "Personal"
@@ -662,9 +678,13 @@ msgstr "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan l
msgid "Create an <strong>admin account</strong>"
msgstr "Buat sebuah <strong>akun admin</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Sandi"
+
#: templates/installation.php:70
msgid "Storage & database"
-msgstr ""
+msgstr "Penyimpanan & Basis data"
#: templates/installation.php:77
msgid "Data folder"
@@ -787,8 +807,27 @@ msgstr "Terima kasih atas kesabaran anda."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Memperbarui ownCloud ke versi %s, prosesnya akan berlangsung beberapa saat."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 3833c39b967d35a77a6e56f28a8bf2f6ba8ae051..f62cbb3142a2bbe739e6f53fb7783eee3899f30f 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# arifpedia <arifpedia@gmail.com>, 2013
+# Arif Budiman <arifpedia@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada"
msgid "Could not move %s"
msgstr "Tidak dapat memindahkan %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Nama berkas tidak boleh kosong."
@@ -37,18 +37,18 @@ msgstr "Nama berkas tidak boleh kosong."
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -124,44 +124,48 @@ msgstr "Folder sementara tidak ada"
msgid "Failed to write to disk"
msgstr "Gagal menulis ke disk"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Ruang penyimpanan tidak mencukupi"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Unggah gagal. Tidak menemukan berkas yang akan diunggah"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Unggah gagal. Tidak mendapatkan informasi berkas."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Direktori tidak valid."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Berkas"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "Tidak dapat mengunggah {filename} karena ini sebuah direktori atau memiliki ukuran 0 byte"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Pengunggahan dibatalkan."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Tidak mendapatkan hasil dari server."
@@ -174,117 +178,117 @@ msgstr "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses
msgid "URL cannot be empty"
msgstr "URL tidak boleh kosong"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} sudah ada"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Tidak dapat membuat berkas"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Tidak dapat membuat folder"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Bagikan"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Hapus secara permanen"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Ubah nama"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Menunggu"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Galat saat memindahkan berkas"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Galat"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Tidak dapat mengubah nama berkas"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Galat saat menghapus berkas."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Nama"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Ukuran"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Dimodifikasi"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n folder"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n berkas"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Mengunggah %n berkas"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -294,12 +298,12 @@ msgstr "Enskripi telah dinonaktifkan tetapi berkas anda tetap dienskripsi. Silak
msgid "{dirs} and {files}"
msgstr "{dirs} dan {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s tidak dapat diubah nama"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -336,68 +340,75 @@ msgstr "Ukuran masukan maksimum untuk berkas ZIP"
msgid "Save"
msgstr "Simpan"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses Berkas via WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Baru"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Berkas teks baru"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Berkas teks"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Map baru"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Folder"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Dari tautan"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Berkas yang dihapus"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Batal pengunggahan"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Anda tidak memiliki akses untuk mengunggah atau membuat berkas disini"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Unduh"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Hapus"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Yang diunggah terlalu besar"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Berkas sedang dipindai, silakan tunggu."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Yang sedang dipindai"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index 4a9069a5298d96f41537d771ac186f6267043cce..5da1618c800489db5ffef4f2302c0b06435734e5 100644
--- a/l10n/id/files_encryption.po
+++ b/l10n/id/files_encryption.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# arifpedia <arifpedia@gmail.com>, 2014
+# Arif Budiman <arifpedia@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -77,9 +77,9 @@ msgstr "Tidak dapat mendekripsi berkas ini, mungkin ini adalah berkas bersama. S
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Kesalahan tak dikenal, silakan periksa pengaturan sistem Anda atau hubungi admin."
+msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -92,7 +92,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Pengguna berikut belum diatur untuk enkripsi:"
@@ -112,91 +112,91 @@ msgstr "Langsung ke anda"
msgid "personal settings"
msgstr "pengaturan pribadi"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Enkripsi"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Sandi kunci pemulihan"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Ulangi sandi kunci Pemulihan"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Diaktifkan"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Dinonaktifkan"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Ubah sandi kunci pemulihan:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Sandi kunci Pemulihan Lama"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Sandi kunci Pemulihan Baru"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Ulangi sandi kunci Pemulihan baru"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Ubah sandi"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Sandi kunci privat Anda tidak lagi cocok dengan sandi masuk:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Atur sandi kunci privat lama Anda sebagai sandi masuk Anda saat ini."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Jika Anda tidak ingat sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Sandi masuk yang lama"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Sandi masuk saat ini"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Perbarui Sandi Kunci Privat"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Aktifkan sandi pemulihan:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Pengaturan pemulihan berkas diperbarui"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Tidak dapat memperbarui pemulihan berkas"
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
index c3c2ee7348f48bc26e668bb62de86732488ddb87..1b7ecafc31dbe808c77728d9b809c2a24b49e583 100644
--- a/l10n/id/files_external.po
+++ b/l10n/id/files_external.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Arif Budiman <arifpedia@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -19,7 +20,7 @@ msgstr ""
#: appinfo/app.php:34
msgid "Local"
-msgstr ""
+msgstr "Lokal"
#: appinfo/app.php:36
msgid "Location"
@@ -27,7 +28,7 @@ msgstr "lokasi"
#: appinfo/app.php:39
msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
#: appinfo/app.php:41
msgid "Key"
@@ -55,19 +56,19 @@ msgstr ""
#: appinfo/app.php:52
msgid "Hostname (optional)"
-msgstr ""
+msgstr "Hostname (tambahan)"
#: appinfo/app.php:53
msgid "Port (optional)"
-msgstr ""
+msgstr "Port (tambahan)"
#: appinfo/app.php:54
msgid "Region (optional)"
-msgstr ""
+msgstr "Wilayah (tambahan)"
#: appinfo/app.php:55
msgid "Enable SSL"
-msgstr ""
+msgstr "Aktifkan SSL"
#: appinfo/app.php:56
msgid "Enable Path Style"
@@ -82,9 +83,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "tautan"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -99,7 +100,7 @@ msgstr "Sandi"
#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
#: appinfo/app.php:134 appinfo/app.php:154
msgid "Root"
-msgstr ""
+msgstr "Root"
#: appinfo/app.php:77
msgid "Secure ftps://"
@@ -119,7 +120,7 @@ msgstr ""
#: appinfo/app.php:94
msgid "Username (required)"
-msgstr ""
+msgstr "Nama pengguna (dibutuhkan)"
#: appinfo/app.php:95
msgid "Bucket (required)"
@@ -165,6 +166,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "tautan"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -195,36 +200,36 @@ msgstr "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive"
#: js/settings.js:318 js/settings.js:325
msgid "Saved"
-msgstr ""
+msgstr "Disimpan"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>Catatan:</b> "
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
-msgstr ""
+msgstr "dan"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya."
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya."
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
" ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya."
#: templates/settings.php:2
msgid "External Storage"
@@ -248,7 +253,7 @@ msgstr "Opsi"
#: templates/settings.php:12
msgid "Available for"
-msgstr ""
+msgstr "Tersedia untuk"
#: templates/settings.php:32
msgid "Add storage"
@@ -256,7 +261,7 @@ msgstr "Tambahkan penyimpanan"
#: templates/settings.php:92
msgid "No user or group"
-msgstr ""
+msgstr "Tidak ada pengguna dan grup"
#: templates/settings.php:95
msgid "All Users"
@@ -281,7 +286,7 @@ msgstr "Aktifkan Penyimpanan Eksternal Pengguna"
#: templates/settings.php:135
msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut"
#: templates/settings.php:150
msgid "SSL root certificates"
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index e6b078bd4d908ebb5e2f5f67be7cf0327a808417..d8e7100c4145b8858438d81bab3edf3d105057bc 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# arifpedia <arifpedia@gmail.com>, 2014
+# Arif Budiman <arifpedia@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Dibagikan oleh {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Berbagi ini dilindungi sandi"
@@ -34,6 +58,14 @@ msgstr "Sandi salah. Coba lagi"
msgid "Password"
msgstr "Sandi"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Maaf, tautan ini tampaknya tidak berfungsi lagi."
@@ -62,11 +94,11 @@ msgstr "Untuk info lebih lanjut, silakan tanyakan orang yang mengirim tautan ini
msgid "Download"
msgstr "Unduh"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Tautan langsung"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index a91067fa6762bb66786de932e4521ccf381249af..50cb9418c1b53a4bfa9e0d776614134b028dcf31 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr "Tidak dapat menghapus permanen %s"
msgid "Couldn't restore %s"
msgstr "Tidak dapat memulihkan %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Berkas yang dihapus"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Pulihkan"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Galat"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Berkas yang Dihapus"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Tempat sampah anda kosong!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nama"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Pulihkan"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Dihapus"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Hapus"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index 326429368602bc20eb1df89745c0e0b94a71781b..ec06fa7a2a15a38b40c7eb32373f5b4c4d923a30 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr "Gambar tidak sah"
msgid "web services under your control"
msgstr "layanan web dalam kendali anda"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Pengunduhan ZIP dimatikan."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Berkas harus diunduh satu persatu."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Kembali ke Berkas"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Berkas yang dipilih terlalu besar untuk dibuat berkas zip-nya."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr "Atur nama pengguna admin."
msgid "Set an admin password."
msgstr "Atur sandi admin."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s membagikan »%s« dengan anda"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Tidak menemukan kategori \"%s\""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 2197e7346aa16bd970a6f0df301b604e249f181d..543b87cf924fcd1a779b6ab8fec58c605fe26797 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr ""
#: admin/controller.php:73
msgid "Saved"
-msgstr ""
+msgstr "Disimpan"
#: admin/controller.php:90
msgid "test email settings"
@@ -47,15 +47,15 @@ msgstr "Email terkirim"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Enkripsi"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Email disimpan"
@@ -114,6 +124,16 @@ msgstr "Tidak dapat menghapus grup"
msgid "Unable to delete user"
msgstr "Tidak dapat menghapus pengguna"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Bahasa telah diubah"
@@ -169,7 +189,7 @@ msgstr "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengg
msgid "Unable to change password"
msgstr "Tidak dapat mengubah sandi"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr "Perbarui"
msgid "Updated"
msgstr "Diperbarui"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Pilih foto profil"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
-msgstr ""
+msgstr "Sandi sangat lemah"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
-msgstr ""
+msgstr "Sandi lemah"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
-msgstr ""
+msgstr "Sandi lumayan"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
-msgstr ""
+msgstr "Sandi baik"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
-msgstr ""
+msgstr "Sandi kuat"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Mendeskripsi berkas... Modon tunggu, ini memerlukan beberapa saat."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "dihapus"
@@ -265,8 +293,8 @@ msgstr "urungkan"
msgid "Unable to remove user"
msgstr "Tidak dapat menghapus pengguna"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grup"
@@ -298,7 +326,7 @@ msgstr "Tuliskan sandi yang valid"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Peringatan: Direktori home untuk pengguna \"{user}\" sudah ada"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__language_name__"
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr "Direktori data dan berkas Anda mungkin dapat diakses dari internet. Berkas .htaccess tidak bekerja. Kami sangat menyarankan untuk mengkonfigurasi server web Anda agar direktori data tidak lagi dapat diakses atau Anda dapat memindahkan direktori data di luar dokumen root webserver."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Peringatan Persiapan"
@@ -381,53 +409,65 @@ 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 kembali <a href=\"%s\">petunjuk instalasi</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Module 'fileinfo' tidak ada"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Versi PHP telah usang"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Versi PHP telah usang. Kami sangat menyarankan untuk diperbarui ke versi 5.3.8 atau yang lebih baru karena versi lama diketahui rusak. Ada kemungkinan bahwa instalasi ini tidak bekerja dengan benar."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Kode pelokalan tidak berfungsi"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Sistem lokal tidak dapat diatur untuk satu yang mendukung UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Ini artinya mungkin ada masalah dengan karakter tertentu pada nama berkas."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Kami sangat menyarankan untuk menginstal paket yang dibutuhkan pada sistem agar mendukung salah satu bahasa berikut: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Koneksi internet tidak berfungsi"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Jalankan tugas setiap kali halaman dimuat"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php didaftarkan pada layanan webcron untuk memanggil cron.php setiap 15 menit melalui http."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Menggunakan sistem layanan cron untuk memanggil berkas cron.php setiap 15 menit."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Berbagi"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Aktifkan API Pembagian"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Izinkan aplikasi untuk menggunakan API Pembagian"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Izinkan tautan"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Izinkan pengguna untuk berbagi item kepada publik lewat tautan"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Izinkan unggahan publik"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Izinkan pengguna memungkinkan orang lain untuk mengunggah kedalam folder berbagi publik mereka"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Izinkan pengguna untuk berbagi item kepada publik lewat tautan"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Izinkan pembagian ulang"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Izinkan pengguna untuk berbagi kembali item yang dibagikan kepada mereka."
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Izinkan pengguna untuk berbagi kepada siapa saja"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Hanya izinkan pengguna untuk berbagi dengan pengguna pada grup mereka sendiri"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Izinkan pemberitahuan email"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Keamanan"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Selalu Gunakan HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Memaksa klien untuk menghubungkan ke %s menggunakan sambungan yang dienskripsi."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Mohon sambungkan ke %s menggunakan HTTPS untuk mengaktifkannya atau menonaktifkan penegakan SSL."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Alamat server"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "port"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Catat"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Level pencatatan"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Lainnya"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Ciutkan"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versi"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +828,33 @@ msgstr "Bahasa"
msgid "Help translate"
msgstr "Bantu menerjemahkan"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses Berkas via WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "Aplikasi enkripsi tidak lagi diaktifkan, silahkan mendekripsi semua file Anda"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Sandi masuk"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Deskripsi semua Berkas"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Nama Masuk"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 7a4940ce045458b2a7b63d1edcfe890c279db01b..1ab0414b00786a657dbec6a75c64672bb58003e0 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr "Ambil alih pengaturan dari konfigurasi server saat ini?"
msgid "Keep settings?"
msgstr "Biarkan pengaturan?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Gagal menambah konfigurasi server"
@@ -86,6 +90,18 @@ msgstr "Sukses"
msgid "Error"
msgstr "Galat"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,26 +142,42 @@ msgstr "Anda ingin menghapus Konfigurasi Server saat ini?"
msgid "Confirm Deletion"
msgstr "Konfirmasi Penghapusan"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "saringan grup"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Simpan"
@@ -218,10 +250,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Tambah Konfigurasi Server"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Host"
@@ -285,6 +330,14 @@ msgstr "Kembali"
msgid "Continue"
msgstr "Lanjutkan"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Lanjutan"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 0d0ed23d7e1f843ef3c36cbae316bdccb838f7ab..de20e3e682a575f598ac0eae9f19e68423f49403 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -59,207 +64,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sunnudagur"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Mánudagur"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Þriðjudagur"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Miðvikudagur"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Fimmtudagur"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Föstudagur"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Laugardagur"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Janúar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Febrúar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mars"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "AprÃl"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "MaÃ"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "JúnÃ"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "JúlÃ"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Ãgúst"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Október"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Nóvember"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Desember"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Stillingar"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Er að vista ..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "sek."
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "Ã dag"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "à gær"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "sÃðasta mánuði"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "sÃðasta ári"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "einhverjum árum"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Veldu"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Já"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Veldu"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ã lagi"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Hætta við"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -291,140 +296,149 @@ msgstr "Deilt"
msgid "Share"
msgstr "Deila"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Villa"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Villa við deilingu"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Villa við að hætta deilingu"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Villa við að breyta aðgangsheimildum"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Deilt með þér og hópnum {group} af {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Deilt með þér af {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Verja með lykilorði"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Lykilorð"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Senda vefhlekk à tölvupóstu til notenda"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Senda"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Setja gildistÃma"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Gildir til"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Deila með tölvupósti:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Engir notendur fundust"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Endurdeiling er ekki leyfð"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Deilt með {item} ásamt {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Hætta deilingu"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "getur breytt"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "aðgangsstýring"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "mynda"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "uppfæra"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "eyða"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "deila"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Verja með lykilorði"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Villa við að aftengja gildistÃma"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Villa við að setja gildistÃma"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Sendi ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Tölvupóstur sendur"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Aðvörun"
@@ -456,18 +470,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Uppfærslan heppnaðist. Beini þér til ownCloud nú."
@@ -668,6 +683,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Útbúa <strong>vefstjóra aðgang</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Lykilorð"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -793,8 +812,27 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Uppfæri ownCloud à útgáfu %s, það gæti tekið smá stund."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/is/files.po b/l10n/is/files.po
index 7c9a4cd3a1f23a4bca2c384c179acf136ba7fcd4..ae88a05ad5634ba7cfe148dd4427a2ae21c2f670 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr "Gat ekki fært %s - Skrá með þessu nafni er þegar til"
msgid "Could not move %s"
msgstr "Gat ekki fært %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Nafn skráar má ekki vera tómt"
@@ -36,18 +36,18 @@ msgstr "Nafn skráar má ekki vera tómt"
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr "Vantar bráðabirgðamöppu"
msgid "Failed to write to disk"
msgstr "Tókst ekki að skrifa á disk"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Ógild mappa."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Skrár"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Hætt við innsendingu."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr "Innsending à gangi. Ef þú ferð af þessari sÃðu mun innsending mis
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} er þegar til"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Deila"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Endurskýra"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "BÃður"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Villa"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Nafn"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Stærð"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Breytt"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr "Hámarks inntaksstærð fyrir ZIP skrár"
msgid "Save"
msgstr "Vista"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "Nýtt"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Texta skrá"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Mappa"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Af tengli"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Hætta við innsendingu"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Ekkert hér. Settu eitthvað inn!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Niðurhal"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Eyða"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Innsend skrá er of stór"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Verið er að skima skrár, vinsamlegast hinkraðu."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Er að skima"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po
index 599989d20ec8218ef5b73daf20530edb730777cb..e70f833e702597b47d71f0cb8518e2a7aaa9b39a 100644
--- a/l10n/is/files_encryption.po
+++ b/l10n/is/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Dulkóðun"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index 9cdd97ec494e2b14bbb69105fc148987106a9e86..c4526a81bb7fc4b0dd57833a089bd5f1fdc85808 100644
--- a/l10n/is/files_external.po
+++ b/l10n/is/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Netþjónn"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr "Villa kom upp við að setja upp Google Drive gagnasvæði"
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index 8d4cb5b66fbb4901db5b447126f936ade6dff977..f55ee909e51e07e92b2fbd06cdba99a888c3d4ab 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "Lykilorð"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "Niðurhal"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index efb4a28d4c67d541efeda8380640eb9db2729bd0..4b6f64d42686cf93c7ce349ebaebdea2fd00a6c4 100644
--- a/l10n/is/files_trashbin.po
+++ b/l10n/is/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Villa"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nafn"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Eyða"
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index 99600e859730b5e0ec999366c5558d001ed47b35..0df10c4ea95ec977e0a0414fbe189bc4c8388c3d 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr "vefþjónusta undir þinni stjórn"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Slökkt á ZIP niðurhali."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Skrárnar verður að sækja eina og eina"
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Aftur à skrár"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Valdar skrár eru of stórar til að búa til ZIP skrá."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Fann ekki flokkinn \"%s\""
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 73cc3e937f981f03ba9ce6c9ae952948b11ca7a4..f4165d686b6fda4ae8bd825650cfde357c5c5563 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "Tölvupóstur sendur"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Dulkóðun"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -99,6 +99,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Netfang vistað"
@@ -115,6 +125,16 @@ msgstr "Ekki tókst að eyða hóp"
msgid "Unable to delete user"
msgstr "Ekki tókst að eyða notenda"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Tungumáli breytt"
@@ -170,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -226,34 +246,42 @@ msgstr "Uppfæra"
msgid "Updated"
msgstr "Uppfært"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "eytt"
@@ -266,8 +294,8 @@ msgstr "afturkalla"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Hópar"
@@ -299,7 +327,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__nafn_tungumáls__"
@@ -367,7 +395,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -382,53 +410,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -437,198 +477,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Host nafn netþjóns"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Meira"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Minna"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Útgáfa"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +829,33 @@ msgstr "Tungumál"
msgid "Help translate"
msgstr "Hjálpa við þýðingu"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr ""
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr ""
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr ""
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index dde31d960e72eb9e021af143e0ca29a678db7a36..3b20e649b2ca56b7319c7b3ed8d5cfca2ae39074 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr ""
msgid "Keep settings?"
msgstr "Geyma stillingar ?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -87,6 +91,18 @@ msgstr ""
msgid "Error"
msgstr "Villa"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -127,28 +143,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Vista"
@@ -221,10 +253,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Netþjónn"
@@ -288,6 +333,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Ãtarlegt"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index e4f73d2a38cc9dd49b0894906ed5fc59648f7f4c..764ebeaa4567ccea4763cf153163f31b40ec99bc 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "La data di scadenza è nel passato."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Impossibile inviare email ai seguenti utenti: %s"
@@ -42,6 +42,11 @@ msgstr "Modalità di manutenzione disattivata"
msgid "Updated database"
msgstr "Database aggiornato"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Non è stata fornita alcun immagine o file"
@@ -62,207 +67,207 @@ msgstr "Nessuna immagine di profilo provvisoria disponibile, riprova"
msgid "No crop data provided"
msgstr "Dati di ritaglio non forniti"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Domenica"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Lunedì"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Martedì"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mercoledì"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Giovedì"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Venerdì"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sabato"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Gennaio"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Febbraio"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marzo"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Aprile"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maggio"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Giugno"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Luglio"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Agosto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Settembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Ottobre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Novembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Dicembre"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Impostazioni"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Salvataggio in corso..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "secondi fa"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuto fa"
msgstr[1] "%n minuti fa"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n ora fa"
msgstr[1] "%n ore fa"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "oggi"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "ieri"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n giorno fa"
msgstr[1] "%n giorni fa"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "mese scorso"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n mese fa"
msgstr[1] "%n mesi fa"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "anno scorso"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "anni fa"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Scegli"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Errore durante il caricamento del modello del selettore file: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Sì"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Scegli"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Errore durante il caricamento del modello del selettore file: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Errore durante il caricamento del modello di messaggio: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
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:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Un file in conflitto"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "File nuovi"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "File già esistenti"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Quali file vuoi mantenere?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
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:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Annulla"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continua"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(tutti i selezionati)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} selezionati)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Errore durante il caricamento del modello del file esistente"
@@ -294,140 +299,149 @@ msgstr "Condivisi"
msgid "Share"
msgstr "Condividi"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Errore"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Errore durante la condivisione"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Errore durante la rimozione della condivisione"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Errore durante la modifica dei permessi"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Condiviso con te e con il gruppo {group} da {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Condiviso con te da {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "Condividi con utente o gruppo ..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Condividi collegamento"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Il collegamento pubblico scadrà non più tardi di {days} giorni dopo la sua creazione"
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr "In modo predefinito, il collegamento pubblico scadrà dopo {days} giorni"
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Proteggi con password"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr "Scegli una password per il collegamento pubblico"
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Consenti caricamento pubblico"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Invia collegamento via email"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Invia"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Imposta data di scadenza"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Data di scadenza"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Condividi tramite email:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Non sono state trovate altre persone"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "gruppo"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "La ri-condivisione non è consentita"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Condiviso in {item} con {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Rimuovi condivisione"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "notifica tramite email"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "può modificare"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "controllo d'accesso"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "creare"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "aggiornare"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "elimina"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "condividi"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Protetta da password"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Errore durante la rimozione della data di scadenza"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Errore durante l'impostazione della data di scadenza"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Invio in corso..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Messaggio inviato"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Avviso"
@@ -459,18 +473,19 @@ msgstr "Errore durante il caricamento del modello di finestra: {error}"
msgid "No tags selected for deletion."
msgstr "Nessuna etichetta selezionata per l'eliminazione."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Ricarica la pagina."
-#: 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 "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunità di ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud."
@@ -671,6 +686,10 @@ msgstr "Per informazioni su come configurare correttamente il tuo server, vedi l
msgid "Create an <strong>admin account</strong>"
msgstr "Crea un <strong>account amministratore</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Password"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Archiviazione e database"
@@ -796,8 +815,27 @@ msgstr "Grazie per la pazienza."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Aggiornamento di ownCloud alla versione %s in corso, ciò potrebbe richiedere del tempo."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 37507d5e523a93a56c087aaf267c77cfb393d54c..9bacb9964c0da2c24d0d268d2fa0d1dbc3d75e80 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 18:11+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"
@@ -30,7 +30,7 @@ msgstr "Impossibile spostare %s - un file con questo nome esiste già "
msgid "Could not move %s"
msgstr "Impossibile spostare %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Il nome del file non può essere vuoto."
@@ -39,18 +39,18 @@ msgstr "Il nome del file non può essere vuoto."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" non è un nome file valido."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "La cartella di destinazione è stata spostata o eliminata."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -126,44 +126,48 @@ msgstr "Manca una cartella temporanea"
msgid "Failed to write to disk"
msgstr "Scrittura su disco non riuscita"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Spazio di archiviazione insufficiente"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Caricamento non riuscito. Impossibile trovare il file caricato."
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Caricamento non riuscito. Impossibile ottenere informazioni sul file."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Cartella non valida."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "File"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Tutti i file"
+
+#: js/file-upload.js:257
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:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "La dimensione totale del file {size1} supera il limite di caricamento {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Invio annullato"
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Impossibile ottenere il risultato dal server."
@@ -176,120 +180,120 @@ msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il ca
msgid "URL cannot be empty"
msgstr "L'URL non può essere vuoto."
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} esiste già "
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Impossibile creare il file"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Impossibile creare la cartella"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Errore durante il recupero dello URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Condividi"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Elimina definitivamente"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Rinomina"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "In corso"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr "Errore durante lo spostamento del file."
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Errore durante lo spostamento del file"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Errore"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Impossibile rinominare il file"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Errore durante l'eliminazione del file."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Nome"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Dimensione"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Modificato"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n cartella"
msgstr[1] "%n cartelle"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n file"
msgstr[1] "%n file"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
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/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" non è un nome file valido."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Chiave privata non valida per l'applicazione di cifratura. Aggiorna la password della chiave privata nelle impostazioni personali per ripristinare l'accesso ai tuoi file cifrati."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -299,12 +303,12 @@ msgstr "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. V
msgid "{dirs} and {files}"
msgstr "{dirs} e {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s non può essere rinominato"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Carica (massimo %s)"
@@ -341,68 +345,75 @@ msgstr "Dimensione massima per i file ZIP"
msgid "Save"
msgstr "Salva"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\">accedere ai tuoi file con WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Nuovo"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Nuovo file di testo"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "File di testo"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Nuova cartella"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Cartella"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Da collegamento"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "File eliminati"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Annulla invio"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Qui non hai i permessi di caricare o creare file"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Non c'è niente qui. Carica qualcosa!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Scarica"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Elimina"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Caricamento troppo grande"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Scansione dei file in corso, attendi"
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Scansione corrente"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr "Scansione in corso"
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index 50a0f6c6ad939b46f488ab1181e771b0d4226bf9..703c8cc7f0cb572746e09f1a23bc2d136eb118bf 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 22:50+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 17:32+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"
@@ -79,9 +79,9 @@ msgstr "Impossibile decifrare questo file, probabilmente è un file condiviso. C
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Errore sconosciuto, controlla le impostazioni di sistema o contatta il tuo amministratore"
+msgstr "Errore sconosciuto. Controlla le impostazioni di sistema o contatta il tuo amministratore"
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "I seguenti utenti non sono configurati per la cifratura:"
@@ -114,91 +114,91 @@ msgstr "Passa direttamente a"
msgid "personal settings"
msgstr "impostazioni personali"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Cifratura"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Password della chiave di recupero"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Ripeti la password della chiave di recupero"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Abilitata"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Disabilitata"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Cambia la password della chiave di recupero:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Vecchia password della chiave di recupero"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Nuova password della chiave di recupero"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Ripeti la nuova password della chiave di recupero"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Modifica password"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "La password della chiave privata non corrisponde più alla password di accesso:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Imposta la vecchia password della chiave privata sull'attuale password di accesso."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Vecchia password di accesso"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Password di accesso attuale"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Aggiorna la password della chiave privata"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Abilita il ripristino della password:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Impostazioni di ripristino dei file aggiornate"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Impossibile aggiornare il ripristino dei file"
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index 4a79114b3aaecc91c5b00b214a31a1a6705bf563..5bc12978707fe29a21e0d00753413e880dbb3a2c 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-02 01:55-0400\n"
-"PO-Revision-Date: 2014-05-01 11:10+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 07:24+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"
@@ -86,9 +86,9 @@ msgid "App secret"
msgstr "Segreto applicazione"
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -169,6 +169,10 @@ msgstr "SMB / CIFS utilizzando le credenziali di OC"
msgid "Username as share"
msgstr "Nome utente come condivisione"
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr "Sicuro https://"
@@ -201,29 +205,29 @@ msgstr "Errore durante la configurazione dell'archivio Google Drive"
msgid "Saved"
msgstr "Salvato"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr "<b>Nota:</b>"
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr "e"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo."
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Nota:</b> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo."
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index c9db889bbd78f32c27a9ec260d0c34c0eea21c70..696802d20abe44748e33a80e59b5bbf2a04940cd 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
-"PO-Revision-Date: 2014-05-04 06:54+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -19,10 +19,34 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Condiviso da {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Questa condivione è protetta da password"
@@ -35,6 +59,14 @@ msgstr "La password è errata. Prova ancora."
msgid "Password"
msgstr "Password"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Spiacenti, questo collegamento sembra non essere più attivo."
@@ -63,11 +95,11 @@ msgstr "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il col
msgid "Download"
msgstr "Scarica"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Scarica %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Collegamento diretto"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index e299050c815837c9955067528086c9a2e30b21ec..6e4e510c54920b461602574832cddb5b5f835cfb 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -28,38 +28,34 @@ msgstr "Impossibile eliminare %s definitivamente"
msgid "Couldn't restore %s"
msgstr "Impossibile ripristinare %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "File eliminati"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Ripristina"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Errore"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "File eliminati"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "ripristinati"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Qui non c'è niente. Il tuo cestino è vuoto."
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nome"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Ripristina"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Eliminati"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Elimina"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index 5b581baeeb13bb918ad2b948c0d623e10a1ec23c..706f92955a902098e435eb5b183dc52697efe809 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-02 01:55-0400\n"
-"PO-Revision-Date: 2014-05-01 11:10+0000\n"
+"POT-Creation-Date: 2014-05-25 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 07:21+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"
@@ -21,11 +21,11 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:712
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr "Stai accedendo al server da un dominio non affidabile."
-#: base.php:713
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -80,23 +80,23 @@ msgstr "Immagine non valida"
msgid "web services under your control"
msgstr "servizi web nelle tue mani"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Lo scaricamento in formato ZIP è stato disabilitato."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "I file devono essere scaricati uno alla volta."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Torna ai file"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "I file selezionati sono troppo grandi per generare un file zip."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -293,116 +293,127 @@ 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>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s ha condiviso «%s» con te"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr "Condivisione di %s non riuscita, poiché il file non esiste"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Non ti è consentito condividere %s"
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "Condivisione di %s non riuscita, poiché l'utente %s è il proprietario dell'oggetto"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "Condivisione di %s non riuscita, poiché l'utente %s non esiste"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr "Condivisione di %s non riuscita, poiché l'utente %s non appartiene ad alcun gruppo di cui %s è membro"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con %s"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "Condivisione di %s non riuscita, poiché il gruppo %s non esiste"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "Condivisione di %s non riuscita, poiché %s non appartiene al gruppo %s"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Devi fornire una password per creare un collegamento pubblico, sono consentiti solo i collegamenti protetti"
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "Condivisione di %s non riuscita, poiché i collegamenti non sono consentiti"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr "Il tipo di condivisione %s non è valido per %s"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr "Impostazione permessi per %s non riuscita, poiché i permessi superano i permessi accordati a %s"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "Impostazione permessi per %s non riuscita, poiché l'elemento non è stato trovato"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr "Il motore di condivisione %s deve implementare l'interfaccia OCP\\Share_Backend"
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr "Motore di condivisione %s non trovato"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr "Motore di condivisione di %s non trovato"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr "Condivisione di %s non riuscita, poiché l'utente %s l'ha condiviso precedentemente"
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr "Condivisione di %s non riuscita, poiché i permessi superano quelli accordati a %s"
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr "Condivisione di %s non riuscita, poiché la ri-condivisione non è consentita"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr "Condivisione di %s non riuscita, poiché il motore di condivisione per %s non riesce a trovare la sua fonte"
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr "Condivisione di %s non riuscita, poiché il file non è stato trovato nella cache"
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Impossibile trovare la categoria \"%s\""
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 67a0bd8b7a49728d42fbc609e9ff0ab56e611e4f..b06c4a92197517970641f473a12d24b481c5e4a3 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -51,15 +51,15 @@ msgstr "Email inviata"
msgid "You need to set your user email before being able to send test emails."
msgstr "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio delle email."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Modalità di invio"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Cifratura"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Metodo di autenticazione"
@@ -102,6 +102,16 @@ msgstr "Impossibile decifrare i tuoi file, controlla il file owncloud.log o chie
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "Impossibile decifrare i tuoi file, controlla la password e prova ancora"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Chiavi di cifratura eliminate definitivamente"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Impossibile eliminare definitivamente le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore"
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Email salvata"
@@ -118,6 +128,16 @@ msgstr "Impossibile eliminare il gruppo"
msgid "Unable to delete user"
msgstr "Impossibile eliminare l'utente"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Copie di sicurezza ripristinate correttamente"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Impossibile ripristinare le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore"
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Lingua modificata"
@@ -173,7 +193,7 @@ msgstr "Il motore non supporta la modifica della password, ma la chiave di cifra
msgid "Unable to change password"
msgstr "Impossibile cambiare la password"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Invio in corso..."
@@ -229,34 +249,42 @@ msgstr "Aggiorna"
msgid "Updated"
msgstr "Aggiornato"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Seleziona un'immagine del profilo"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Password molto debole"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Password debole"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Password così-così"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Password buona"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Password forte"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Elimina definitivamente le chiavi di cifratura."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Ripristina le chiavi di cifratura."
+
#: js/users.js:47
msgid "deleted"
msgstr "eliminati"
@@ -269,8 +297,8 @@ msgstr "annulla"
msgid "Unable to remove user"
msgstr "Impossibile rimuovere l'utente"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Gruppi"
@@ -302,7 +330,7 @@ msgstr "Deve essere fornita una password valida"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Avviso: la cartella home dell'utente \"{user}\" esiste già "
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Italiano"
@@ -370,7 +398,7 @@ msgid ""
"root."
msgstr "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o spostare la cartella fuori dalla radice del server web."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Avviso di configurazione"
@@ -385,53 +413,65 @@ 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>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Modulo 'fileinfo' mancante"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "La tua versione di PHP è obsoleta"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "La tua versione di PHP è obsoleta. Ti consigliamo vivamente di aggiornare alla versione 5.3.8 o successiva poiché è sono noti problemi con le vecchie versioni. L'installazione attuale potrebbe non funzionare correttamente."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Locale non funzionante"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "La localizzazione di sistema non può essere impostata a una che supporta UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Ciò significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Consigliamo vivamente di installare i pacchetti richiesti sul tuo sistema per supportare una delle\nlocalizzazioni seguenti: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Concessione Internet non funzionante"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -440,198 +480,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Questo server ownCloud non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. L'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità ."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "L'ultimo cron è stato eseguito alle %s."
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "L'ultimo cron è stato eseguito alle %s. È più di un'ora fa, potrebbe esserci qualche problema."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "Cron non è stato ancora eseguito!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Esegui un'operazione con ogni pagina caricata"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Condivisione"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Abilita API di condivisione"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Consenti alle applicazioni di utilizzare le API di condivisione"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Consenti collegamenti"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr "Imponi la protezione con password"
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Consenti caricamenti pubblici"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Consenti agli utenti di abilitare altri al caricamento nelle loro cartelle pubbliche condivise"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "Imposta data di scadenza predefinita"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Scadenza dopo"
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "giorni"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Forza la data di scadenza"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti"
-#: templates/admin.php:235
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Consenti la ri-condivisione"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Consenti agli utenti di condividere a loro volta elementi condivisi da altri"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Consenti agli utenti di condividere con chiunque"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Consenti agli utenti di condividere solo con utenti dei loro gruppi"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Consenti le notifiche tramite posta elettronica"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Consenti agli utenti di inviare email di notifica per i file condivisi"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr "Imposta data di scadenza predefinita"
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Scadenza dopo"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr "Escludi gruppi dalla condivisione"
-#: templates/admin.php:266
-msgid "days"
-msgstr "giorni"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr "Forza la data di scadenza"
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Le condivisioni scadono in modo predefinito dopo N giorni"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Questi gruppi saranno in grado di ricevere condivisioni, ma non iniziarle."
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Protezione"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Forza HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Forza i client a connettersi a %s tramite una connessione cifrata."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Server di posta"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "Viene utilizzato per inviare le notifiche."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Indirizzo mittente"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr "posta"
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Autenticazione richiesta"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Indirizzo del server"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Porta"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Credenziali"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "Nome utente SMTP"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "Password SMTP"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Prova impostazioni email"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Invia email"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Log"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Livello di log"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Altro"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Meno"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versione"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -784,29 +832,33 @@ msgstr "Lingua"
msgid "Help translate"
msgstr "Migliora la traduzione"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\">accedere ai tuoi file con WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "L'applicazione di cifratura non è più abilitata, decifra tutti i tuoi file"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Password di accesso"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Decifra tutti i file"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Le tue chiavi di cifratura sono state spostate in una posizione sicura. Se qualcosa non dovesse funzionare, potrai ripristinare le chiavi. Eliminale definitivamente solo se sei sicuro che tutti i file siano stati decifrati."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Ripristina chiavi di cifratura"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Elimina chiavi di cifratura"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Nome utente"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index f50e1bca7aa571f09a994b39e6bf4fda6ff7faf1..70b09d44fb9165a306eeb694c9cc625f2f99c46c 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 17:32+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"
@@ -73,6 +73,10 @@ msgstr "Vuoi recuperare le impostazioni dalla configurazione recente del server?
msgid "Keep settings?"
msgstr "Vuoi mantenere le impostazioni?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. server"
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Impossibile aggiungere la configurazione del server"
@@ -89,6 +93,18 @@ msgstr "Riuscito"
msgid "Error"
msgstr "Errore"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Specifica un DN base"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Impossibile determinare il DN base"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Specifica la porta"
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Configurazione corretta"
@@ -129,28 +145,44 @@ msgstr "Vuoi davvero eliminare la configurazione attuale del server?"
msgid "Confirm Deletion"
msgstr "Conferma l'eliminazione"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s gruppo trovato"
msgstr[1] "%s gruppi trovati"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s utente trovato"
msgstr[1] "%s utenti trovati"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Host non valido"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Impossibile trovare la funzionalità desiderata"
+#: settings.php:52
+msgid "Server"
+msgstr "Server"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Filtro utente"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Filtro accesso"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtro gruppo"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Salva"
@@ -223,10 +255,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso. Esempio: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. server"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. server:"
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Aggiungi configurazione del server"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Elimina configurazione"
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Host"
@@ -290,6 +335,14 @@ msgstr "Indietro"
msgid "Continue"
msgstr "Continua"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Esperto"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avanzate"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ja/core.po b/l10n/ja/core.po
index 39952e303dbbee6bcd524435a3b7224fc9d8330a..9da914a8e8009709c946d72808caa39fdda2369f 100644
--- a/l10n/ja/core.po
+++ b/l10n/ja/core.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2014-04-30 18:30+0000\n"
-"Last-Translator: mikako\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\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 +24,11 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "有効期é™ãŒåˆ‡ã‚Œã¦ã„ã¾ã™ã€‚"
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "次ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã«ãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã§ãã¾ã›ã‚“ã§ã—ãŸ: %s"
@@ -45,6 +45,11 @@ msgstr "メンテナンスモードãŒã‚ªãƒ•ã«ãªã‚Šã¾ã—ãŸ"
msgid "Updated database"
msgstr "データベース更新完了"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "ç”»åƒã‚‚ã—ãã¯ãƒ•ã‚¡ã‚¤ãƒ«ãŒæä¾›ã•ã‚Œã¦ã„ã¾ã›ã‚“"
@@ -65,202 +70,202 @@ msgstr "一時的ãªãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ç”¨ç”»åƒãŒåˆ©ç”¨ã§ãã¾ã›ã‚“。もã†
msgid "No crop data provided"
msgstr "クãƒãƒƒãƒ—データã¯æä¾›ã•ã‚Œã¾ã›ã‚“"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "æ—¥"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "月"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "ç«"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "æ°´"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "木"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "金"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "土"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "1月"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "2月"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "3月"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "4月"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "5月"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "6月"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "7月"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "8月"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "9月"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "10月"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "11月"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "12月"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "è¨å®š"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "ä¿å˜ä¸..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "数秒å‰"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分å‰"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 時間å‰"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "今日"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "昨日"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%næ—¥å‰"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "1ヶ月å‰"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%nヶ月å‰"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "1å¹´å‰"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "æ•°å¹´å‰"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "é¸æŠž"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "ファイルé¸æŠžãƒ†ãƒ³ãƒ—レートã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "ã¯ã„"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "ã„ã„ãˆ"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "é¸æŠž"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "ファイルé¸æŠžãƒ†ãƒ³ãƒ—レートã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "メッセージテンプレートã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} ファイルãŒç«¶åˆ"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "1ファイルãŒç«¶åˆ"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "æ–°ã—ã„ファイル"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
-msgstr "ファイルãŒã™ã§ã«å˜åœ¨ã—ã¾ã™"
+msgstr "æ—¢å˜ã®ãƒ•ã‚¡ã‚¤ãƒ«"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
-msgstr "ã©ã¡ã‚‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿æŒã—ãŸã„ã§ã™ã‹ï¼Ÿ"
+msgstr "ã©ã¡ã‚‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿æŒã—ã¾ã™ã‹ï¼Ÿ"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "両方ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’é¸æŠžã—ãŸå ´åˆã¯ã€ãƒ•ã‚¡ã‚¤ãƒ«åã®å¾Œã‚ã«æ•°å—ã‚’è¿½åŠ ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚³ãƒ”ーを作æˆã—ã¾ã™ã€‚"
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "ã‚ャンセル"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "続ã‘ã‚‹"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(å…¨ã¦é¸æŠž)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} é¸æŠž)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "æ—¢å˜ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ†ãƒ³ãƒ—レートã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼"
@@ -292,140 +297,149 @@ msgstr "共有ä¸"
msgid "Share"
msgstr "共有"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "エラー"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "共有ã§ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "共有解除ã§ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "権é™å¤‰æ›´ã§ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "ã‚ãªãŸã¨ {owner} ã®ã‚°ãƒ«ãƒ¼ãƒ— {group} ã§å…±æœ‰ä¸"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "{owner} ã¨å…±æœ‰ä¸"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "ユーザーもã—ãã¯ã‚°ãƒ«ãƒ¼ãƒ—ã¨å…±æœ‰ ..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "URLã§å…±æœ‰"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "公開用リンクã¯ã€ä½œæˆã—ã¦ã‹ã‚‰ {days} 日以内ã«æœ‰åŠ¹æœŸé™åˆ‡ã‚Œã«ãªã‚Šã¾ã™"
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr "デフォルトã®è¨å®šã§ã¯ã€å…¬é–‹ç”¨ãƒªãƒ³ã‚¯ã¯ {days} 日後ã«æœ‰åŠ¹æœŸé™åˆ‡ã‚Œã«ãªã‚Šã¾ã™"
+
+#: js/share.js:248
msgid "Password protect"
msgstr "パスワードä¿è·"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "パスワード"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr "公開用リンクã®ãƒ‘スワードをé¸æŠž"
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "アップãƒãƒ¼ãƒ‰ã‚’許å¯"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "メールリンク"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "é€ä¿¡"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "有効期é™ã‚’è¨å®š"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "有効期é™"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "メール経由ã§å…±æœ‰:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "ユーザーãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "グループ"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "å†å…±æœ‰ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "{item} 内㧠{user} ã¨å…±æœ‰ä¸"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "共有解除"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "メールã§é€šçŸ¥"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "編集を許å¯"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "アクセス権é™"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "作æˆ"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "アップデート"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "削除"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "共有"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "パスワードä¿è·"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "有効期é™ã®æœªè¨å®šã‚¨ãƒ©ãƒ¼"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "有効期é™ã®è¨å®šã§ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "é€ä¿¡ä¸..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "メールをé€ä¿¡ã—ã¾ã—ãŸ"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "è¦å‘Š"
@@ -457,18 +471,19 @@ msgstr "メッセージテンプレートã®èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: {error}"
msgid "No tags selected for deletion."
msgstr "削除ã™ã‚‹ã‚¿ã‚°ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "アップデートã«å¤±æ•—ã—ã¾ã—ãŸã€‚ã“ã®å•é¡Œã‚’ <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a> ã«ãƒ¬ãƒãƒ¼ãƒˆã—ã¦ãã ã•ã„。"
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "アップデートã«æˆåŠŸã—ã¾ã—ãŸã€‚今ã™ãownCloudã«ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã—ã¾ã™ã€‚"
@@ -669,6 +684,10 @@ msgstr "サーãƒãƒ¼ã‚’é©æ£ã«è¨å®šã™ã‚‹æƒ…å ±ã¯ã€ã“ã¡ã‚‰ã®<a href=\"%s
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>管ç†è€…アカウント</strong>を作æˆã—ã¦ãã ã•ã„"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "パスワード"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "ストレージã¨ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹"
@@ -794,8 +813,27 @@ msgstr "ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„。"
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud ã‚’ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s ã«æ›´æ–°ã—ã¦ã„ã¾ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„。"
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/ja/files.po b/l10n/ja/files.po
index bacef458ce78c949b4a87776e81f1d300674eac5..7c9a97e7a5e20737c44e9ab544f2bc81ca59492f 100644
--- a/l10n/ja/files.po
+++ b/l10n/ja/files.po
@@ -3,21 +3,21 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013-2014
# plazmism <gomidori@live.jp>, 2013-2014
# iLikeIT <dj_dark_junglist@yahoo.com>, 2013
# Koichi MATSUMOTO <mzch@me.com>, 2013
# kuromabo <md81bird@hitaki.net>, 2014
# mikako, 2014
-# pabook <pabook.32@gmail.com>, 2013
+# pabook <inactive+pabook@transifex.com>, 2013
# tt yn <tetuyano+transi@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
-"Last-Translator: mikako\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -35,7 +35,7 @@ msgstr "%s を移動ã§ãã¾ã›ã‚“ã§ã—㟠― ã“ã®åå‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯
msgid "Could not move %s"
msgstr "%s を移動ã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "ファイルåを空ã«ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
@@ -44,18 +44,18 @@ msgstr "ファイルåを空ã«ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" ã¯ç„¡åŠ¹ãªãƒ•ã‚¡ã‚¤ãƒ«åã§ã™ã€‚"
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "無効ãªåå‰ã€'\\', '/', '<', '>', ':', '\"', '|', '?', '*' ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“。"
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "目標ã®ãƒ•ã‚©ãƒ«ãƒ€ã¯ç§»å‹•ã•ã‚ŒãŸã‹ã€å‰Šé™¤ã•ã‚Œã¾ã—ãŸã€‚"
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -131,44 +131,48 @@ msgstr "一時ä¿å˜ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
msgid "Failed to write to disk"
msgstr "ディスクã¸ã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "ストレージã«å分ãªç©ºã容é‡ãŒã‚ã‚Šã¾ã›ã‚“"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "アップãƒãƒ¼ãƒ‰ã«å¤±æ•—。アップãƒãƒ¼ãƒ‰æ¸ˆã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’見ã¤ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "アップãƒãƒ¼ãƒ‰ã«å¤±æ•—ã€‚ãƒ•ã‚¡ã‚¤ãƒ«æƒ…å ±ã‚’å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "無効ãªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã™ã€‚"
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "ファイル"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«"
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "ディレクトリもã—ãã¯0ãƒã‚¤ãƒˆã®ãŸã‚ {filename} をアップãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "åˆè¨ˆãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚º {size1} ã¯ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰åˆ¶é™ {size2} を超éŽã—ã¦ã„ã¾ã™ã€‚"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "空ã容é‡ãŒå分ã§ãªã〠{size1} をアップãƒãƒ¼ãƒ‰ã—ã¦ã„ã¾ã™ãŒã€ {size2} ã—ã‹æ®‹ã£ã¦ã„ã¾ã›ã‚“。"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "アップãƒãƒ¼ãƒ‰ã¯ã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚"
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "サーãƒãƒ¼ã‹ã‚‰çµæžœã‚’å–å¾—ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
@@ -181,117 +185,117 @@ msgstr "ファイル転é€ã‚’実行ä¸ã§ã™ã€‚今ã“ã®ãƒšãƒ¼ã‚¸ã‹ã‚‰ç§»å‹•ã™
msgid "URL cannot be empty"
msgstr "URL ã¯ç©ºã«ã§ãã¾ã›ã‚“"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} ã¯ã™ã§ã«å˜åœ¨ã—ã¾ã™"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "ファイルを作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "フォルダーを作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "URLå–得エラー"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "共有"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "完全ã«å‰Šé™¤ã™ã‚‹"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "åå‰ã®å¤‰æ›´"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "ダウンãƒãƒ¼ãƒ‰ã®æº–å‚™ä¸ã§ã™ã€‚ファイルサイズãŒå¤§ãã„å ´åˆã¯å°‘ã—時間ãŒã‹ã‹ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。"
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "ä¸æ–"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr "ファイル移動ã§ã‚¨ãƒ©ãƒ¼"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "ファイルã®ç§»å‹•ã‚¨ãƒ©ãƒ¼"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "エラー"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "ファイルã®åå‰å¤‰æ›´ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "ファイルã®å‰Šé™¤ã‚¨ãƒ©ãƒ¼ã€‚"
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "åå‰"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "サイズ"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "更新日時"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n 個ã®ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n 個ã®ãƒ•ã‚¡ã‚¤ãƒ«"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n 個ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’アップãƒãƒ¼ãƒ‰ä¸"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" ã¯ç„¡åŠ¹ãªãƒ•ã‚¡ã‚¤ãƒ«åã§ã™ã€‚"
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "ã‚ãªãŸã®ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã¯ä¸€æ¯ã§ã™ã€‚ファイルã®æ›´æ–°ã¨åŒæœŸã¯ã‚‚ã†ã§ãã¾ã›ã‚“ï¼"
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "ストレージãŒã»ã¼ä¸€æ¯ã§ã™ï¼ˆ{usedSpacePercent}%）"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "æš—å·åŒ–アプリã¯æœ‰åŠ¹ã§ã™ãŒã€ã‚ãªãŸã®æš—å·åŒ–ã‚ーã¯åˆæœŸåŒ–ã•ã‚Œã¦ã„ã¾ã›ã‚“。ãƒã‚°ã‚¢ã‚¦ãƒˆã—ãŸå¾Œã«ã€å†åº¦ãƒã‚°ã‚¤ãƒ³ã—ã¦ãã ã•ã„"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "æš—å·åŒ–アプリã®ç„¡åŠ¹ãªãƒ—ライベートã‚ーã§ã™ã€‚ã‚ãªãŸã®æš—å·åŒ–ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¸ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ãŸã‚ã«ã€å€‹äººè¨å®šã‹ã‚‰ãƒ—ライベートã‚ーã®ãƒ‘スワードを更新ã—ã¦ãã ã•ã„。"
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -301,12 +305,12 @@ msgstr "æš—å·åŒ–ã®æ©Ÿèƒ½ã¯ç„¡åŠ¹åŒ–ã•ã‚Œã¾ã—ãŸãŒã€ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã™ã§
msgid "{dirs} and {files}"
msgstr "{dirs} 㨠{files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%sã®åå‰ã‚’変更ã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "アップãƒãƒ¼ãƒ‰ ( 最大 %s )"
@@ -343,68 +347,75 @@ msgstr "ZIPファイルã§ã®æœ€å¤§å…¥åŠ›ã‚µã‚¤ã‚º"
msgid "Save"
msgstr "ä¿å˜"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "<a href=\"%s\" target=\"_blank\">WebDAV 経由ã§ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¢ã‚¯ã‚»ã‚¹</a> ã™ã‚‹ã«ã¯ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’利用ã—ã¦ãã ã•ã„"
+
+#: templates/list.php:5
msgid "New"
msgstr "æ–°è¦ä½œæˆ"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "æ–°è¦ã®ãƒ†ã‚ストファイル作æˆ"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "テã‚ストファイル"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "æ–°ã—ã„フォルダー"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "フォルダー"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "リンク"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "ゴミ箱"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "アップãƒãƒ¼ãƒ‰ã‚’ã‚ャンセル"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "ã“ã“ã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’アップãƒãƒ¼ãƒ‰ã‚‚ã—ãã¯ä½œæˆã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "ã“ã“ã«ã¯ä½•ã‚‚ã‚ã‚Šã¾ã›ã‚“。何ã‹ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„。"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "ダウンãƒãƒ¼ãƒ‰"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "削除"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "アップãƒãƒ¼ãƒ‰ã«ã¯å¤§ãã™ãŽã¾ã™ã€‚"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "アップãƒãƒ¼ãƒ‰ã—よã†ã¨ã—ã¦ã„るファイルã¯ã€ã‚µãƒ¼ãƒãƒ¼ã§è¦å®šã•ã‚ŒãŸæœ€å¤§ã‚µã‚¤ã‚ºã‚’超ãˆã¦ã„ã¾ã™ã€‚"
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "ファイルをスã‚ャンã—ã¦ã„ã¾ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„。"
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "スã‚ャンä¸"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/ja/files_encryption.po b/l10n/ja/files_encryption.po
index 4e73f59715676ef4ea03c6ed919e5544bfefb78e..f76735e8b1783b762ddc79fbcc1dc51fe73c011c 100644
--- a/l10n/ja/files_encryption.po
+++ b/l10n/ja/files_encryption.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-11 13:11+0000\n"
-"Last-Translator: plazmism <gomidori@live.jp>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -80,9 +80,9 @@ msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’復å·åŒ–ã§ãã¾ã›ã‚“ã€å…±æœ‰ãƒ•ã‚¡ã‚¤ãƒ«ã®å¯
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ã§ã™ã€‚システムè¨å®šã‚’確èªã™ã‚‹ã‹ã€ç®¡ç†è€…ã«å•ã„åˆã‚ã›ã¦ãã ã•ã„。"
+msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -95,7 +95,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "å¿…ãšã€PHP 5.3.3ã‚‚ã—ãã¯ãれ以上をインストールã—ã€åŒæ™‚ã«OpenSSLã®PHP拡張を有効ã«ã—ãŸä¸Šã§OpenSSLã‚‚åŒæ§˜ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã€é©åˆ‡ã«è¨å®šã—ã¦ãã ã•ã„。ç¾æ™‚点ã§ã¯æš—å·åŒ–アプリã¯ç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚"
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "以下ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯ã€æš—å·åŒ–è¨å®šãŒã•ã‚Œã¦ã„ã¾ã›ã‚“："
@@ -115,91 +115,91 @@ msgstr "ã‚ãªãŸã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¸"
msgid "personal settings"
msgstr "秘密éµã‚’アンãƒãƒƒã‚¯ã§ãã¾ã™"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "æš—å·åŒ–"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "リカãƒãƒªã‚ーを有効ã«ã™ã‚‹ (パスワードを忘れãŸå ´åˆã«ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’回復ã§ãã¾ã™):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "リカãƒãƒªã‚ーã®ãƒ‘スワード"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "リカãƒãƒªã‚ーã®ãƒ‘スワードをもã†ä¸€åº¦å…¥åŠ›"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "有効"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "無効"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "リカãƒãƒªã‚ーã®ãƒ‘スワードを変更:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "å¤ã„リカãƒãƒªã‚ーã®ãƒ‘スワード"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "æ–°ã—ã„リカãƒãƒªã‚ーã®ãƒ‘スワード"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "æ–°ã—ã„リカãƒãƒªã‚ーã®ãƒ‘スワードをもã†ä¸€åº¦å…¥åŠ›"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "パスワードを変更"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "ã‚‚ã¯ã‚„秘密éµã¯ãƒã‚°ã‚¤ãƒ³ãƒ‘スワードã¨ä¸€è‡´ã—ã¾ã›ã‚“:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "å¤ã„秘密éµã®ãƒ‘スワードをç¾åœ¨ã®ãƒã‚°ã‚¤ãƒ³ãƒ‘スワードã«è¨å®šã™ã‚‹ã€‚"
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "å¤ã„パスワードを覚ãˆã¦ã„ãªã„å ´åˆã€ç®¡ç†è€…ã«å°‹ãã¦ãƒ•ã‚¡ã‚¤ãƒ«ã‚’回復ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "å¤ã„ãƒã‚°ã‚¤ãƒ³ãƒ‘スワード"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "ç¾åœ¨ã®ãƒã‚°ã‚¤ãƒ³ãƒ‘スワード"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "秘密éµã®ãƒ‘スワードを更新"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "パスワードリカãƒãƒªã‚’有効ã«:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "ã“ã®ã‚ªãƒ—ションを有効ã«ã™ã‚‹ã¨ã€ãƒ‘スワードを紛失ã—ãŸå ´åˆã‚‚ã€æš—å·åŒ–ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã«å†åº¦ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã“ã¨ãŒã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "ファイルリカãƒãƒªè¨å®šã‚’æ›´æ–°ã—ã¾ã—ãŸ"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "ファイルリカãƒãƒªã‚’æ›´æ–°ã§ãã¾ã›ã‚“ã§ã—ãŸ"
diff --git a/l10n/ja/files_external.po b/l10n/ja/files_external.po
index 810209b31cbe51806632d63614698d3fc85cfc16..ee254592ea9cfc1bf93b2d380e3c0f5e6aad770b 100644
--- a/l10n/ja/files_external.po
+++ b/l10n/ja/files_external.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2014-04-30 18:50+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -30,64 +30,64 @@ msgstr "ä½ç½®"
#: appinfo/app.php:39
msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
#: appinfo/app.php:41
msgid "Key"
-msgstr ""
+msgstr "ã‚ー"
#: appinfo/app.php:42
msgid "Secret"
-msgstr ""
+msgstr "シークレットã‚ー"
#: appinfo/app.php:43 appinfo/app.php:51
msgid "Bucket"
-msgstr ""
+msgstr "ãƒã‚±ãƒƒãƒˆå"
#: appinfo/app.php:47
msgid "Amazon S3 and compliant"
-msgstr ""
+msgstr "Amazon S3 ã¨äº’æ›ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸"
#: appinfo/app.php:49
msgid "Access Key"
-msgstr ""
+msgstr "アクセスã‚ー"
#: appinfo/app.php:50
msgid "Secret Key"
-msgstr ""
+msgstr "シークレットã‚ー"
#: appinfo/app.php:52
msgid "Hostname (optional)"
-msgstr ""
+msgstr "ホストå (オプション)"
#: appinfo/app.php:53
msgid "Port (optional)"
-msgstr ""
+msgstr "ãƒãƒ¼ãƒˆ (オプション)"
#: appinfo/app.php:54
msgid "Region (optional)"
-msgstr ""
+msgstr "リージョン (オプション)"
#: appinfo/app.php:55
msgid "Enable SSL"
-msgstr ""
+msgstr "SSLを有効"
#: appinfo/app.php:56
msgid "Enable Path Style"
-msgstr ""
+msgstr "パス形å¼ã‚’有効"
#: appinfo/app.php:63
msgid "App key"
-msgstr ""
+msgstr "アプリã‚ー"
#: appinfo/app.php:64
msgid "App secret"
-msgstr ""
+msgstr "アプリシークレット"
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "ホスト"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -102,59 +102,59 @@ msgstr "パスワード"
#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
#: appinfo/app.php:134 appinfo/app.php:154
msgid "Root"
-msgstr ""
+msgstr "ルート"
#: appinfo/app.php:77
msgid "Secure ftps://"
-msgstr ""
+msgstr "Secure ftps://"
#: appinfo/app.php:84
msgid "Client ID"
-msgstr ""
+msgstr "クライアントID"
#: appinfo/app.php:85
msgid "Client secret"
-msgstr ""
+msgstr "クライアント秘密ã‚ー"
#: appinfo/app.php:92
msgid "OpenStack Object Storage"
-msgstr ""
+msgstr "OpenStack Object Storage"
#: appinfo/app.php:94
msgid "Username (required)"
-msgstr ""
+msgstr "ユーザーå (å¿…é ˆ)"
#: appinfo/app.php:95
msgid "Bucket (required)"
-msgstr ""
+msgstr "ãƒã‚±ãƒƒãƒˆ (å¿…é ˆ)"
#: appinfo/app.php:96
msgid "Region (optional for OpenStack Object Storage)"
-msgstr ""
+msgstr "リージョン (OpenStack Object Storage用ã®ã‚ªãƒ—ション)"
#: appinfo/app.php:97
msgid "API Key (required for Rackspace Cloud Files)"
-msgstr ""
+msgstr "APIã‚ー (Rackspace Cloud Filesã«å¿…é ˆ)"
#: appinfo/app.php:98
msgid "Tenantname (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "テナントå (OpenStack Object Storage用ã«å¿…è¦)"
#: appinfo/app.php:99
msgid "Password (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "パスワード (OpenStack Object Storage用ã«å¿…è¦)"
#: appinfo/app.php:100
msgid "Service Name (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "サービスå (OpenStack Object Storage用ã«å¿…è¦)"
#: appinfo/app.php:101
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "è˜åˆ¥ç”¨ã‚¨ãƒ³ãƒ‰ãƒã‚¤ãƒ³ãƒˆURL (OpenStack Object Storage用ã«å¿…è¦)"
#: appinfo/app.php:102
msgid "Timeout of HTTP requests in seconds (optional)"
-msgstr ""
+msgstr "HTTPリクエストã®ã‚¿ã‚¤ãƒ アウト秒数 (オプション)"
#: appinfo/app.php:114 appinfo/app.php:123
msgid "Share"
@@ -162,19 +162,23 @@ msgstr "共有"
#: appinfo/app.php:119
msgid "SMB / CIFS using OC login"
-msgstr ""
+msgstr "owncloudãƒã‚°ã‚¤ãƒ³ã§ SMB/CIFSを使用"
#: appinfo/app.php:122
msgid "Username as share"
-msgstr ""
+msgstr "共有å"
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
-msgstr ""
+msgstr "ã‚»ã‚ュア https://"
#: appinfo/app.php:144
msgid "Remote subfolder"
-msgstr ""
+msgstr "リモートサブフォルダ"
#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
msgid "Access granted"
@@ -200,34 +204,34 @@ msgstr "Googleドライブストレージã®è¨å®šã‚¨ãƒ©ãƒ¼"
msgid "Saved"
msgstr "ä¿å˜ã•ã‚Œã¾ã—ãŸ"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>注æ„:</b> "
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
-msgstr ""
+msgstr "ã¨"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>注æ„:</b> PHPã«cURLã®ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ãŒå…¥ã£ã¦ã„ãªã„ã‹ã€æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。%s をマウントã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã®ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ãã ã•ã„。"
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>注æ„:</b> PHPã«FTPã®ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ãŒå…¥ã£ã¦ã„ãªã„ã‹ã€æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。%s をマウントã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã®ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ãã ã•ã„。"
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
" ask your system administrator to install it."
-msgstr ""
+msgstr "<b>注æ„:</b> \"%s\" ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“。%sをマウントã§ãã¾ã›ã‚“。ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã®ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ãã ã•ã„。"
#: templates/settings.php:2
msgid "External Storage"
@@ -251,7 +255,7 @@ msgstr "オプション"
#: templates/settings.php:12
msgid "Available for"
-msgstr ""
+msgstr "以下ãŒåˆ©ç”¨å¯èƒ½"
#: templates/settings.php:32
msgid "Add storage"
diff --git a/l10n/ja/files_sharing.po b/l10n/ja/files_sharing.po
index 32abbb51eba02ecbbf66c203be596daf4722ed0f..bae434db54626543203a74549e1ccaa1f9dbb4d0 100644
--- a/l10n/ja/files_sharing.po
+++ b/l10n/ja/files_sharing.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,34 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "{owner} ã¨å…±æœ‰ä¸"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "ã“ã®å…±æœ‰ã¯ãƒ‘スワードã§ä¿è·ã•ã‚Œã¦ã„ã¾ã™"
@@ -36,6 +60,14 @@ msgstr "パスワードãŒé–“é•ã£ã¦ã„ã¾ã™ã€‚å†è©¦è¡Œã—ã¦ãã ã•ã„。
msgid "Password"
msgstr "パスワード"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "申ã—訳ã”ã–ã„ã¾ã›ã‚“。ã“ã®ãƒªãƒ³ã‚¯ã¯ã‚‚ã†åˆ©ç”¨ã§ãã¾ã›ã‚“。"
@@ -64,11 +96,11 @@ msgstr "ä¸æ˜Žãªç‚¹ã¯ã€ã“ã¡ã‚‰ã®ãƒªãƒ³ã‚¯ã®æ供者ã«ç¢ºèªã‚’ãŠé¡˜ã„
msgid "Download"
msgstr "ダウンãƒãƒ¼ãƒ‰"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "%s をダウンãƒãƒ¼ãƒ‰"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "リンク"
diff --git a/l10n/ja/files_trashbin.po b/l10n/ja/files_trashbin.po
index ec59ca1ef8d1e9143ed12903cb7cc5284f4c9192..567e29f958c5c02c1f818272e727ef6d3739909d 100644
--- a/l10n/ja/files_trashbin.po
+++ b/l10n/ja/files_trashbin.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -31,38 +31,34 @@ msgstr "%s を完全ã«å‰Šé™¤ã§ãã¾ã›ã‚“ã§ã—ãŸ"
msgid "Couldn't restore %s"
msgstr "%s を復元ã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "ゴミ箱"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "復元"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "エラー"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "ゴミ箱"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "復元済"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "ã“ã“ã«ã¯ä½•ã‚‚ã‚ã‚Šã¾ã›ã‚“。ゴミ箱ã¯ç©ºã§ã™ï¼"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "åå‰"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "復元"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "削除済ã¿"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "削除"
diff --git a/l10n/ja/lib.po b/l10n/ja/lib.po
index 80633caf3c268adc6847af48ab2aa9d72821a684..406ccc2909d8824acc4bc812a63bf957b085ae72 100644
--- a/l10n/ja/lib.po
+++ b/l10n/ja/lib.po
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013-2014
# plazmism <gomidori@live.jp>, 2013-2014
# Koichi MATSUMOTO <mzch@me.com>, 2013
# kuromabo <md81bird@hitaki.net>, 2014
# mikako, 2014
-# tt yn <tetuyano+transi@gmail.com>, 2013
+# tt yn <tetuyano+transi@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2014-04-30 19:00+0000\n"
-"Last-Translator: mikako\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -23,16 +23,16 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:712
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr "ã‚ãªãŸã¯ã‚µãƒ¼ãƒã«ã€ä¿¡ç”¨ãŒä»˜ä¸Žã•ã‚Œã¦ã„ãªã„ドメインã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹ã—ã¦ã„ã¾ã™ã€‚"
-#: base.php:713
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
"example configuration is provided in config/config.sample.php."
-msgstr ""
+msgstr "管ç†è€…ã«é€£çµ¡ã—ã¦ãã ã•ã„。ã“ã®ã‚µãƒ¼ãƒãƒ¼ã®ç®¡ç†è€…ã®å ´åˆã¯ã€\"trusted_domain\" ã®è¨å®šã‚’ config/config.php ã«è¨å®šã—ã¦ãã ã•ã„。config/config.sample.php ã«ã‚µãƒ³ãƒ—ルã®è¨å®šæ–¹æ³•ãŒè¨˜è¼‰ã—ã¦ã‚ã‚Šã¾ã™ã€‚"
#: private/app.php:236
#, php-format
@@ -82,23 +82,23 @@ msgstr "無効ãªç”»åƒ"
msgid "web services under your control"
msgstr "管ç†ä¸‹ã®ã‚¦ã‚§ãƒ–サービス"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIPダウンãƒãƒ¼ãƒ‰ã¯ç„¡åŠ¹ã§ã™ã€‚"
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "ファイルã¯1ã¤ãšã¤ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "ファイルã«æˆ»ã‚‹"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯ZIPファイルã®ç”Ÿæˆã«ã¯å¤§ãã™ãŽã¾ã™ã€‚"
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -295,116 +295,127 @@ msgstr "WebDAVインターフェースã«å•é¡ŒãŒã‚ã‚‹ã¨æ€ã‚れるãŸã‚ã€
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "<a href='%s'>インストールガイド</a>をよã確èªã—ã¦ãã ã•ã„。"
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s㌠ã‚ãªãŸã¨ »%s«を共有ã—ã¾ã—ãŸ"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ãã®ã‚ˆã†ãªãƒ•ã‚¡ã‚¤ãƒ«ã¯å˜åœ¨ã—ãªã„ã‹ã‚‰ã§ã™ã€‚"
-#: private/share/share.php:523
+#: private/share/share.php:501
#, php-format
-msgid "Sharing %s failed, because the user %s is the item owner"
+msgid "You are not allowed to share %s"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:526
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ユーザー %s ãŒã‚¢ã‚¤ãƒ†ãƒ 所有者ã§ã™ã€‚"
+
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
-msgstr ""
+msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ユーザー %s ãŒå˜åœ¨ã—ã¾ã›ã‚“。"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
-msgstr ""
+msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ユーザー %s ã¯ã©ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«ã‚‚属ã—ã¦ã„ã¾ã›ã‚“。%s ã¯ã€??ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã™ã€‚"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
-msgstr ""
+msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã¯æ—¢ã« %s ã§å…±æœ‰ã•ã‚Œã¦ã„ã¾ã™ã€‚"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
-msgstr ""
+msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚グループ %s ã¯å˜åœ¨ã—ã¾ã›ã‚“。"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
-msgstr ""
+msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ— %s ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "公開用リンクã®ä½œæˆã«ã¯ãƒ‘スワードã®è¨å®šãŒå¿…è¦ã§ã™"
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
-msgstr ""
+msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚リンクã§ã®å…±æœ‰ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
-msgstr ""
+msgstr "%s ã®å…±æœ‰æ–¹æ³•ã¯ã€%s ã«ã¯é©ç”¨ã§ãã¾ã›ã‚“。"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
-msgstr ""
+msgstr "%s ã®æ¨©é™è¨å®šã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s ã«è¨±å¯ã•ã‚Œã¦ã„る権é™ã‚’越ãˆã¦ã„ã¾ã™ã€‚"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
-msgstr ""
+msgstr "%s ã®æ¨©é™è¨å®šã«å¤±æ•—ã—ã¾ã—ãŸã€‚アイテムãŒå˜åœ¨ã—ã¾ã›ã‚“。"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
-msgstr ""
+msgstr "%s ã®ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ã®å…±æœ‰ã«ã¯ã€OCP\\Share_Backend　インターフェースを実装ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr "共有ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr "%s ã®ãŸã‚ã®å…±æœ‰ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ユーザ %s ãŒå…ƒã€…ã®å…±æœ‰è€…ã§ã‚ã‚‹ã‹ã‚‰ã§ã™ã€‚"
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s ã«ä»˜ä¸Žã•ã‚Œã¦ã„る許å¯ã‚’超ãˆã¦ã„ã‚‹ã‹ã‚‰ã§ã™ã€‚"
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚å†å…±æœ‰ãŒè¨±ã•ã‚Œã¦ã„ãªã„ã‹ã‚‰ã§ã™ã€‚"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
-msgstr ""
+msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s ã®ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰å…±æœ‰ã«å¿…è¦ãªã‚½ãƒ¼ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
-msgstr ""
+msgstr "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ファイルã‚ャッシュã«ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "カテゴリ \"%s\" ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ"
@@ -457,7 +468,7 @@ msgstr "å¹´å‰"
msgid ""
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
"\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "ユーザーåã§åˆ©ç”¨ã§ãã‚‹æ–‡å—列ã¯ã€æ¬¡ã®ã‚‚ã®ã§ã™ï¼š \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\""
#: private/user/manager.php:237
msgid "A valid username must be provided"
diff --git a/l10n/ja/settings.po b/l10n/ja/settings.po
index a6dd12ff68c39ad3cd688741e126f7d7d513ba14..67794e40eec6e14ec416acacb483c978252274c1 100644
--- a/l10n/ja/settings.po
+++ b/l10n/ja/settings.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2014-04-30 18:30+0000\n"
-"Last-Translator: mikako\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -53,15 +53,15 @@ msgstr "メールをé€ä¿¡ã—ã¾ã—ãŸ"
msgid "You need to set your user email before being able to send test emails."
msgstr "ユーザーメールをè¨å®šã—ã¦åˆã‚ã¦ã€ãƒ†ã‚¹ãƒˆãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã™ã‚‹ã“ã¨ãŒã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚"
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "é€ä¿¡ãƒ¢ãƒ¼ãƒ‰"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "æš—å·åŒ–"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "èªè¨¼æ–¹æ³•"
@@ -104,6 +104,16 @@ msgstr "ファイルを復å·åŒ–ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ownclo
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "ファイルを復å·åŒ–ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚パスワードを確èªã®ã†ãˆå†è©¦è¡Œã—ã¦ãã ã•ã„。"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "æš—å·åŒ–ã‚ーã¯å®Œå…¨ã«å‰Šé™¤ã•ã‚Œã¾ã™"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "æš—å·åŒ–ã‚ーを完全ã«å‰Šé™¤ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚owncloud.logを確èªã™ã‚‹ã‹ã€ç®¡ç†è€…ã«å•ã„åˆã‚ã›ã¦ãã ã•ã„。"
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "メールアドレスをä¿å˜ã—ã¾ã—ãŸ"
@@ -120,6 +130,16 @@ msgstr "グループを削除ã§ãã¾ã›ã‚“"
msgid "Unable to delete user"
msgstr "ユーザーを削除ã§ãã¾ã›ã‚“"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã®å¾©å…ƒã«æˆåŠŸã—ã¾ã—ãŸ"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "æš—å·åŒ–ã‚ーを復元ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚owncloud.logを確èªã™ã‚‹ã‹ã€ç®¡ç†è€…ã«å•ã„åˆã‚ã›ã¦ãã ã•ã„。"
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "言語ãŒå¤‰æ›´ã•ã‚Œã¾ã—ãŸ"
@@ -175,7 +195,7 @@ msgstr "ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ã¯ãƒ‘スワード変更をサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›
msgid "Unable to change password"
msgstr "パスワードを変更ã§ãã¾ã›ã‚“"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "é€ä¿¡ä¸â€¦"
@@ -231,34 +251,42 @@ msgstr "アップデート"
msgid "Updated"
msgstr "アップデート済ã¿"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ç”»åƒã‚’é¸æŠž"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "éžå¸¸ã«å¼±ã„パスワード"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "å¼±ã„パスワード"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "ã¾ãšã¾ãšã®ãƒ‘スワード"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "良好ãªãƒ‘スワード"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "å¼·ã„パスワード"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "ファイルを複åˆä¸... ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„ã€ã“ã®å‡¦ç†ã«ã¯å°‘ã—時間ãŒã‹ã‹ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。"
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "æš—å·åŒ–ã‚ーを永久ã«å‰Šé™¤ã™ã‚‹ã€‚"
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "æš—å·åŒ–ã‚ーを復元ã™ã‚‹ã€‚"
+
#: js/users.js:47
msgid "deleted"
msgstr "削除"
@@ -271,8 +299,8 @@ msgstr "å…ƒã«æˆ»ã™"
msgid "Unable to remove user"
msgstr "ユーザーを削除ã§ãã¾ã›ã‚“"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "グループ"
@@ -304,7 +332,7 @@ msgstr "有効ãªãƒ‘スワードを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "è¦å‘Š: ユーザー \"{user}\" ã®ãƒ›ãƒ¼ãƒ ディレクトリã¯ã™ã§ã«å˜åœ¨ã—ã¾ã™"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Japanese (日本語)"
@@ -372,7 +400,7 @@ msgid ""
"root."
msgstr "データディレクトリã¨ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹å¯èƒ½ã«ãªã£ã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚.htaccessファイルãŒæ©Ÿèƒ½ã—ã¦ã„ã¾ã›ã‚“。データディレクトリãŒã‚¢ã‚¯ã‚»ã‚¹ã•ã‚Œãªã„よã†ã«ã‚¦ã‚§ãƒ–サーãƒãƒ¼ã‚’è¨å®šã™ã‚‹ã‹ã€ã‚¦ã‚§ãƒ–サーãƒãƒ¼ã®ãƒ‰ã‚ュメントルートã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’移動ã™ã‚‹ã‚ˆã†ã«å¼·ããŠå‹§ã‚ã—ã¾ã™ã€‚"
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "セットアップè¦å‘Š"
@@ -387,53 +415,65 @@ msgstr "WebDAVインターフェースã«å•é¡ŒãŒã‚ã‚‹ã¨æ€ã‚れるãŸã‚ã€
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "<a href=\"%s\">installation guides</a>ã‚’ã‚‚ã†ä¸€åº¦ãƒã‚§ãƒƒã‚¯ã™ã‚‹ã‚ˆã†ã«ãŠé¡˜ã„ã„ãŸã—ã¾ã™ã€‚"
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "モジュール 'fileinfo' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "PHP ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ« 'fileinfo' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。mimeタイプã®æ¤œå‡ºã‚’精度良ãè¡Œã†ãŸã‚ã«ã€ã“ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’有効ã«ã™ã‚‹ã“ã¨ã‚’å¼·ããŠå‹§ã‚ã—ã¾ã™ã€‚"
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "PHPãƒãƒ¼ã‚·ãƒ§ãƒ³ãŒå¤ããªã£ã¦ã„ã¾ã™ã€‚"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "PHPãƒãƒ¼ã‚·ãƒ§ãƒ³ãŒå¤ããªã£ã¦ã„ã¾ã™ã€‚å¤ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã¯æ—¢çŸ¥ã®å•é¡ŒãŒã‚ã‚‹ãŸã‚ã€5.3.8以é™ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã‚¢ãƒƒãƒ—デートã™ã‚‹ã“ã¨ã‚’å¼·ã推奨ã—ã¾ã™ã€‚ã“ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«çŠ¶æ…‹ã§ã¯æ£å¸¸ã«å‹•ä½œã—ãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚"
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "ãƒã‚±ãƒ¼ãƒ«ãŒå‹•ä½œã—ã¦ã„ã¾ã›ã‚“"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "システムãƒã‚±ãƒ¼ãƒ«ã‚’ UTF-8 をサãƒãƒ¼ãƒˆã™ã‚‹ãƒã‚±ãƒ¼ãƒ«ã«è¨å®šã§ãã¾ã›ã‚“。"
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "ã“ã‚Œã¯ã€ãƒ•ã‚¡ã‚¤ãƒ«åã®ç‰¹å®šã®æ–‡å—ã«å•é¡ŒãŒã‚ã‚‹ã“ã¨ã‚’æ„味ã—ã¦ã„ã¾ã™ã€‚"
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "次ã®ãƒã‚±ãƒ¼ãƒ«ã‚’サãƒãƒ¼ãƒˆã™ã‚‹ãŸã‚ã«ã€ã‚·ã‚¹ãƒ†ãƒ ã«å¿…è¦ãªãƒ‘ッケージをインストールã™ã‚‹ã“ã¨ã‚’å¼·ããŠã™ã™ã‚ã—ã¾ã™: %s。"
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "インターãƒãƒƒãƒˆæŽ¥ç¶šãŒå‹•ä½œã—ã¦ã„ã¾ã›ã‚“"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -442,198 +482,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "ã“ã®ã‚µãƒ¼ãƒãƒ¼ã¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã«æŽ¥ç¶šã—ã¦ã„ã¾ã›ã‚“。ã“ã®å ´åˆã€å¤–部ストレージã®ãƒžã‚¦ãƒ³ãƒˆã€æ›´æ–°ã®é€šçŸ¥ã‚„サードパーティアプリã¨ã„ã£ãŸã„ãã¤ã‹ã®æ©Ÿèƒ½ãŒä½¿ãˆã¾ã›ã‚“。ã¾ãŸã€ãƒªãƒ¢ãƒ¼ãƒˆæŽ¥ç¶šã§ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚¢ã‚¯ã‚»ã‚¹ã€é€šçŸ¥ãƒ¡ãƒ¼ãƒ«ã®é€ä¿¡ã¨è¨€ã£ãŸæ©Ÿèƒ½ã‚‚利用ã§ããªã„ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。全ã¦ã®æ©Ÿèƒ½ã‚’利用ã—ãŸã„ã®ã§ã‚ã‚Œã°ã€ã“ã®ã‚µãƒ¼ãƒãƒ¼ã‹ã‚‰ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã«æŽ¥ç¶šã§ãるよã†ã«ã™ã‚‹ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚"
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "ç›´è¿‘ã§ã¯ %s ã« cron ãŒå®Ÿè¡Œã•ã‚Œã¾ã—ãŸã€‚"
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "ç›´è¿‘ã§ã¯ %s ã« cron ãŒå®Ÿè¡Œã•ã‚Œã¾ã—ãŸã€‚ã“ã‚Œã¯ä»Šã‹ã‚‰ï¼‘時間以上å‰ãªã®ã§ã€ãªã‚“らã‹ã®å•é¡ŒãŒç™ºç”Ÿã—ã¦ã„るよã†ã§ã™ã€‚"
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "cron ã¯æœªã 実行ã•ã‚Œã¦ã„ã¾ã›ã‚“ï¼"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "å„ページã®èªã¿è¾¼ã¿æ™‚ã«ã‚¿ã‚¹ã‚¯ã‚’実行ã™ã‚‹"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.phpã¯ã€HTTP経由ã§15分ã”ã¨ã«cron.phpを実行ã™ã‚‹ã‚ˆã†webcronサービスã«ç™»éŒ²ã•ã‚Œã¦ã„ã¾ã™"
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "システムã®cronサービスを利用ã—ã¦15分ã”ã¨ã«cron.phpファイルを実行ã—ã¾ã™ã€‚"
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "共有"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "共有APIを有効ã«ã™ã‚‹"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "アプリã‹ã‚‰ã®å…±æœ‰APIã®åˆ©ç”¨ã‚’許å¯ã™ã‚‹"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "リンクを許å¯ã™ã‚‹"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "ユーザーãŒãƒªãƒ³ã‚¯ã«ã‚ˆã‚Šã‚¢ã‚¤ãƒ†ãƒ を公開ã™ã‚‹ã“ã¨ã‚’許å¯ã™ã‚‹"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr "常ã«ãƒ‘スワードä¿è·ã‚’有効ã«ã™ã‚‹"
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "パブリックãªã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’許å¯"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "公開ã—ã¦ã„る共有フォルダーã¸ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’共有ã—ã¦ã„るメンãƒãƒ¼ã«ã‚‚許å¯"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "有効期é™ã®æ—¢å®šå€¤ã‚’è¨å®š"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "無効ã«ãªã‚‹ã¾ã§"
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "æ—¥"
-#: templates/admin.php:235
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "有効期é™ã‚’åæ˜ ã•ã›ã‚‹"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "ユーザーãŒãƒªãƒ³ã‚¯ã«ã‚ˆã‚Šã‚¢ã‚¤ãƒ†ãƒ を公開ã™ã‚‹ã“ã¨ã‚’許å¯ã™ã‚‹"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "å†å…±æœ‰ã‚’許å¯ã™ã‚‹"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "ユーザーãŒå…±æœ‰ã—ã¦ã„るアイテムã®å†å…±æœ‰ã‚’許å¯ã™ã‚‹"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "ユーザーã«èª°ã¨ã§ã‚‚共有ã™ã‚‹ã“ã¨ã‚’許å¯ã™ã‚‹"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "ユーザーã«ã‚°ãƒ«ãƒ¼ãƒ—内ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¨ã®ã¿å…±æœ‰ã‚’許å¯ã™ã‚‹"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "メール通知を許å¯"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "共有ファイルã«é–¢ã™ã‚‹ãƒ¡ãƒ¼ãƒ«é€šçŸ¥ã®é€ä¿¡ã‚’ユーザã«è¨±å¯ã™ã‚‹"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr "有効期é™ã®æ—¢å®šå€¤ã‚’è¨å®š"
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "無効ã«ãªã‚‹ã¾ã§"
-
-#: templates/admin.php:266
-msgid "days"
-msgstr "æ—¥"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr "有効期é™ã‚’åæ˜ ã•ã›ã‚‹"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "既定値ã§ã¯ N 日後ã«å…±æœ‰ã‚’無効ã«ã—ã¾ã™"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "ã‚»ã‚ュリティ"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "常ã«HTTPSを使用ã™ã‚‹"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "クライアントã‹ã‚‰ %sã¸ã®æŽ¥ç¶šã‚’常ã«æš—å·åŒ–ã—ã¾ã™ã€‚"
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "強制的ãªSSL接続を有効/無効ã«ã™ã‚‹ã«ã¯ã€HTTPS経由㧠%s ã¸æŽ¥ç¶šã—ã¦ãã ã•ã„。"
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "メールサーãƒãƒ¼"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "ã“ã‚Œã¯é€šçŸ¥ã®é€ä¿¡ã«ä½¿ã‚ã‚Œã¾ã™ã€‚"
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "アドレスã‹ã‚‰"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "è¦æ±‚ã•ã‚Œã‚‹èªè¨¼"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "サーãƒãƒ¼ã‚¢ãƒ‰ãƒ¬ã‚¹"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "ãƒãƒ¼ãƒˆ"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "è³‡æ ¼æƒ…å ±"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "SMTP ユーザーå"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "SMTP パスワード"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "メールテストè¨å®š"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "メールをé€ä¿¡"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "ãƒã‚°"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "ãƒã‚°ãƒ¬ãƒ™ãƒ«"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "ã‚‚ã£ã¨è¦‹ã‚‹"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "é–‰ã˜ã‚‹"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -786,29 +834,33 @@ msgstr "言語"
msgid "Help translate"
msgstr "翻訳ã«å”力ã™ã‚‹"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "<a href=\"%s\" target=\"_blank\">WebDAV 経由ã§ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¢ã‚¯ã‚»ã‚¹</a> ã™ã‚‹ã«ã¯ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’利用ã—ã¦ãã ã•ã„"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "æš—å·åŒ–アプリã¯ã‚‚ã¯ã‚„有効ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’複åˆã—ã¦ãã ã•ã„"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "ãƒã‚°ã‚¤ãƒ³ãƒ‘スワード"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’複åˆã™ã‚‹"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "æš—å·åŒ–ã‚ーã¯ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—å ´æ‰€ã«ç§»å‹•ã•ã‚Œã¾ã—ãŸã€‚何ã‹å•é¡ŒãŒã‚ã£ãŸå ´åˆã¯ã€ã‚ーを復元ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒæ£ã—ã復å·åŒ–ã•ã‚ŒãŸã“ã¨ãŒç¢ºä¿¡ã§ãã‚‹å ´åˆã«ã®ã¿ã€ã‚ーを完全ã«å‰Šé™¤ã—ã¦ãã ã•ã„。"
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "æš—å·åŒ–ã‚ーを復元ã™ã‚‹"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "æš—å·åŒ–ã‚ーを削除ã™ã‚‹"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "ãƒã‚°ã‚¤ãƒ³å"
diff --git a/l10n/ja/user_ldap.po b/l10n/ja/user_ldap.po
index e3c1343a4e5cbd769009f774b841d6285fe90b68..745ef7dd4d4d0c87674c9125f02ab4b3ea3c5d0c 100644
--- a/l10n/ja/user_ldap.po
+++ b/l10n/ja/user_ldap.po
@@ -7,14 +7,14 @@
# plazmism <gomidori@live.jp>, 2013-2014
# kuromabo <md81bird@hitaki.net>, 2014
# mikako, 2014
-# tt yn <tetuyano+transi@gmail.com>, 2013
+# tt yn <tetuyano+transi@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2014-04-30 18:30+0000\n"
-"Last-Translator: mikako\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -75,6 +75,10 @@ msgstr "最近ã®ã‚µãƒ¼ãƒãƒ¼è¨å®šã‹ã‚‰è¨å®šã‚’引ã継ãŽã¾ã™ã‹ï¼Ÿ"
msgid "Keep settings?"
msgstr "è¨å®šã‚’ä¿æŒã—ã¾ã™ã‹ï¼Ÿ"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "サーãƒãƒ¼è¨å®šã‚’è¿½åŠ ã§ãã¾ã›ã‚“"
@@ -91,6 +95,18 @@ msgstr "æˆåŠŸ"
msgid "Error"
msgstr "エラー"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "è¨å®šOK"
@@ -131,26 +147,42 @@ msgstr "ç¾åœ¨ã®ã‚µãƒ¼ãƒãƒ¼è¨å®šã‚’本当ã«å‰Šé™¤ã—ã¦ã‚‚よã‚ã—ã„ã§ã™
msgid "Confirm Deletion"
msgstr "削除ã®ç¢ºèª"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s グループãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸ"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s ユーザーãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸ"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "無効ãªãƒ›ã‚¹ãƒˆ"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "望ã¾ã—ã„機能ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ"
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "グループフィルタ"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "ä¿å˜"
@@ -223,10 +255,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "ãƒã‚°ã‚¤ãƒ³å®Ÿè¡Œæ™‚ã«é©ç”¨ã™ã‚‹ãƒ•ã‚£ãƒ«ã‚¿ã‚’定義ã—ã¾ã™ã€‚%%uid ã«ã¯ãƒã‚°ã‚¤ãƒ³æ“作ã«ãŠã‘るユーザーåãŒå…¥ã‚Šã¾ã™ã€‚例： \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "サーãƒãƒ¼è¨å®šã‚’è¿½åŠ "
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "ホスト"
@@ -290,6 +335,14 @@ msgstr "戻る"
msgid "Continue"
msgstr "続ã‘ã‚‹"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "詳細è¨å®š"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
@@ -424,14 +477,14 @@ msgstr "オンã«åˆ‡ã‚Šæ›¿ãˆãŸã‚‰ã€ã‚°ãƒ«ãƒ¼ãƒ—ã‚’å«ã‚€ã‚°ãƒ«ãƒ¼ãƒ—ãŒã‚µãƒ
#: templates/settings.php:40
msgid "Paging chunksize"
-msgstr ""
+msgstr "ページ分割サイズ"
#: templates/settings.php:40
msgid ""
"Chunksize used for paged LDAP searches that may return bulky results like "
"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
"those situations.)"
-msgstr ""
+msgstr "ページ分割サイズã¯ã€LDAP検索時ã«ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚„グループã®ãƒªã‚¹ãƒˆä¸€è¦§ãƒ‡ãƒ¼ã‚¿ã‚’一括ã§è¿”ã™ãƒ‡ãƒ¼ã‚¿é‡ã‚’指定ã—ã¾ã™ã€‚(è¨å®šãŒ0ã®å ´åˆã«ã¯ã€LDAP検索ã®åˆ†å‰²è»¢é€ã¯ç„¡åŠ¹)"
#: templates/settings.php:42
msgid "Special Attributes"
diff --git a/l10n/jv/core.po b/l10n/jv/core.po
index 64f25812fdb88a3b0e321164c3373615fbb39f4b..a951c950aecc85361293e3013d97c02d09b8dba1 100644
--- a/l10n/jv/core.po
+++ b/l10n/jv/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: jv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/jv/files.po b/l10n/jv/files.po
index dd04289877d25b65f960ad0c782dd174249e6045..e5cc9081821750eb064dccb1308e1c0c5897ea80 100644
--- a/l10n/jv/files.po
+++ b/l10n/jv/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Njipuk"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/jv/files_encryption.po b/l10n/jv/files_encryption.po
index 8d6649ddda9c830279e4137ad2ebfacdc215a0cd..9dbe3b0897546b50228e0a385a5a739fac05d3ea 100644
--- a/l10n/jv/files_encryption.po
+++ b/l10n/jv/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-08 01:56-0400\n"
-"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/jv/files_external.po b/l10n/jv/files_external.po
index b8a754a67f42532b12328fc204d4dc27a5e04c81..586984979d0cfde6acc0658d034b218a0eca5e1d 100644
--- a/l10n/jv/files_external.po
+++ b/l10n/jv/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/jv/files_sharing.po b/l10n/jv/files_sharing.po
index 1b1b9c350908b1b2f70d2fa1d3f871f1b52f1814..738dbb6afa36c1de3cfea3b8ad6d1540a7ec9401 100644
--- a/l10n/jv/files_sharing.po
+++ b/l10n/jv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: jv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "Njipuk"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/jv/files_trashbin.po b/l10n/jv/files_trashbin.po
index be9965732a85297a6a33780593d3aedb171d740c..b39c94318744efb806ad8f2f37cf1929b31a78ce 100644
--- a/l10n/jv/files_trashbin.po
+++ b/l10n/jv/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-08 01:56-0400\n"
-"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -27,23 +27,23 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
msgstr ""
-#: js/trash.js:264
-msgid "Deleted Files"
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
msgstr ""
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
@@ -51,10 +51,6 @@ msgstr ""
msgid "Name"
msgstr ""
-#: templates/index.php:21 templates/index.php:23
-msgid "Restore"
-msgstr ""
-
#: templates/index.php:29
msgid "Deleted"
msgstr ""
diff --git a/l10n/jv/lib.po b/l10n/jv/lib.po
index 1b5ca0c5cb4f36eb7f87ae4475e1e53d194c351f..f281c6c015ec38cac3d136a0b122e7a53d2eb3b7 100644
--- a/l10n/jv/lib.po
+++ b/l10n/jv/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: jv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/jv/settings.po b/l10n/jv/settings.po
index b110d3bb8870c0854bb8cec922be53032a587958..f49d5565f3bc596380d972d0d3225157cc3bef23 100644
--- a/l10n/jv/settings.po
+++ b/l10n/jv/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/jv/user_ldap.po b/l10n/jv/user_ldap.po
index 78b1071347a596b89cf3b47df09671fa085801db..f62aef04ac563528cb9487c064cb132b79590259 100644
--- a/l10n/jv/user_ldap.po
+++ b/l10n/jv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 85690d9056a21aaf6a3b108f3eeaf3710bbf9a3d..b59056a7f2851ae940c0ca5ae7e3b20ee92e1627 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,202 +63,202 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "კვირáƒ"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "áƒáƒ შáƒáƒ‘áƒáƒ—ი"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "სáƒáƒ›áƒ¨áƒáƒ‘áƒáƒ—ი"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "áƒáƒ—ხშáƒáƒ‘áƒáƒ—ი"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "ხუთშáƒáƒ‘áƒáƒ—ი"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "პáƒáƒ áƒáƒ¡áƒ™áƒ”ვი"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "შáƒáƒ‘áƒáƒ—ი"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "იáƒáƒœáƒ•áƒáƒ ი"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "თებერვáƒáƒšáƒ˜"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "მáƒáƒ ტი"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "áƒáƒžáƒ ილი"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "მáƒáƒ˜áƒ¡áƒ˜"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "ივნისი"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "ივლისი"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "áƒáƒ’ვისტáƒ"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "სექტემბერი"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "áƒáƒ¥áƒ¢áƒáƒ›áƒ‘ერი"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "ნáƒáƒ”მბერი"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "დეკემბერი"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "პáƒáƒ áƒáƒ›áƒ”ტრები"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "შენáƒáƒ®áƒ•áƒ..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "წáƒáƒ›áƒ˜áƒ¡ წინ"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "დღეს"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "გუშინ"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "გáƒáƒ¡áƒ£áƒš თვეში"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "ბáƒáƒšáƒ წელს"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "წლის წინ"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "áƒáƒ ჩევáƒ"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "კი"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "áƒáƒ áƒ"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "áƒáƒ ჩევáƒ"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "დიáƒáƒ®"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "áƒáƒ®áƒáƒšáƒ˜ ფáƒáƒ˜áƒšáƒ”ბი"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "უáƒáƒ ყáƒáƒ¤áƒ"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,140 +290,149 @@ msgstr "გáƒáƒ–იáƒáƒ ებული"
msgid "Share"
msgstr "გáƒáƒ–იáƒáƒ ებáƒ"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "შეცდáƒáƒ›áƒ"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "შეცდáƒáƒ›áƒ გáƒáƒ–იáƒáƒ ების დრáƒáƒ¡"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "შეცდáƒáƒ›áƒ გáƒáƒ–იáƒáƒ ების გáƒáƒ£áƒ¥áƒ›áƒ”ბის დრáƒáƒ¡"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "შეცდáƒáƒ›áƒ დáƒáƒ¨áƒ•áƒ”ბის ცვლილების დრáƒáƒ¡"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "გáƒáƒ–იáƒáƒ დრთქვენთვის დრჯგუფისთვის {group}, {owner}–ის მიერ"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "გáƒáƒ–იáƒáƒ დრთქვენთვის {owner}–ის მიერ"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "პáƒáƒ áƒáƒšáƒ˜áƒ— დáƒáƒªáƒ•áƒ"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "პáƒáƒ áƒáƒšáƒ˜"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "ლინკის პირáƒáƒ•áƒœáƒ”ბის იმეილზე გáƒáƒ’ზáƒáƒ•áƒœáƒ"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "გáƒáƒ’ზáƒáƒ•áƒœáƒ"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "მიუთითე ვáƒáƒ“ის გáƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ დრáƒ"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "ვáƒáƒ“ის გáƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ დრáƒ"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "გáƒáƒáƒ–იáƒáƒ ე მეილზე"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებელი áƒáƒ áƒáƒ ის ნáƒáƒžáƒáƒ•áƒœáƒ˜"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "ჯგუფი"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "მეáƒáƒ ეჯერგáƒáƒ–იáƒáƒ ებრáƒáƒ áƒáƒ ის დáƒáƒ¨áƒ•áƒ”ბული"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "გáƒáƒ–იáƒáƒ დრ{item}–ში {user}–ის მიერ"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "გáƒáƒ£áƒ–იáƒáƒ ებáƒáƒ“ი"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "შეგიძლირშეცვლáƒ"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "დáƒáƒ¨áƒ•áƒ”ბის კáƒáƒœáƒ¢áƒ áƒáƒšáƒ˜"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "შექმნáƒ"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "გáƒáƒœáƒáƒ®áƒšáƒ”ბáƒ"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "წáƒáƒ¨áƒšáƒ"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "გáƒáƒ–იáƒáƒ ებáƒ"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "პáƒáƒ áƒáƒšáƒ˜áƒ— დáƒáƒªáƒ£áƒšáƒ˜"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "შეცდáƒáƒ›áƒ ვáƒáƒ“ის გáƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ მáƒáƒ®áƒ¡áƒœáƒ˜áƒ¡ დრáƒáƒ¡"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "შეცდáƒáƒ›áƒ ვáƒáƒ“ის გáƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ მითითების დრáƒáƒ¡"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "გáƒáƒ’ზáƒáƒ•áƒœáƒ ...."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "იმეილი გáƒáƒ˜áƒ’ზáƒáƒ•áƒœáƒ"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "გáƒáƒ¤áƒ თხილებáƒ"
@@ -450,18 +464,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "გáƒáƒœáƒáƒ®áƒšáƒ”ბრვერგáƒáƒœáƒ®áƒáƒ ციელდáƒ. გთხáƒáƒ•áƒ— შეგვáƒáƒ¢áƒ§áƒáƒ‘ინáƒáƒ— áƒáƒ› პრáƒáƒ‘ლემის შესáƒáƒ®áƒ”ბ áƒáƒ¥: <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "გáƒáƒœáƒáƒ®áƒšáƒ”ბრვერგáƒáƒœáƒ®áƒáƒ ციელდáƒ. გáƒáƒ“áƒáƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ თებრთქვენს ownCloud–ზე."
@@ -662,6 +677,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "შექმენი <strong>áƒáƒ“მინ ექáƒáƒ£áƒœáƒ¢áƒ˜</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "პáƒáƒ áƒáƒšáƒ˜"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -787,8 +806,27 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud–ის გáƒáƒœáƒáƒ®áƒšáƒ”ბრ%s–ვერსიáƒáƒ›áƒ“ე. ეს მáƒáƒ˜áƒ—ხáƒáƒ•áƒ¡ გáƒáƒ კვეულ დრáƒáƒ¡."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 38a6d30197919d4606a4df5c26663e31aef62b66..3f4bb299212feb8d28772c6174f5798aad0484ae 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr "%s –ის გáƒáƒ“áƒáƒ¢áƒáƒœáƒ ვერმáƒáƒ®áƒ”რხდáƒ
msgid "Could not move %s"
msgstr "%s –ის გáƒáƒ“áƒáƒ¢áƒáƒœáƒ ვერმáƒáƒ®áƒ”რხდáƒ"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "ფáƒáƒ˜áƒšáƒ˜áƒ¡ სáƒáƒ®áƒ”ლი áƒáƒ შეიძლებრიყáƒáƒ¡ ცáƒáƒ იელი."
@@ -36,18 +36,18 @@ msgstr "ფáƒáƒ˜áƒšáƒ˜áƒ¡ სáƒáƒ®áƒ”ლი áƒáƒ შეიძლებáƒ
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "áƒáƒ áƒáƒ“áƒáƒ¨áƒ•áƒ”ბáƒáƒ“ი სáƒáƒ®áƒ”ლი, '\\', '/', '<', '>', ':', '\"', '|', '?' დრ'*' áƒáƒ áƒáƒ ის დáƒáƒ˜áƒ¨áƒ•áƒ”ბული."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr "დრáƒáƒ”ბითი სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე áƒáƒ áƒáƒ სე
msgid "Failed to write to disk"
msgstr "შეცდáƒáƒ›áƒ დისკზე ჩáƒáƒ¬áƒ”რისáƒáƒ¡"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "სáƒáƒªáƒáƒ•áƒ¨áƒ˜ სáƒáƒ™áƒ›áƒáƒ ისი áƒáƒ“გილი áƒáƒ áƒáƒ ის"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "დáƒáƒ£áƒ¨áƒ•áƒ”ბელი დირექტáƒáƒ იáƒ."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "ფáƒáƒ˜áƒšáƒ”ბი"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "áƒáƒ¢áƒ•áƒ˜áƒ თვრშეჩერებულ იქნáƒ."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,117 +177,117 @@ msgstr "მიმდინáƒáƒ ეáƒáƒ‘ს ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} უკვე áƒáƒ სებáƒáƒ‘ს"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "გáƒáƒ–იáƒáƒ ებáƒ"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "სრულáƒáƒ“ წáƒáƒ¨áƒšáƒ"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "გáƒáƒ“áƒáƒ ქმევáƒ"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "გáƒáƒ“მáƒáƒ¬áƒ”რის მáƒáƒ—ხáƒáƒ•áƒœáƒ მუშáƒáƒ•áƒ“ებáƒ. ის მáƒáƒ˜áƒ—ხáƒáƒ•áƒ¡ გáƒáƒ კვეულ დრáƒáƒ¡ რáƒáƒ’დáƒáƒœ ფáƒáƒ˜áƒšáƒ”ბი áƒáƒ ის დიდი ზáƒáƒ›áƒ˜áƒ¡."
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "მáƒáƒªáƒ“ის რეჟიმში"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "შეცდáƒáƒ›áƒ"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "სáƒáƒ®áƒ”ლი"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "ზáƒáƒ›áƒ"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "შეცვლილიáƒ"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "თქვენი სáƒáƒªáƒáƒ•áƒ˜ გáƒáƒ“áƒáƒ˜áƒ•áƒ¡áƒ. ფáƒáƒ˜áƒšáƒ”ბის გáƒáƒœáƒáƒ®áƒšáƒ”ბრდრსინქრáƒáƒœáƒ˜áƒ–ირებრვერმáƒáƒ®áƒ”რხდებáƒ!"
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "თქვენი სáƒáƒªáƒáƒ•áƒ˜ თითქმის გáƒáƒ“áƒáƒ˜áƒ•áƒ¡áƒ ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -293,12 +297,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -335,68 +339,75 @@ msgstr "ZIP ფáƒáƒ˜áƒšáƒ”ბის მáƒáƒ¥áƒ¡áƒ˜áƒ›áƒ£áƒ› დáƒáƒ¡áƒáƒ¨áƒ•
msgid "Save"
msgstr "შენáƒáƒ®áƒ•áƒ"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "áƒáƒ®áƒáƒšáƒ˜"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "ტექსტური ფáƒáƒ˜áƒšáƒ˜"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "áƒáƒ®áƒáƒšáƒ˜ ფáƒáƒšáƒ“ერი"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "სáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ე"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "მისáƒáƒ›áƒáƒ თიდáƒáƒœ"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "წáƒáƒ¨áƒšáƒ˜áƒšáƒ˜ ფáƒáƒ˜áƒšáƒ”ბი"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "áƒáƒ¢áƒ•áƒ˜áƒ თვის გáƒáƒ£áƒ¥áƒ›áƒ”ბáƒ"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "áƒáƒ¥ áƒáƒ áƒáƒ¤áƒ”რი áƒáƒ áƒáƒ ის. áƒáƒ¢áƒ•áƒ˜áƒ თე რáƒáƒ›áƒ”!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "ჩáƒáƒ›áƒáƒ¢áƒ•áƒ˜áƒ თვáƒ"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "წáƒáƒ¨áƒšáƒ"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "áƒáƒ¡áƒáƒ¢áƒ•áƒ˜áƒ თი ფáƒáƒ˜áƒšáƒ˜ ძáƒáƒšáƒ˜áƒáƒœ დიდიáƒ"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "ფáƒáƒ˜áƒšáƒ˜áƒ¡ ზáƒáƒ›áƒ რáƒáƒ›áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ თვáƒáƒ¡áƒáƒª თქვენ áƒáƒžáƒ˜áƒ ებთ, áƒáƒáƒáƒ ბებს სერვერზე დáƒáƒ¨áƒ•áƒ”ბულ მáƒáƒ¥áƒ¡áƒ˜áƒ›áƒ£áƒ›áƒ¡."
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "მიმდინáƒáƒ ეáƒáƒ‘ს ფáƒáƒ˜áƒšáƒ”ბის სკáƒáƒœáƒ˜áƒ ებáƒ, გთხáƒáƒ•áƒ— დáƒáƒ”ლáƒáƒ“áƒáƒ—."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "მიმდინáƒáƒ ე სკáƒáƒœáƒ˜áƒ ებáƒ"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
index caedd121e7293cd6c57c14e2fe91d53c93119f12..9e698e3bbc9185c0720815be7c499201a9e80d04 100644
--- a/l10n/ka_GE/files_encryption.po
+++ b/l10n/ka_GE/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "ენკრიპციáƒ"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index 8b34d45ece8cf7bd6e0e12f61891448629cb47b5..bc0bd6a008e4892cf943a727034a24ec4e611f2b 100644
--- a/l10n/ka_GE/files_external.po
+++ b/l10n/ka_GE/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "ჰáƒáƒ¡áƒ¢áƒ˜"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr "შეცდáƒáƒ›áƒ Google Drive სáƒáƒªáƒáƒ•áƒ˜áƒ¡ კáƒáƒœáƒ¤áƒ˜
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index 60eddfd228a1fe6004c688cca27b1feed89e0c42..b9fa08d892125a90036087b6f8c71658529030da 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "გáƒáƒ–იáƒáƒ დრ{owner} –ის მიერ"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "პáƒáƒ áƒáƒšáƒ˜"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "ჩáƒáƒ›áƒáƒ¢áƒ•áƒ˜áƒ თვáƒ"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index c4f96c3539956a6e2bbb5dac8162e6f9b7e6fd56..6058d4077f739d17ebcedc4a767a0fd03a43a2f3 100644
--- a/l10n/ka_GE/files_trashbin.po
+++ b/l10n/ka_GE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr "ფáƒáƒ˜áƒšáƒ˜ %s–ის სრულáƒáƒ“ წáƒáƒ¨áƒšáƒ ვეáƒ
msgid "Couldn't restore %s"
msgstr "%s–ის áƒáƒ¦áƒ“გენრვერმáƒáƒ®áƒ”რხდáƒ"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "წáƒáƒ¨áƒšáƒ˜áƒšáƒ˜ ფáƒáƒ˜áƒšáƒ”ბი"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "áƒáƒ¦áƒ“გენáƒ"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "შეცდáƒáƒ›áƒ"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "წáƒáƒ¨áƒšáƒ˜áƒšáƒ˜ ფáƒáƒ˜áƒšáƒ”ბი"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "áƒáƒ¥ áƒáƒ áƒáƒ¤áƒ”რი áƒáƒ áƒáƒ ის. სáƒáƒœáƒáƒ’ვე ყუთი ცáƒáƒ იელიáƒ!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "სáƒáƒ®áƒ”ლი"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "áƒáƒ¦áƒ“გენáƒ"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "წáƒáƒ¨áƒšáƒ˜áƒšáƒ˜"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "წáƒáƒ¨áƒšáƒ"
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index ff8932e37846f4c00bbbb78084d6ac7d27f32081..11c21374e3b47c591e41ce4c4433c0b71c54de25 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr "web services under your control"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP download–ი გáƒáƒ—იშულიáƒ"
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "ფáƒáƒ˜áƒšáƒ”ბი უნდრგáƒáƒ“მáƒáƒ˜áƒ¢áƒ•áƒ˜áƒ თáƒáƒ¡ სáƒáƒ—ითáƒáƒáƒ“."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "უკáƒáƒœ ფáƒáƒ˜áƒšáƒ”ბში"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "áƒáƒ ჩეული ფáƒáƒ˜áƒšáƒ”ბი ძáƒáƒšáƒ˜áƒáƒœ დიდირzip ფáƒáƒ˜áƒšáƒ˜áƒ¡ გენერáƒáƒªáƒ˜áƒ˜áƒ¡áƒ—ვის."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr "დáƒáƒáƒ§áƒ”ნეთ áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ის
msgid "Set an admin password."
msgstr "დáƒáƒáƒ§áƒ”ნეთ áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ის პáƒáƒ áƒáƒšáƒ˜."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "თქვენი web სერვერი áƒáƒ áƒáƒ ის კáƒáƒœáƒ¤áƒ˜áƒ’ურირებული ფáƒáƒ˜áƒš სინქრáƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—ვის, რáƒáƒ“გáƒáƒœ WebDAV ინტერფეისი შეიძლებრიყáƒáƒ¡ გáƒáƒ¢áƒ”ხილი."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "გთხáƒáƒ•áƒ— გáƒáƒ“áƒáƒáƒ—ვáƒáƒšáƒ˜áƒ”რáƒáƒ— <a href='%s'>ინსტáƒáƒšáƒáƒªáƒ˜áƒ˜áƒ¡ გზáƒáƒ›áƒ™áƒ•áƒšáƒ”ვი</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "\"%s\" კáƒáƒ¢áƒ”გáƒáƒ იის მáƒáƒ«áƒ”ბნრვერმáƒáƒ®áƒ”რხდáƒ"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 825e4120d44c4484700f5520c6c7d6414065dd93..ba3e2eed8cd99d4fd4c1d363f1295ca770e39fc4 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "იმეილი გáƒáƒ˜áƒ’ზáƒáƒ•áƒœáƒ"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "ენკრიპციáƒ"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -99,6 +99,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "იმეილი შენáƒáƒ®áƒ£áƒšáƒ˜áƒ"
@@ -115,6 +125,16 @@ msgstr "ჯგუფის წáƒáƒ¨áƒšáƒ ვერმáƒáƒ®áƒ”რხდáƒ"
msgid "Unable to delete user"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის წáƒáƒ¨áƒšáƒ ვერმáƒáƒ®áƒ”რხდáƒ"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "ენრშეცვლილიáƒ"
@@ -170,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -226,34 +246,42 @@ msgstr "გáƒáƒœáƒáƒ®áƒšáƒ”ბáƒ"
msgid "Updated"
msgstr "გáƒáƒœáƒáƒ®áƒšáƒ”ბულიáƒ"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "წáƒáƒ¨áƒšáƒ˜áƒšáƒ˜"
@@ -266,8 +294,8 @@ msgstr "დáƒáƒ‘რუნებáƒ"
msgid "Unable to remove user"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის წáƒáƒ¨áƒšáƒ ვერმáƒáƒ®áƒ”რხდáƒ"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "ჯგუფები"
@@ -299,7 +327,7 @@ msgstr "უნდრმიუთითáƒáƒ— áƒáƒ სებული პáƒáƒ
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__language_name__"
@@ -367,7 +395,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "გáƒáƒ¤áƒ თხილებრდáƒáƒ§áƒ”ნებისáƒáƒ¡"
@@ -382,53 +410,65 @@ msgstr "თქვენი web სერვერი áƒáƒ áƒáƒ ის კáƒ
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "მáƒáƒ“ული 'fileinfo' áƒáƒ áƒáƒ სებáƒáƒ‘ს"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "PHP მáƒáƒ“ული 'fileinfo' áƒáƒ áƒáƒ სებáƒáƒ‘ს. ჩვენ გირჩევთ რáƒáƒ› áƒáƒ£áƒªáƒ˜áƒšáƒ”ბლáƒáƒ“ ჩáƒáƒ თáƒáƒ— ეს მáƒáƒ“ული, რáƒáƒ› მიიღáƒáƒ— კáƒáƒ გი შედეგები mime-type–ს áƒáƒ¦áƒ›áƒáƒ©áƒ”ნისáƒáƒ¡."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "ლáƒáƒ™áƒáƒšáƒ˜áƒ–áƒáƒªáƒ˜áƒ áƒáƒ მუშáƒáƒáƒ‘ს"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "ინტერნეტ კáƒáƒ•áƒ¨áƒ˜áƒ ი áƒáƒ მუშáƒáƒáƒ‘ს"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -437,198 +477,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron–ი"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "გáƒáƒ£áƒ¨áƒ•áƒ˜ თითრმáƒáƒ¥áƒ›áƒ”დებრყველრჩáƒáƒ¢áƒ•áƒ˜áƒ თულ გვერდზე"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "გáƒáƒ–იáƒáƒ ებáƒ"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Share API–ის ჩáƒáƒ თვáƒ"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "დáƒáƒ£áƒ¨áƒ•áƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”ბის უფლებრShare API –ზე"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "ლინკების დáƒáƒ¨áƒ•áƒ”ბáƒ"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "მიეცი მáƒáƒ›áƒ®áƒ›áƒáƒ ებლებს უფლებრრáƒáƒ› გáƒáƒáƒ–იáƒáƒ áƒáƒ¡ ელემენტები სáƒáƒ¯áƒáƒ áƒáƒ“ ლინკებით"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "მიეცი მáƒáƒ›áƒ®áƒ›áƒáƒ ებლებს უფლებრრáƒáƒ› გáƒáƒáƒ–იáƒáƒ áƒáƒ¡ ელემენტები სáƒáƒ¯áƒáƒ áƒáƒ“ ლინკებით"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "გáƒáƒ“áƒáƒ–იáƒáƒ ების დáƒáƒ¨áƒ•áƒ”ბáƒ"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "მიეცით მáƒáƒ›áƒ®áƒ›áƒáƒ ებლებს უფლებრრáƒáƒ› გáƒáƒáƒ–იáƒáƒ áƒáƒ¡ მისთვის გáƒáƒ–იáƒáƒ ებული"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "მიეცით უფლებრმáƒáƒ›áƒ®áƒ›áƒáƒ ებლებს გáƒáƒáƒ–იáƒáƒ áƒáƒ¡ ყველáƒáƒ¡áƒ—ვის"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "მიეცით უფლებრმáƒáƒ›áƒ®áƒ›áƒáƒ ებლებს რáƒáƒ› გáƒáƒáƒ–იáƒáƒ áƒáƒ¡ მხáƒáƒšáƒáƒ“ თáƒáƒ•áƒ˜áƒáƒœáƒ—ი ჯგუფისთვის"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "უსáƒáƒ¤áƒ თხáƒáƒ”ბáƒ"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "HTTPS–ის ჩáƒáƒ თვáƒ"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "სერვერის მისáƒáƒ›áƒáƒ თი"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "პáƒáƒ ტი"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "იუზერ/პáƒáƒ áƒáƒšáƒ˜"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "ლáƒáƒ’ი"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "ლáƒáƒ’ირების დáƒáƒœáƒ”"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "უფრრმეტი"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "უფრრნáƒáƒ™áƒšáƒ”ბი"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "ვერსიáƒ"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +829,33 @@ msgstr "ენáƒ"
msgid "Help translate"
msgstr "თáƒáƒ გმნის დáƒáƒ®áƒ›áƒáƒ ებáƒ"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr ""
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr ""
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის სáƒáƒ®áƒ”ლი"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index 67ebf990ba568bb2c8e01f2dfe2dfa70d8529d4d..25b176ddc904db5479e30ddfb41fc327a7ae9bc4 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr "დáƒáƒ‘რუნდებით სერვერის წინáƒ
msgid "Keep settings?"
msgstr "დáƒáƒ•áƒ¢áƒáƒ•áƒáƒ— პáƒáƒ áƒáƒ›áƒ”ტრები?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "სერვერის პáƒáƒ áƒáƒ›áƒ”ტრების დáƒáƒ›áƒáƒ¢áƒ”ბრვერმáƒáƒ®áƒ”რხდáƒ"
@@ -86,6 +90,18 @@ msgstr "დáƒáƒ¡áƒ ულდáƒ"
msgid "Error"
msgstr "შეცდáƒáƒ›áƒ"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,26 +142,42 @@ msgstr "ნáƒáƒ›áƒ“ვილáƒáƒ“ გინდáƒáƒ— წáƒáƒ¨áƒáƒšáƒáƒ— ს
msgid "Confirm Deletion"
msgstr "წáƒáƒ¨áƒšáƒ˜áƒ¡ დáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ ებáƒ"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "ჯგუფის ფილტრი"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "შენáƒáƒ®áƒ•áƒ"
@@ -218,10 +250,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "სერვერის პáƒáƒ áƒáƒ›áƒ”ტრების დáƒáƒ›áƒáƒ¢áƒ”ბáƒ"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "ჰáƒáƒ¡áƒ¢áƒ˜"
@@ -285,6 +330,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "დáƒáƒ›áƒáƒ¢áƒ”ბითი ფუნქციები"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/km/core.po b/l10n/km/core.po
index 16bb7ca083117647063cfc80b8c7b1eafba59f23..1139b389cfea97f2b78aa0b4413e684e4f8927cc 100644
--- a/l10n/km/core.po
+++ b/l10n/km/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: km\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -59,224 +64,224 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "ážáŸ’ងៃអាទិážáŸ’áž™"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "ážáŸ’ងៃចន្ទ"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "ážáŸ’ងៃអង្គារ"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "ážáŸ’ងៃពុធ"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "ážáŸ’ងៃព្រហស្បážáž·áŸ"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "ážáŸ’ងៃសុក្រ"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "ážáŸ’ងៃសៅរáŸ"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "ážáŸ‚មករា"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "ážáŸ‚កុម្ភៈ"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "ážáŸ‚មីនា"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "ážáŸ‚មáŸážŸáž¶"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "ážáŸ‚ឧសភា"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "ážáŸ‚មិážáž»áž“ា"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "ážáŸ‚កក្កដា"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "ážáŸ‚សីហា"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "ážáŸ‚កញ្ញា"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "ážáŸ‚ážáž»áž›áž¶"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "ážáŸ‚វិច្ឆិកា"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "ážáŸ‚ធ្នូ"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "ការកំណážáŸ‹"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "កំពុង​រក្សាទុក"
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "វិនាទី​មុន"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n នាទី​មុន"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n ម៉ោង​មុន"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "ážáŸ’ងៃនáŸáŸ‡"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "ម្សិលមិញ"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n ážáŸ’ងៃ​មុន"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "ážáŸ‚មុន"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n ážáŸ‚​មុន"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "ឆ្នាំ​មុន"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "ឆ្នាំ​មុន"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "ជ្រើស"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "ព្រម"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "áž‘áŸ"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "ជ្រើស"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "ព្រម"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
-msgstr ""
+msgstr "ឯកសារ​ážáŸ’មី"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
-msgstr ""
+msgstr "មាន​ឯកសារ​នáŸáŸ‡â€‹ážšáž½áž…​ហើយ"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "លើកលែង"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
-msgstr ""
+msgstr "បន្áž"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
-msgstr ""
+msgstr "(បាន​ជ្រើស​ទាំង​អស់)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
-msgstr ""
+msgstr "(បាន​ជ្រើស {count})"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
#: js/setup.js:84
msgid "Very weak password"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ​ណាស់"
#: js/setup.js:85
msgid "Weak password"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ"
#: js/setup.js:86
msgid "So-so password"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹áž’ម្មážáž¶"
#: js/setup.js:87
msgid "Good password"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹áž›áŸ’អ"
#: js/setup.js:88
msgid "Strong password"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’លាំង"
#: js/share.js:51 js/share.js:66 js/share.js:106
msgid "Shared"
@@ -286,140 +291,149 @@ msgstr "បាន​ចែក​រំលែក"
msgid "Share"
msgstr "ចែក​រំលែក"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "កំហុស"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "កំហុស​ពáŸáž›â€‹áž…ែក​រំលែក"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "កំពុង​ពáŸáž›â€‹áž›áŸ‚ង​ចែក​រំលែក"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "មាន​កំហុស​នៅ​ពáŸáž›â€‹áž”្ដូរ​សិទ្ធិ"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាážáŸ‹"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "ពាក្យសម្ងាážáŸ‹"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
-msgstr ""
+msgstr "អនុញ្ញាážâ€‹áž€áž¶ážšâ€‹áž•áŸ’ទុកឡើង​ជា​សាធារណៈ"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "ផ្ញើ"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "កំណážáŸ‹â€‹áž–áŸáž›â€‹áž•áž»ážâ€‹áž€áŸ†ážŽážáŸ‹"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "áž–áŸáž›â€‹áž•áž»ážâ€‹áž€áŸ†ážŽážáŸ‹"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "ចែក​រំលែក​ážáž¶áž˜â€‹áž¢áŸŠáž¸áž˜áŸ‚ល៖"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "រក​មិន​ឃើញ​មនុស្ស​ណា​ម្នាក់"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "ក្រុម"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "មិន​អនុញ្ញាážâ€‹áž²áŸ’យ​មាន​ការ​ចែក​រំលែក​ឡើង​វិញ"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "បាន​ចែក​រំលែក​ក្នុង {item} ជាមួយ {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "លែង​ចែក​រំលែក"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "អាច​កែប្រែ"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "សិទ្ធិ​បញ្ជា"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "បង្កើáž"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "ធ្វើ​បច្ចុប្បន្នភាព"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "លុប"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "ចែក​រំលែក"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "បាន​ការ​ពារ​ដោយ​ពាក្យ​សម្ងាážáŸ‹"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "កំពុង​ផ្ញើ ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "បាន​ផ្ញើ​អ៊ីមែល"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "បម្រាម"
@@ -451,18 +465,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
-msgid "Please reload the page."
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
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>."
+#: js/update.js:43
+msgid "Please reload the page."
+msgstr "សូម​ផ្ទុក​ទំពáŸážšâ€‹áž“áŸáŸ‡â€‹áž¡áž¾áž„​វិញ។"
+
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -475,7 +490,7 @@ msgstr ""
msgid ""
"A problem has occurred whilst sending the email, please contact your "
"administrator."
-msgstr ""
+msgstr "មាន​កំហុស​បាន​កើážâ€‹áž¡áž¾áž„​នៅ​ពáŸáž›áž›â€‹áž€áŸ†áž–ុង​ផ្ញើ​អ៊ីមែល​ចáŸáž‰, សូម​ទាក់ទង​អភិបាល​របស់​អ្នក។"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -661,35 +676,39 @@ msgstr ""
#: templates/installation.php:48
msgid "Create an <strong>admin account</strong>"
-msgstr ""
+msgstr "បង្កើážâ€‹<strong>គណនី​អភិបាល</strong>"
+
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "ពាក្យសម្ងាážáŸ‹"
#: templates/installation.php:70
msgid "Storage & database"
-msgstr ""
+msgstr "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្ននáŸáž™"
#: templates/installation.php:77
msgid "Data folder"
-msgstr ""
+msgstr "ážážâ€‹áž‘ិន្ននáŸáž™"
#: templates/installation.php:90
msgid "Configure the database"
-msgstr ""
+msgstr "កំណážáŸ‹â€‹ážŸážŽáŸ’ឋាន​មូលដ្ឋាន​ទិន្ននáŸáž™"
#: templates/installation.php:94
msgid "will be used"
-msgstr ""
+msgstr "នឹង​ážáŸ’រូវ​បាន​ប្រើ"
#: templates/installation.php:109
msgid "Database user"
-msgstr ""
+msgstr "អ្នក​ប្រើ​មូលដ្ឋាន​ទិន្ននáŸáž™"
#: templates/installation.php:118
msgid "Database password"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹áž˜áž¼áž›ážŠáŸ’ឋាន​ទិន្ននáŸáž™"
#: templates/installation.php:123
msgid "Database name"
-msgstr ""
+msgstr "ឈ្មោះ​មូលដ្ឋាន​ទិន្ននáŸáž™"
#: templates/installation.php:132
msgid "Database tablespace"
@@ -697,15 +716,15 @@ msgstr ""
#: templates/installation.php:140
msgid "Database host"
-msgstr ""
+msgstr "ម៉ាស៊ីន​មូលដ្ឋាន​ទិន្ននáŸáž™"
#: templates/installation.php:150
msgid "Finish setup"
-msgstr ""
+msgstr "បញ្ចប់​ការ​ដំឡើង"
#: templates/installation.php:150
msgid "Finishing …"
-msgstr ""
+msgstr "កំពុង​បញ្ចប់ ..."
#: templates/layout.user.php:40
msgid ""
@@ -721,11 +740,11 @@ msgstr ""
#: templates/layout.user.php:74 templates/singleuser.user.php:8
msgid "Log out"
-msgstr ""
+msgstr "ចាក​ចáŸáž‰"
#: templates/login.php:9
msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "បាន​បដិសáŸáž’​ការ​ចូល​ដោយ​ស្វáŸáž™â€‹áž”្រវážáŸ’ážáž·!"
#: templates/login.php:10
msgid ""
@@ -735,7 +754,7 @@ msgstr ""
#: templates/login.php:12
msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "សូម​ប្ដូរ​ពាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក ដើម្បី​ការពារ​គណនី​របស់​អ្នក។"
#: templates/login.php:17
msgid "Server side authentication failed!"
@@ -747,19 +766,19 @@ msgstr ""
#: templates/login.php:46
msgid "Lost your password?"
-msgstr ""
+msgstr "បាážáŸ‹â€‹áž–ាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក?"
#: templates/login.php:51
msgid "remember"
-msgstr ""
+msgstr "ចងចាំ"
#: templates/login.php:54
msgid "Log in"
-msgstr ""
+msgstr "ចូល"
#: templates/login.php:60
msgid "Alternative Logins"
-msgstr ""
+msgstr "ការ​ចូល​ជំនួស"
#: templates/mail.php:15
#, php-format
@@ -788,7 +807,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/km/files.po b/l10n/km/files.po
index c64208f96621e6f0c92ebaf5dada8150fdb4787f..6070aa15cf86d20f0dc3308c549bf83ae73170d4 100644
--- a/l10n/km/files.po
+++ b/l10n/km/files.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# សុវិចិážáŸ’ážš Sovichet áž‘áŸáž– Tep, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -27,27 +28,27 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
-msgstr ""
+msgstr "ឈ្មោះ​ឯកសារ​មិន​អាច​នៅ​ទទáŸâ€‹áž”ាន​ឡើយ។"
#: ajax/newfile.php:63
#, php-format
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "ឈ្មោះ​មិន​ážáŸ’រឹម​ážáŸ’រូវ, មិន​អនុញ្ញាហ'\\', '/', '<', '>', ':', '\"', '|', '?' áž“áž·áž„ '*' áž‘áŸáŸ”"
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +124,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "ឯកសារ"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
-msgstr ""
+msgstr "បាន​បោះបង់​ការ​ផ្ទុក​ឡើង។"
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,117 +178,117 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
-msgstr ""
+msgstr "មាន​ឈ្មោះ {new_name} រួច​ហើយ"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "ចែក​រំលែក"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
-msgstr ""
+msgstr "លុប​ជា​អចិន្ážáŸ’រៃយáŸ"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
-msgstr ""
+msgstr "ប្ដូរ​ឈ្មោះ"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
-msgstr ""
+msgstr "ការ​ទាញយក​របស់​អ្នក​កំពុង​ážáŸ’រូវ​បាន​រៀបចំ​ហើយ។ áž“áŸáŸ‡â€‹áž¢áž¶áž…​ចំណាយ​ពáŸáž›â€‹áž˜áž½áž™â€‹ážŸáŸ†áž‘ុះ ប្រសិន​បើ​ឯកសារ​ធំ។"
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
-msgstr ""
+msgstr "កំពុង​រង់ចាំ"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "កំហុស"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "ឈ្មោះ"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "ទំហំ"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
-msgstr ""
+msgstr "បាន​កែ​ប្រែ"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -293,12 +298,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -309,7 +314,7 @@ msgstr ""
#: templates/admin.php:6
msgid "Maximum upload size"
-msgstr ""
+msgstr "ទំហំ​ផ្ទុកឡើង​ជា​អážáž·áž”រមា"
#: templates/admin.php:9
msgid "max. possible: "
@@ -321,82 +326,89 @@ msgstr ""
#: templates/admin.php:16
msgid "Enable ZIP-download"
-msgstr ""
+msgstr "បើក​ការ​ទាញយក​ជា ZIP"
#: templates/admin.php:19
msgid "0 is unlimited"
-msgstr ""
+msgstr "0 គឺ​មិន​កំណážáŸ‹"
#: templates/admin.php:21
msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "ទំហំ​ចូល​ជា​អážáž·áž”រមា​សម្រាប់​ឯកសារ ZIP"
#: templates/admin.php:25
msgid "Save"
msgstr "រក្សាទុក"
-#: templates/index.php:5
-msgid "New"
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:5
+msgid "New"
+msgstr "ážáŸ’មី"
+
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
-msgstr ""
+msgstr "ឯកសារ​អក្សរ"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "ážážâ€‹ážáŸ’មី"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "ážáž"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
-msgstr ""
-
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
+msgstr "ពី​ážáŸ†ážŽ"
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
-msgstr ""
+msgstr "បោះបង់​ការ​ផ្ទុកឡើង"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
-msgstr ""
+msgstr "គ្មាន​អ្វី​នៅ​ទីនáŸáŸ‡â€‹áž‘áŸáŸ” ផ្ទុក​ឡើង​អ្វី​មួយ!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "ទាញយក"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "លុប"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
-msgstr ""
+msgstr "ផ្ទុក​ឡើង​ធំ​ពáŸáž€"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/km/files_encryption.po b/l10n/km/files_encryption.po
index 0a25d9009490938717e03c83fce60ff679d37cdf..57fbebe8b4044d9d8382d3c7ffe5848cdd004594 100644
--- a/l10n/km/files_encryption.po
+++ b/l10n/km/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-14 01:54-0400\n"
-"PO-Revision-Date: 2014-04-13 09:20+0000\n"
-"Last-Translator: សុវិចិážáŸ’ážš Sovichet áž‘áŸáž– Tep\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -77,7 +77,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -92,7 +92,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/km/files_external.po b/l10n/km/files_external.po
index 14b936bdb4a7abac80e2918f7bf532db91908033..a9cf22d5cee8b11886fa6cce3acccef2e90cba63 100644
--- a/l10n/km/files_external.po
+++ b/l10n/km/files_external.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# សុវិចិážáŸ’ážš Sovichet áž‘áŸáž– Tep, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +83,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "ម៉ាស៊ីន​ផ្ទុក"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +166,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -175,15 +180,15 @@ msgstr ""
#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
msgid "Access granted"
-msgstr ""
+msgstr "បាន​ទទួល​សិទ្ធិ​ចូល"
#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
msgid "Error configuring Dropbox storage"
-msgstr ""
+msgstr "កំហុស​ការ​កំណážáŸ‹â€‹ážŸážŽáŸ’ឋាន​នៃ​ឃ្លាំងផ្ទុក Dropbox"
#: js/dropbox.js:68 js/google.js:89
msgid "Grant access"
-msgstr ""
+msgstr "ទទួល​សិទ្ធិ​ចូល"
#: js/dropbox.js:102
msgid "Please provide a valid Dropbox app key and secret."
@@ -195,31 +200,31 @@ msgstr ""
#: js/settings.js:318 js/settings.js:325
msgid "Saved"
-msgstr ""
+msgstr "បាន​រក្សាទុក"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -228,7 +233,7 @@ msgstr ""
#: templates/settings.php:2
msgid "External Storage"
-msgstr ""
+msgstr "ឃ្លាំងផ្ទុក​ážáž¶áž„ក្រៅ"
#: templates/settings.php:8 templates/settings.php:27
msgid "Folder name"
@@ -236,11 +241,11 @@ msgstr "ឈ្មោះ​ážáž"
#: templates/settings.php:9
msgid "External storage"
-msgstr ""
+msgstr "ឃ្លាំងផ្ទុក​ážáž¶áž„ក្រៅ"
#: templates/settings.php:10
msgid "Configuration"
-msgstr ""
+msgstr "ការ​កំណážáŸ‹â€‹ážŸážŽáŸ’ឋាន"
#: templates/settings.php:11
msgid "Options"
@@ -252,7 +257,7 @@ msgstr ""
#: templates/settings.php:32
msgid "Add storage"
-msgstr ""
+msgstr "បន្ážáŸ‚ម​ឃ្លាំងផ្ទុក"
#: templates/settings.php:92
msgid "No user or group"
@@ -260,7 +265,7 @@ msgstr ""
#: templates/settings.php:95
msgid "All Users"
-msgstr ""
+msgstr "អ្នក​ប្រើ​ទាំងអស់"
#: templates/settings.php:97
msgid "Groups"
diff --git a/l10n/km/files_sharing.po b/l10n/km/files_sharing.po
index 542b4301873535839c92e44e7b0abc61eac11888..e276bd19077479f46ea7999eeb7ebe0780d1c86c 100644
--- a/l10n/km/files_sharing.po
+++ b/l10n/km/files_sharing.po
@@ -4,12 +4,13 @@
#
# Translators:
# Pongsametrey SOK <metreysk@gmail.com>, 2014
+# សុវិចិážáŸ’ážš Sovichet áž‘áŸáž– Tep, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -18,55 +19,87 @@ msgstr ""
"Language: km\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
+msgstr "{owner} បាន​ចែក​រំលែក"
+
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
msgstr ""
#: templates/authenticate.php:4
msgid "This share is password-protected"
-msgstr ""
+msgstr "ការ​ចែករំលែក​នáŸáŸ‡â€‹ážáŸ’រូវ​បាន​ការពារ​ដោយ​ពាក្យ​សម្ងាážáŸ‹"
#: templates/authenticate.php:7
msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážáž»ážŸâ€‹áž ើយ។ ព្យាយាម​ម្ដង​ទៀážáŸ”"
#: templates/authenticate.php:10
msgid "Password"
msgstr "ពាក្យសម្ងាážáŸ‹"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+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:21
msgid "Download"
msgstr "ទាញយក"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
-msgstr ""
+msgstr "ទាញយក %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
-msgstr ""
+msgstr "ážáŸ†ážŽâ€‹áž•áŸ’ទាល់"
diff --git a/l10n/km/files_trashbin.po b/l10n/km/files_trashbin.po
index a1b7649d1a03322742b83d250f7b1e201e785dbf..b03e1951c8bb7d1bf850021b3dc7f862bda68176 100644
--- a/l10n/km/files_trashbin.po
+++ b/l10n/km/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# សុវិចិážáŸ’ážš Sovichet áž‘áŸáž– Tep, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -20,45 +21,41 @@ msgstr ""
#: ajax/delete.php:59
#, php-format
msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "មិន​អាច​លុប %s ចោល​ជា​អចិន្ážáŸ’រៃយáŸâ€‹áž‘áŸ"
#: ajax/undelete.php:64
#, php-format
msgid "Couldn't restore %s"
-msgstr ""
+msgstr "មិន​អាច​ស្ដារ %s ឡើង​វិញ​បាន​ទáŸ"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
-msgstr ""
+msgstr "ឯកសារ​ដែល​បាន​លុប"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "ស្ដារ​មក​វិញ"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "កំហុស"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
-msgstr ""
+msgstr "បាន​ស្ដារ​វិញ"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "គ្មាន​អ្វី​នៅ​ទីនáŸáŸ‡â€‹áž‘áŸáŸ” ធុង​សំរាម​របស់​អ្នក​គឺ​ទទáŸ!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "ឈ្មោះ"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "ស្ដារ​មក​វិញ"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
-msgstr ""
+msgstr "បាន​លុប"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "លុប"
diff --git a/l10n/km/lib.po b/l10n/km/lib.po
index cb39aa475aa7967b3bd31a4381190bd4b3b13795..77ac12125f930c079f21b575dd2ebce7344a607b 100644
--- a/l10n/km/lib.po
+++ b/l10n/km/lib.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: km\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -77,23 +77,23 @@ msgstr "រូបភាព​មិន​ážáŸ’រឹម​ážáŸ’រូវ"
msgid "web services under your control"
msgstr "សáŸážœáž¶áž€áž˜áŸ’ម​វáŸáž”​ក្រោម​ការ​ការ​បញ្ជា​របស់​អ្នក"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "បាន​បិទ​ការ​ទាញ​យក ZIP ។"
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "ážáŸ’រូវ​ការ​ទាញ​យក​ឯកសារ​ម្ដង​មួយៗ។"
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "ážáŸ’រឡប់​ទៅ​ឯកសារ"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "ឯកសារ​ដែល​បាន​ជ្រើស មាន​ទំហំ​ធំ​ពáŸáž€â€‹áž€áŸ’នុង​ការ​បង្កើážâ€‹áž‡áž¶ zip ។"
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -279,127 +279,138 @@ msgstr "កំណážáŸ‹â€‹ážˆáŸ’មោះ​អ្នក​គ្រប់គ្
msgid "Set an admin password."
msgstr "កំណážáŸ‹â€‹áž–ាក្យ​សម្ងាážáŸ‹â€‹áž¢áŸ’នក​គ្រប់គ្រង។"
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "រក​មិន​ឃើញ​ចំណាážáŸ‹â€‹áž€áŸ’រុម \"%s\""
diff --git a/l10n/km/settings.po b/l10n/km/settings.po
index 604ed997d3d4dc5ba5211d556aea96623fe8c712..cd8df94d3ebef0230ce18993afeaeea351325cce 100644
--- a/l10n/km/settings.po
+++ b/l10n/km/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -26,20 +26,20 @@ msgstr ""
#: admin/controller.php:73
msgid "Saved"
-msgstr ""
+msgstr "បាន​រក្សាទុក"
#: admin/controller.php:90
msgid "test email settings"
-msgstr ""
+msgstr "សាក​ល្បង​ការ​កំណážáŸ‹â€‹áž¢áŸŠáž¸áž˜áŸ‚áž›"
#: admin/controller.php:91
msgid "If you received this email, the settings seem to be correct."
-msgstr ""
+msgstr "ប្រសិន​បើ​អ្នក​ទទួល​បាន​អ៊ីមែល​នáŸáŸ‡ មាន​នáŸáž™â€‹ážáž¶â€‹áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹áž‚ឺ​បាន​ážáŸ’រឹមម​ážáŸ’រូវ​ហើយ។"
#: admin/controller.php:94
msgid ""
"A problem occurred while sending the e-mail. Please revisit your settings."
-msgstr ""
+msgstr "មាន​កំហុស​កើážâ€‹áž¡áž¾áž„​នៅ​ពáŸáž›â€‹áž€áŸ†áž–ុង​ផ្ញើ​អ៊ីមែល​ចáŸáž‰áŸ” សូម​មើល​ការ​កំណážáŸ‹â€‹ážšáž”ស់​អ្នក​ម្ដង​ទៀážáŸ”"
#: admin/controller.php:99
msgid "Email sent"
@@ -47,17 +47,17 @@ msgstr "បាន​ផ្ញើ​អ៊ីមែល"
#: admin/controller.php:101
msgid "You need to set your user email before being able to send test emails."
-msgstr ""
+msgstr "អ្នក​ážáŸ’រូវ​ážáŸ‚​កំណážáŸ‹â€‹áž¢áŸŠáž¸áž˜áŸ‚ល​របស់​អ្នក​មុន​នឹង​អាច​ផ្ញើ​អ៊ីមែល​សាកល្បង​បាន។"
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "កូដនីយកម្ម"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -100,6 +100,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "បាន​រក្សា​ទុក​អ៊ីមែល"
@@ -116,6 +126,16 @@ msgstr "មិន​អាច​លុប​ក្រុម​បាន"
msgid "Unable to delete user"
msgstr "មិន​អាច​លុប​អ្នក​ប្រើ​បាន"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "បាន​ប្ដូរ​ភាសា"
@@ -144,7 +164,7 @@ msgstr "មិន​អាច​ធ្វើ​បច្ចុប្បន្ន
#: changepassword/controller.php:17
msgid "Wrong password"
-msgstr ""
+msgstr "ážáž»ážŸâ€‹áž–ាក្យ​សម្ងាážáŸ‹"
#: changepassword/controller.php:36
msgid "No user supplied"
@@ -171,9 +191,9 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
-msgstr ""
+msgstr "កំពុង​ផ្ញើ..."
#: js/apps.js:45 templates/help.php:4
msgid "User Documentation"
@@ -181,7 +201,7 @@ msgstr "ឯកសារ​សម្រាប់​អ្នក​ប្រើប
#: js/apps.js:50
msgid "Admin Documentation"
-msgstr ""
+msgstr "កម្រង​ឯកសារ​អភិបាល"
#: js/apps.js:67
msgid "Update to {appversion}"
@@ -227,34 +247,42 @@ msgstr "ធ្វើ​បច្ចុប្បន្នភាព"
msgid "Updated"
msgstr "បាន​ធ្វើ​បច្ចុប្បន្នភាព"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
-msgstr ""
+msgstr "ជ្រើស​រូបភាព​ប្រវážáŸ’ážáž·ážšáž¼áž”"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ​ណាស់"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹áž’ម្មážáž¶"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹áž›áŸ’អ"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’លាំង"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "បាន​លុប"
@@ -267,8 +295,8 @@ msgstr "មិន​ធ្វើ​វិញ"
msgid "Unable to remove user"
msgstr "មិន​អាច​ដក​អ្នក​ប្រើ​ចáŸáž‰"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "ក្រុ"
@@ -300,7 +328,7 @@ msgstr "ážáŸ’រូវ​ផ្ដល់​ពាក្យ​សម្ងាáž
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__language_name__"
@@ -326,7 +354,7 @@ msgstr ""
#: templates/admin.php:16 templates/admin.php:23
msgid "None"
-msgstr ""
+msgstr "គ្មាន"
#: templates/admin.php:17
msgid "Login"
@@ -342,11 +370,11 @@ msgstr ""
#: templates/admin.php:24
msgid "SSL"
-msgstr ""
+msgstr "SSL"
#: templates/admin.php:25
msgid "TLS"
-msgstr ""
+msgstr "TLS"
#: templates/admin.php:47 templates/admin.php:61
msgid "Security Warning"
@@ -368,7 +396,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "បម្រាម​ការ​ដំឡើង"
@@ -383,53 +411,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "ážáŸ’វះ​ម៉ូឌុល 'fileinfo'"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "ážáŸ’វះ​ម៉ូឌុល 'fileinfo' ។ យើង​សូម​ណែនាំ​ឲ្យ​បើក​ម៉ូឌុល​នáŸáŸ‡ ដើម្បី​ទទួល​បាន​លទ្ធផល​ល្អ​នៃ​ការ​សម្គាល់​ប្រភáŸáž‘ mime ។"
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Locale មិន​ដំណើរការ"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "ការ​ážáž—្ជាប់​អ៊ីនធឺណិážâ€‹áž˜áž·áž“​មាន​ដំណើរ​ការ"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -438,198 +478,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "ការ​ចែក​រំលែក"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "បើក API ចែក​រំលែក"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "អនុញ្ញាážâ€‹áž²áŸ’យ​កម្មវិធី​ប្រើ API ចែក​រំលែក"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "អនុញ្ញាážâ€‹ážáŸ†ážŽ"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "អនុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​ប្រើ​ចែក​រំលែក​របស់​ទៅ​សាធារណៈ​ជាមួយ​ážáŸ†ážŽ"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
+msgstr "អនុញ្ញាážâ€‹áž€áž¶ážšâ€‹áž•áŸ’ទុក​ឡើង​ជា​សាធារណៈ"
+
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "អនុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​ប្រើ​ចែក​រំលែក​របស់​ទៅ​សាធារណៈ​ជាមួយ​ážáŸ†ážŽ"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "អនុញ្ញាážâ€‹áž€áž¶ážšâ€‹áž…ែក​រំលែក​ម្ដង​ទៀáž"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "អនុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​ប្រើ​ចែក​រំលែក​ជាមួយ​នរណា​ម្នាក់"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "សុវážáŸ’ážáž·áž—ាព"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "បង្ážáŸ† HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
-msgstr ""
+msgstr "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
+msgstr "ពី​អាសយដ្ឋាន"
+
+#: templates/admin.php:375
+msgid "mail"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
-msgstr ""
+msgstr "ច្រក"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
-msgstr ""
+msgstr "ផ្ញើ​អ៊ីមែល"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Log"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "កម្រិហLog"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "ច្រើន​ទៀáž"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "ážáž·áž…"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "កំណែ"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -706,11 +754,11 @@ msgstr "ពាក្យសម្ងាážáŸ‹"
#: templates/personal.php:39
msgid "Your password was changed"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក​ážáŸ’រូវ​បាន​ប្ដូរ"
#: templates/personal.php:40
msgid "Unable to change your password"
-msgstr ""
+msgstr "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក​បាន​ទáŸ"
#: templates/personal.php:42
msgid "Current password"
@@ -744,19 +792,19 @@ msgstr ""
#: templates/personal.php:89
msgid "Profile picture"
-msgstr ""
+msgstr "រូបភាព​ប្រវážáŸ’ážáž·ážšáž¼áž”"
#: templates/personal.php:94
msgid "Upload new"
-msgstr ""
+msgstr "ផ្ទុកឡើង​ážáŸ’មី"
#: templates/personal.php:96
msgid "Select new from Files"
-msgstr ""
+msgstr "ជ្រើស​ážáŸ’មី​ពី​ឯកសារ"
#: templates/personal.php:97
msgid "Remove image"
-msgstr ""
+msgstr "ដក​រូបភាព​ចáŸáž‰"
#: templates/personal.php:98
msgid "Either png or jpg. Ideally square but you will be able to crop it."
@@ -782,27 +830,31 @@ msgstr "ភាសា"
msgid "Help translate"
msgstr "ជួយ​បក​ប្រែ"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr "ពាក្យ​សម្ងាážáŸ‹â€‹áž…ូល​គណនី"
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
@@ -825,7 +877,7 @@ msgstr ""
#: templates/users.php:40
msgid "Default Storage"
-msgstr ""
+msgstr "ឃ្លាំង​ផ្ទុក​លំនាំ​ដើម"
#: templates/users.php:42 templates/users.php:137
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
@@ -833,7 +885,7 @@ msgstr ""
#: templates/users.php:46 templates/users.php:146
msgid "Unlimited"
-msgstr ""
+msgstr "មិន​កំណážáŸ‹"
#: templates/users.php:64 templates/users.php:161
msgid "Other"
@@ -845,7 +897,7 @@ msgstr "ឈ្មោះ​អ្នកប្រើ"
#: templates/users.php:92
msgid "Storage"
-msgstr ""
+msgstr "ឃ្លាំង​ផ្ទុក"
#: templates/users.php:106
msgid "change full name"
@@ -853,8 +905,8 @@ msgstr ""
#: templates/users.php:110
msgid "set new password"
-msgstr ""
+msgstr "កំណážáŸ‹â€‹áž–ាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’មី"
#: templates/users.php:141
msgid "Default"
-msgstr ""
+msgstr "លំនាំ​ដើម"
diff --git a/l10n/km/user_ldap.po b/l10n/km/user_ldap.po
index 95c01b84d5b738297b44681f80dab98d080e1d7a..49602c5b0352a1cdea23b5a03f26a6623abb0713 100644
--- a/l10n/km/user_ldap.po
+++ b/l10n/km/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr ""
msgid "Keep settings?"
msgstr "រក្សា​ទុក​ការ​កំណážáŸ‹?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "មិន​អាច​បន្ážáŸ‚ម​ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ម៉ាស៊ីន​បម្រើ"
@@ -87,6 +91,18 @@ msgstr ""
msgid "Error"
msgstr "កំហុស"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -127,26 +143,42 @@ msgstr "ážáž¾â€‹áž¢áŸ’នក​ពិážâ€‹áž‡áž¶â€‹áž…ង់​លុប​ក
msgid "Confirm Deletion"
msgstr "បញ្ជាក់​ការ​លុប"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "រក្សាទុក"
@@ -219,10 +251,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "បន្ážáŸ‚ម​ការ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ម៉ាស៊ីន​បម្រើ"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "ម៉ាស៊ីន​ផ្ទុក"
@@ -234,7 +279,7 @@ msgstr ""
#: templates/part.wizard-server.php:36
msgid "Port"
-msgstr ""
+msgstr "ច្រក"
#: templates/part.wizard-server.php:44
msgid "User DN"
@@ -284,8 +329,16 @@ msgstr ""
#: templates/part.wizardcontrols.php:8
msgid "Continue"
+msgstr "បន្áž"
+
+#: templates/settings.php:7
+msgid "Expert"
msgstr ""
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "កម្រិážâ€‹ážáŸ’ពស់"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index 77ca23e3f58df9d492953da62473de67d234ebe1..ed6d7315e248e4722441328af0821d59d8c657f5 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: kn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,202 +63,202 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,140 +290,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -450,18 +464,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -662,6 +677,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -787,7 +806,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/kn/files.po b/l10n/kn/files.po
index 81759f8fd67f6a58ffe49d6b88353f97e0bf0a50..37d31bf8f9abbf79fbadb5d7b5f4921f9568c88f 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,117 +177,117 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -293,12 +297,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -335,68 +339,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/kn/files_encryption.po b/l10n/kn/files_encryption.po
index 583e9d5bd4f6e5193ccd67c7d1f77e0e8d0d7e6f..7d5f722d703699a33da18d7619d8fa7d0cdfdf14 100644
--- a/l10n/kn/files_encryption.po
+++ b/l10n/kn/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/kn/files_external.po b/l10n/kn/files_external.po
index c27b7e9c25d8565c371c45a9a32aa7823c9683aa..41c0de8c2f34a93de94011ac6820eabbd4e8cff6 100644
--- a/l10n/kn/files_external.po
+++ b/l10n/kn/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/kn/files_sharing.po b/l10n/kn/files_sharing.po
index 391c5851f580bfe803ff179c25374409c0cb2dd1..b44a9919ae422b23718c8ce1ddf87ae46c162d36 100644
--- a/l10n/kn/files_sharing.po
+++ b/l10n/kn/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: kn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/kn/files_trashbin.po b/l10n/kn/files_trashbin.po
index 5e3bacaffee03a019f9f7dfa1348e11e74f61921..1fa5cc3019ed2c3c335da38f8a92cf1f9509e285 100644
--- a/l10n/kn/files_trashbin.po
+++ b/l10n/kn/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/kn/lib.po b/l10n/kn/lib.po
index 87c062eb0981e8c40b8fda501422d5d23913c24e..eaf9799ce3069d1f3524efcf6cc8ddcbfb31ca91 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: kn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index b2914c0adc0a396b709b861bcbdac827475ab1ab..407b6a993e9a03d801f02a9c91fd50bbd17d2384 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/kn/user_ldap.po b/l10n/kn/user_ldap.po
index 9254257e36cad4c1f6a29dd07b97786c42104472..2fa82e40f9da7f731590be02be28960fc2050bd7 100644
--- a/l10n/kn/user_ldap.po
+++ b/l10n/kn/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,66 +90,94 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -218,10 +250,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -285,6 +330,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index a929126a0fecbd90a3c69b58bff62af2554c688d..7e207960f7963bf79eefc4eaba149654f050fdec 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -24,11 +24,11 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "%s 님ì—게 ë©”ì¼ì„ 보낼 수 없습니다."
@@ -45,6 +45,11 @@ msgstr "ìœ ì§€ 보수 모드 꺼ì§"
msgid "Updated database"
msgstr "ë°ì´í„°ë² ì´ìŠ¤ ì—…ë°ì´íŠ¸ ë¨"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "ì´ë¯¸ì§€ë‚˜ 파ì¼ì´ ì—†ìŒ"
@@ -65,202 +70,202 @@ msgstr "사용 가능한 프로필 ì‚¬ì§„ì´ ì—†ìŠµë‹ˆë‹¤. 다시 ì‹œë„하ì‹
msgid "No crop data provided"
msgstr "ì„ íƒëœ ë°ì´í„°ê°€ 없습니다."
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "ì¼ìš”ì¼"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "월요ì¼"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "화요ì¼"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "수요ì¼"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "목요ì¼"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "금요ì¼"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "í† ìš”ì¼"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "1ì›”"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "2ì›”"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "3ì›”"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "4ì›”"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "5ì›”"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "6ì›”"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "7ì›”"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "8ì›”"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "9ì›”"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "10ì›”"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "11ì›”"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "12ì›”"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "ì„¤ì •"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "ì €ìž¥ 중..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "ì´ˆ ì „"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n분 ì „ "
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n시간 ì „ "
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "오늘"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "ì–´ì œ"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%nì¼ ì „ "
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "지난 달"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n달 ì „ "
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "ìž‘ë…„"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "ë…„ ì „"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "ì„ íƒ"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "íŒŒì¼ ì„ íƒ í…œí”Œë¦¿ì„ ë¶ˆëŸ¬ì˜¤ëŠ” 중 오류 ë°œìƒ: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "예"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "아니요"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "ì„ íƒ"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "íŒŒì¼ ì„ íƒ í…œí”Œë¦¿ì„ ë¶ˆëŸ¬ì˜¤ëŠ” 중 오류 ë°œìƒ: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "확ì¸"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "메시지 í…œí”Œë¦¿ì„ ë¶ˆëŸ¬ì˜¤ëŠ” 중 오류 ë°œìƒ: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "íŒŒì¼ {count}ê°œ 충ëŒ"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "íŒŒì¼ 1ê°œ 충ëŒ"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "ì–´ëŠ íŒŒì¼ì„ ìœ ì§€í•˜ì‹œê² ìŠµë‹ˆê¹Œ?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "ë‘ ë²„ì „ì„ ëª¨ë‘ ì„ íƒí•˜ë©´, íŒŒì¼ ì´ë¦„ì— ë²ˆí˜¸ê°€ 추가ë 것입니다."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "취소"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "계ì†"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(ëª¨ë‘ ì„ íƒë¨)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count}ê°œ ì„ íƒë¨)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "íŒŒì¼ ì¡´ìž¬í•¨ í…œí”Œë¦¿ì„ ë¶ˆëŸ¬ì˜¤ëŠ” 중 오류 ë°œìƒ"
@@ -292,140 +297,149 @@ msgstr "ê³µìœ ë¨"
msgid "Share"
msgstr "ê³µìœ "
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "오류"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "ê³µìœ í•˜ëŠ” 중 오류 ë°œìƒ"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "ê³µìœ í•´ì œí•˜ëŠ” 중 오류 ë°œìƒ"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "권한 변경하는 중 오류 ë°œìƒ"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} ë‹˜ì´ ì—¬ëŸ¬ë¶„ ë° ê·¸ë£¹ {group}와(ê³¼) ê³µìœ ì¤‘"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "{owner} ë‹˜ì´ ê³µìœ ì¤‘"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "ì‚¬ìš©ìž ë° ê·¸ë£¹ê³¼ ê³µìœ ..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "ë§í¬ ê³µìœ "
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "암호 보호"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "암호"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "공개 업로드 허용"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "ì´ë©”ì¼ ì£¼ì†Œ"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "ì „ì†¡"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "만료 ë‚ ì§œ ì„¤ì •"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "만료 ë‚ ì§œ"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "ì´ë©”ì¼ë¡œ ê³µìœ :"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "ë°œê²¬ëœ ì‚¬ëžŒ ì—†ìŒ"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "그룹"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "다시 ê³µìœ í• ìˆ˜ 없습니다"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "{user} 님과 {item}ì—ì„œ ê³µìœ ì¤‘"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "ê³µìœ í•´ì œ"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "ì´ë©”ì¼ë¡œ 알림"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "편집 가능"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "ì ‘ê·¼ ì œì–´"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "ìƒì„±"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "ì—…ë°ì´íŠ¸"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "ì‚ì œ"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "ê³µìœ "
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "암호로 보호ë¨"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "만료 ë‚ ì§œ í•´ì œ 오류"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "만료 ë‚ ì§œ ì„¤ì • 오류"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "ì „ì†¡ 중..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "ì´ë©”ì¼ ë°œì†¡ë¨"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "ê²½ê³ "
@@ -457,18 +471,19 @@ msgstr "대화 ìƒìž í…œí”Œë¦¿ì„ ë¶ˆëŸ¬ì˜¤ëŠ” 중 오류 ë°œìƒ: {error}"
msgid "No tags selected for deletion."
msgstr "ì‚ì œí• íƒœê·¸ë¥¼ ì„ íƒí•˜ì§€ 않았습니다."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "ì—…ë°ì´íŠ¸ê°€ 실패하였습니다. ì´ ë¬¸ì œë¥¼ <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 커뮤니티</a>ì— ë³´ê³ í•´ 주ì‹ì‹œì˜¤."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "ì—…ë°ì´íŠ¸ê°€ 성공하였습니다. ownCloudë¡œ ëŒì•„갑니다."
@@ -669,6 +684,10 @@ msgstr "올바른 서버 ì„¤ì •ì„ ìœ„í•œ ì •ë³´ëŠ” <a href=\"%s\" target=\"_bla
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>ê´€ë¦¬ìž ê³„ì •</strong> 만들기"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "암호"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "ìŠ¤í† ë¦¬ì§€ & ë°ì´í„°ë² ì´ìŠ¤"
@@ -794,8 +813,27 @@ msgstr "ê¸°ë‹¤ë ¤ 주셔서 ê°ì‚¬í•©ë‹ˆë‹¤."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud를 ë²„ì „ %s(으)ë¡œ ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤. ìž ì‹œ ê¸°ë‹¤ë ¤ 주ì‹ì‹œì˜¤."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 0ad3f4f0907f28f49556e215da27e455f219fb3f..736ecd217ef071d09e4639d2c3f8cef8111304b6 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr "í•ëª© %sì„(를) ì´ë™ì‹œí‚¬ 수 ì—†ìŒ - ê°™ì€ ì´ë¦„ì˜ íŒŒì¼ì´
msgid "Could not move %s"
msgstr "í•ëª© %sì„(를) ì´ë™ì‹œí‚¬ 수 ì—†ìŒ"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "íŒŒì¼ ì´ë¦„ì´ ë¹„ì–´ ìžˆì„ ìˆ˜ 없습니다."
@@ -42,18 +42,18 @@ msgstr "íŒŒì¼ ì´ë¦„ì´ ë¹„ì–´ ìžˆì„ ìˆ˜ 없습니다."
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "í´ë” ì´ë¦„ì´ ì˜¬ë°”ë¥´ì§€ 않습니다. ì´ë¦„ì— ë¬¸ìž '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 ì‚¬ìš©í• ìˆ˜ 없습니다."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -129,44 +129,48 @@ msgstr "ìž„ì‹œ í´ë”ê°€ ì—†ìŒ"
msgid "Failed to write to disk"
msgstr "디스í¬ì— 쓰지 못했습니다"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "ì €ìž¥ì†Œê°€ ìš©ëŸ‰ì´ ì¶©ë¶„í•˜ì§€ 않습니다."
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "ì—…ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤. ì—…ë¡œë“œí• íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "ì—…ë¡œë“œì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤. íŒŒì¼ ì •ë³´ë¥¼ ê°€ì ¸ì˜¬ 수 없습니다."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "올바르지 ì•Šì€ ë””ë ‰í„°ë¦¬ìž…ë‹ˆë‹¤."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "파ì¼"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "{filename}ì„(를) ì—…ë¡œë“œí• ìˆ˜ 없습니다. í´ë”ì´ê±°ë‚˜ 0 ë°”ì´íŠ¸ 파ì¼ìž…니다."
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "업로드가 취소ë˜ì—ˆìŠµë‹ˆë‹¤."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "서버ì—ì„œ 결과를 ê°€ì ¸ì˜¬ 수 없습니다."
@@ -179,117 +183,117 @@ msgstr "íŒŒì¼ ì—…ë¡œë“œê°€ 진행 중입니다. ì´ íŽ˜ì´ì§€ë¥¼ 벗어나면
msgid "URL cannot be empty"
msgstr "URLì´ ë¹„ì–´ìžˆì„ ìˆ˜ ì—†ìŒ"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name}ì´(ê°€) ì´ë¯¸ 존재함"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "파ì¼ì„ 만들 수 ì—†ìŒ"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "í´ë”를 만들 수 ì—†ìŒ"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "URLì„ ê°€ì ¸ì˜¬ 수 ì—†ìŒ"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "ê³µìœ "
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "ì˜êµ¬ížˆ ì‚ì œ"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "ì´ë¦„ 바꾸기"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "다운로드 준비 중입니다. íŒŒì¼ í¬ê¸°ê°€ í¬ë©´ ì‹œê°„ì´ ì˜¤ëž˜ 걸릴 ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤."
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "대기 중"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "íŒŒì¼ ì´ë™ 오류"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "오류"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "ì´ë¦„ì„ ë³€ê²½í• ìˆ˜ ì—†ìŒ"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "íŒŒì¼ ì‚ì œ 오류."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "ì´ë¦„"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "í¬ê¸°"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "ìˆ˜ì •ë¨"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "í´ë” %nê°œ"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "íŒŒì¼ %nê°œ"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "íŒŒì¼ %nê°œ 업로드 중"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "ì €ìž¥ ê³µê°„ì´ ê°€ë“ ì°¼ìŠµë‹ˆë‹¤. 파ì¼ì„ ì—…ë°ì´íŠ¸í•˜ê±°ë‚˜ ë™ê¸°í™”í• ìˆ˜ 없습니다!"
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "ì €ìž¥ ê³µê°„ì´ ê±°ì˜ ê°€ë“ ì°¼ìŠµë‹ˆë‹¤ ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "암호화 ì•±ì´ í™œì„±í™”ë˜ì–´ 있지만 키가 초기화ë˜ì§€ 않았습니다. 로그아웃한 후 다시 로그ì¸í•˜ì‹ì‹œì˜¤"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "암호화 ì•±ì˜ ê°œì¸ í‚¤ê°€ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤. ì•”í˜¸í™”ëœ íŒŒì¼ì— 다시 ì ‘ê·¼í•˜ë ¤ë©´ ê°œì¸ ì„¤ì •ì—ì„œ ê°œì¸ í‚¤ 암호를 ì—…ë°ì´íŠ¸í•´ì•¼ 합니다."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -299,12 +303,12 @@ msgstr "암호화는 í•´ì œë˜ì–´ 있지만, 파ì¼ì€ ì•„ì§ ì•”í˜¸í™”ë˜ì–´
msgid "{dirs} and {files}"
msgstr "{dirs} ê·¸ë¦¬ê³ {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%sì˜ ì´ë¦„ì„ ë³€ê²½í• ìˆ˜ 없습니다"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -341,68 +345,75 @@ msgstr "ZIP íŒŒì¼ ìµœëŒ€ í¬ê¸°"
msgid "Save"
msgstr "ì €ìž¥"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "WebDAVë¡œ 파ì¼ì— ì ‘ê·¼í•˜ë ¤ë©´ <a href=\"%s\" target=\"_blank\">ì´ ì£¼ì†Œë¥¼ 사용하ì‹ì‹œì˜¤</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "새로 만들기"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "새 í…스트 파ì¼"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "í…스트 파ì¼"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "새 í´ë”"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "í´ë”"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "ë§í¬ì—ì„œ"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "ì‚ì œëœ íŒŒì¼"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "업로드 취소"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "ì—¬ê¸°ì— íŒŒì¼ì„ 업로드하거나 만들 ê¶Œí•œì´ ì—†ìŠµë‹ˆë‹¤"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤. ì—…ë¡œë“œí• ìˆ˜ 있습니다!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "다운로드"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "ì‚ì œ"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "업로드한 파ì¼ì´ 너무 í¼"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "ì´ íŒŒì¼ì´ 서버ì—ì„œ 허용하는 최대 업로드 가능 용량보다 í½ë‹ˆë‹¤."
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "파ì¼ì„ ê²€ìƒ‰í•˜ê³ ìžˆìŠµë‹ˆë‹¤. ê¸°ë‹¤ë ¤ 주ì‹ì‹œì˜¤."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "현재 검색"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index 45a5e1ad7743251e9eb467880b7aaf6f603ce359..c26727da341d9df9f82958dfeb46edecf2b77e25 100644
--- a/l10n/ko/files_encryption.po
+++ b/l10n/ko/files_encryption.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -80,9 +80,9 @@ msgstr "ì´ íŒŒì¼ì„ ë³µí˜¸í™”í• ìˆ˜ 없습니다. ê³µìœ ëœ íŒŒì¼ì¼ 수ë„
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "ì•Œ 수 없는 오류. 시스템 ì„¤ì •ì„ í™•ì¸í•˜ê±°ë‚˜ 관리ìžì—게 문ì˜í•˜ì‹ì‹œì˜¤."
+msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -95,7 +95,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "PHP 5.3.3 ì´ìƒ 설치 여부, PHPì˜ OpenSSL 확장 기능 활성화 ë° ì„¤ì • 여부를 확ì¸í•˜ì‹ì‹œì˜¤. 암호화 ì•±ì´ ë¹„í™œì„±í™” ë˜ì—ˆìŠµë‹ˆë‹¤."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "ë‹¤ìŒ ì‚¬ìš©ìžëŠ” 암호화를 ì‚¬ìš©í• ìˆ˜ 없습니다:"
@@ -115,91 +115,91 @@ msgstr "다ìŒìœ¼ë¡œ 바로 가기: "
msgid "personal settings"
msgstr "ê°œì¸ ì„¤ì •"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "암호화"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "복구 키 사용 (암호를 ìžŠì—ˆì„ ë•Œ 파ì¼ì„ ë³µêµ¬í• ìˆ˜ 있ë„ë¡ í•¨):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "복구 키 암호"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "복구 키 암호 ìž¬ìž…ë ¥"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "활성화"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "비활성화"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "복구 키 암호 변경:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "ì´ì „ 복구 키 암호"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "새 복구 키 암호"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "새 복구 키 암호 ìž¬ìž…ë ¥"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "암호 변경"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "ê°œì¸ í‚¤ 암호와 ë¡œê·¸ì¸ ì•”í˜¸ê°€ ì¼ì¹˜í•˜ì§€ 않습니다:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "ì´ì „ ê°œì¸ í‚¤ 암호를 현재 ë¡œê·¸ì¸ ì•”í˜¸ë¡œ ì„¤ì •í•˜ì‹ì‹œì˜¤."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr " ì´ì „ 암호가 기억나지 않으면 시스템 관리ìžì—게 íŒŒì¼ ë³µêµ¬ë¥¼ ìš”ì²í•˜ì‹ì‹œì˜¤."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "ì´ì „ ë¡œê·¸ì¸ ì•”í˜¸"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "현재 ë¡œê·¸ì¸ ì•”í˜¸"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "ê°œì¸ í‚¤ 암호 ì—…ë°ì´íŠ¸"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "암호 복구 사용:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "ì´ ì˜µì…˜ì„ ì‚¬ìš©í•˜ë©´ 암호를 ìžŠì—ˆì„ ë•Œ ì•”í˜¸í™”ëœ íŒŒì¼ì— 다시 ì ‘ê·¼í• ìˆ˜ 있습니다"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "íŒŒì¼ ë³µêµ¬ ì„¤ì • ì—…ë°ì´íŠ¸ë¨"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "íŒŒì¼ ë³µêµ¬ë¥¼ ì—…ë°ì´íŠ¸í• 수 없습니다"
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index 525648f5c2db8742672e20fdffd67498b6417fc7..eb93989d91ed5f920b7df8d7b1c4c015216cc1d4 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/files_external.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
-"PO-Revision-Date: 2014-05-05 05:43+0000\n"
-"Last-Translator: ì±…ì½ëŠ”달팽 <bjh13579@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: I Robot\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"
@@ -84,9 +84,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "호스트"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -167,6 +167,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -199,29 +203,29 @@ msgstr "Google ë“œë¼ì´ë¸Œ ì €ìž¥ì†Œ ì„¤ì • 오류"
msgid "Saved"
msgstr "ì €ìž¥ë¨"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index 5084a6a34300b578a6b13fc719b431a3c4a0d5a7..fddf833460ee99f415bb7474590fd040d589e8ab 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,34 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "{owner} ë‹˜ì´ ê³µìœ í•¨"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "ì´ ê³µìœ ëŠ” 암호로 보호ë˜ì–´ 있습니다"
@@ -36,6 +60,14 @@ msgstr "암호가 잘못ë˜ì—ˆìŠµë‹ˆë‹¤. 다시 ìž…ë ¥í•´ 주ì‹ì‹œì˜¤."
msgid "Password"
msgstr "암호"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "죄송합니다. ì´ ë§í¬ëŠ” ë” ì´ìƒ ìž‘ë™í•˜ì§€ 않습니다."
@@ -64,11 +96,11 @@ msgstr "ìžì„¸í•œ ì •ë³´ëŠ” ë§í¬ë¥¼ 보낸 사람ì—게 문ì˜í•˜ì‹ì‹œì˜¤."
msgid "Download"
msgstr "다운로드"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "ì§ì ‘ ë§í¬"
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index dfa513dead115200b5240b57462db8f1a59b39e3..00c602a5f0a35a3329eda86942e8d5a4ef6f20ea 100644
--- a/l10n/ko/files_trashbin.po
+++ b/l10n/ko/files_trashbin.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -30,38 +30,34 @@ msgstr "%sì„(를_ ì˜êµ¬ì 으로 ì‚ì œí• ìˆ˜ 없습니다"
msgid "Couldn't restore %s"
msgstr "%sì„(를) ë³µì›í• 수 없습니다"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "ì‚ì œëœ íŒŒì¼"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "ë³µì›"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "오류"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "ì‚ì œëœ íŒŒì¼"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "ë³µì›ë¨"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "íœ´ì§€í†µì´ ë¹„ì–´ 있습니다!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "ì´ë¦„"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "ë³µì›"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "ì‚ì œë¨"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "ì‚ì œ"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index ab3674ddd18e2d4a468514871c8462bc89cfc9b6..d527ae640b62099d65c5790b85e75b22a2165007 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
-"PO-Revision-Date: 2014-05-05 05:43+0000\n"
-"Last-Translator: ì±…ì½ëŠ”달팽 <bjh13579@gmail.com>\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -22,11 +22,11 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -81,23 +81,23 @@ msgstr "ìž˜ëª»ëœ ê·¸ë¦¼"
msgid "web services under your control"
msgstr "내가 관리하는 웹 서비스"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP 다운로드가 비활성화 ë˜ì—ˆìŠµë‹ˆë‹¤."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "파ì¼ì„ 개별ì 으로 다운로드해야 합니다."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "파ì¼ë¡œ ëŒì•„가기"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "ì„ íƒí•œ 파ì¼ë“¤ì€ ZIP 파ì¼ì„ ìƒì„±í•˜ê¸°ì— 너무 í½ë‹ˆë‹¤."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -294,116 +294,127 @@ msgstr "WebDAV ì¸í„°íŽ˜ì´ìŠ¤ê°€ ì œëŒ€ë¡œ ìž‘ë™í•˜ì§€ 않습니다. 웹 ì„œ
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "<a href='%s'>설치 ê°€ì´ë“œ</a>를 다시 í•œ 번 확ì¸í•˜ì‹ì‹œì˜¤."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s ë‹˜ì´ %sì„(를) ê³µìœ í•˜ì˜€ìŠµë‹ˆë‹¤"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "분류 \"%s\"ì„(를) ì°¾ì„ ìˆ˜ 없습니다."
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 49f19b68df35a9ced2248f91fd7cf56dcbb3b6ac..2ac108429311a97b4350141f615793f457b23333 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
#: admin/controller.php:73
msgid "Saved"
-msgstr ""
+msgstr "ì €ìž¥ë¨"
#: admin/controller.php:90
msgid "test email settings"
@@ -52,15 +52,15 @@ msgstr "ì´ë©”ì¼ ë°œì†¡ë¨"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "암호화"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -103,6 +103,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "ì´ë©”ì¼ ì €ìž¥ë¨"
@@ -119,6 +129,16 @@ msgstr "ê·¸ë£¹ì„ ì‚ì œí• ìˆ˜ ì—†ìŒ"
msgid "Unable to delete user"
msgstr "사용ìžë¥¼ ì‚ì œí• ìˆ˜ ì—†ìŒ."
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "언어가 변경ë¨"
@@ -174,7 +194,7 @@ msgstr "백엔드ì—ì„œ 암호 ë³€ê²½ì„ ì§€ì›í•˜ì§€ 않지만, 사용ìžì˜
msgid "Unable to change password"
msgstr "암호를 ë³€ê²½í• ìˆ˜ ì—†ìŒ"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "보내는 중..."
@@ -230,34 +250,42 @@ msgstr "ì—…ë°ì´íŠ¸"
msgid "Updated"
msgstr "ì—…ë°ì´íŠ¸ë¨"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "프로필 사진 ì„ íƒ"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "매우 약한 암호"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "약한 암호"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "ê·¸ì € 그런 암호"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "ì¢‹ì€ ì•”í˜¸"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "ê°•ë ¥í•œ 암호"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "íŒŒì¼ ë³µí˜¸í™” 중... ì‹œê°„ì´ ê±¸ë¦´ ìˆ˜ë„ ìžˆìœ¼ë‹ˆ ê¸°ë‹¤ë ¤ 주ì‹ì‹œì˜¤."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "ì‚ì œë¨"
@@ -270,8 +298,8 @@ msgstr "실행 취소"
msgid "Unable to remove user"
msgstr "사용ìžë¥¼ ì‚ì œí• ìˆ˜ ì—†ìŒ"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "그룹"
@@ -303,7 +331,7 @@ msgstr "올바른 암호를 ìž…ë ¥í•´ì•¼ 함"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "ê²½ê³ : ì‚¬ìš©ìž \"{user}\"ì˜ í™ˆ ë””ë ‰í„°ë¦¬ê°€ ì´ë¯¸ 존재합니다"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "í•œêµì–´"
@@ -371,7 +399,7 @@ msgid ""
"root."
msgstr "ë°ì´í„° ë””ë ‰í„°ë¦¬ì™€ 파ì¼ì„ ì¸í„°ë„·ì—ì„œ ì ‘ê·¼í• ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. .htaccess 파ì¼ì´ ìž‘ë™í•˜ì§€ 않습니다. 웹 서버 ì„¤ì •ì„ ë³€ê²½í•˜ì—¬ ë°ì´í„° ë””ë ‰í„°ë¦¬ì— ì ‘ê·¼í• ìˆ˜ ì—†ë„ë¡ í•˜ê±°ë‚˜, 웹 서버 문서 경로 외부로 ë°ì´í„° ë””ë ‰í„°ë¦¬ë¥¼ 옮기ì‹ì‹œì˜¤."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "ì„¤ì • ê²½ê³ "
@@ -386,53 +414,65 @@ msgstr "WebDAV ì¸í„°íŽ˜ì´ìŠ¤ê°€ ì œëŒ€ë¡œ ìž‘ë™í•˜ì§€ 않습니다. 웹 ì„œ
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "<a href=\"%s\">설치 ê°€ì´ë“œ</a>를 다시 í•œ 번 확ì¸í•˜ì‹ì‹œì˜¤."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "모듈 'fileinfo'ê°€ ì—†ìŒ"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "PHP 모듈 'fileinfo'ê°€ 존재하지 않습니다. MIME í˜•ì‹ ê°ì§€ 결과를 í–¥ìƒì‹œí‚¤ê¸° 위하여 ì´ ëª¨ë“ˆì„ í™œì„±í™”í•˜ëŠ” ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "PHP ë²„ì „ì´ ì˜¤ëž˜ë¨"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "PHP ë²„ì „ì´ ì˜¤ëž˜ë˜ì—ˆìŠµë‹ˆë‹¤. ì˜¤ëž˜ëœ ë²„ì „ì€ ìž‘ë™í•˜ì§€ ì•Šì„ ìˆ˜ë„ ìžˆê¸° ë•Œë¬¸ì— PHP 5.3.8 ì´ìƒì„ 사용하는 ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "ë¡œìº˜ì´ ìž‘ë™í•˜ì§€ ì•ŠìŒ"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "UTF-8ì„ ì§€ì›í•˜ëŠ” 시스템 ë¡œìº˜ì„ ì‚¬ìš©í• ìˆ˜ 없습니다."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "íŒŒì¼ ì´ë¦„ì˜ ì¼ë¶€ 문ìžì— ë¬¸ì œê°€ ìƒê¸¸ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "ë‹¤ìŒ ë¡œìº˜ì„ ì§€ì›í•˜ë„ë¡ ì‹œìŠ¤í…œ ì„¤ì •ì„ ë³€ê²½í•˜ëŠ” ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤: %s"
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "ì¸í„°ë„·ì— ì—°ê²°í• ìˆ˜ ì—†ìŒ"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -441,198 +481,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "서버ì—ì„œ ì¸í„°ë„·ì— ì—°ê²°í• ìˆ˜ 없습니다. 외부 ì €ìž¥ì†Œ 마운트, ì—…ë°ì´íŠ¸ 알림, ì œ 3ìž ì•± 설치 등 ì¼ë¶€ ê¸°ëŠ¥ì„ ì‚¬ìš©í• ìˆ˜ 없습니다. 외부ì—ì„œ 파ì¼ì— ì ‘ê·¼í•˜ê±°ë‚˜ 알림 ì´ë©”ì¼ì„ 보내지 ëª»í• ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. ëª¨ë“ ê¸°ëŠ¥ì„ ì‚¬ìš©í•˜ë ¤ë©´ ì¸í„°ë„·ì— 연결하는 ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "í¬ë¡ "
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "개별 페ì´ì§€ë¥¼ 불러올 때마다 실행"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php는 webcron ì„œë¹„ìŠ¤ì— ë“±ë¡ë˜ì–´ HTTPë¡œ 15분마다 cron.phpì— ì ‘ê·¼í•©ë‹ˆë‹¤."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "ì‹œìŠ¤í…œì˜ cron 서비스를 통하여 15분마다 cron.php 파ì¼ì— ì ‘ê·¼í•©ë‹ˆë‹¤."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "ê³µìœ "
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "ê³µìœ API 사용하기"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "앱ì—ì„œ ê³µìœ API를 ì‚¬ìš©í• ìˆ˜ 있ë„ë¡ í—ˆìš©"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "ë§í¬ 허용"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "사용ìžê°€ 개별 í•ëª©ì˜ ë§í¬ë¥¼ ê³µìœ í• ìˆ˜ 있ë„ë¡ í—ˆìš©"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "공개 업로드 허용"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "다른 사용ìžë“¤ì´ ê³µê°œëœ ê³µìœ í´ë”ì— íŒŒì¼ ì—…ë¡œë“œ 허용"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "사용ìžê°€ 개별 í•ëª©ì˜ ë§í¬ë¥¼ ê³µìœ í• ìˆ˜ 있ë„ë¡ í—ˆìš©"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "ìž¬ê³µìœ í—ˆìš©"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "사용ìžì—게 ê³µìœ ëœ í•ëª©ì„ 다시 ê³µìœ í• ìˆ˜ 있ë„ë¡ í—ˆìš©"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "누구나와 ê³µìœ í• ìˆ˜ 있ë„ë¡ í—ˆìš©"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "사용ìžê°€ ì†í•´ 있는 ê·¸ë£¹ì˜ ì‚¬ìš©ìžì—게만 ê³µìœ í• ìˆ˜ 있ë„ë¡ í—ˆìš©"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "ë©”ì¼ ì•Œë¦¼ 허용"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "보안"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "HTTPS ê°•ì œ 사용"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "í´ë¼ì´ì–¸íŠ¸ê°€ %sì— ì—°ê²°í• ë•Œ 암호화 ì—°ê²°ì„ ê°•ì œë¡œ 사용합니다."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "SSL ê°•ì œ ì„¤ì •ì„ ë³€ê²½í•˜ë ¤ë©´ %sì— HTTPSë¡œ 연결해야 합니다."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "ì „ìžìš°íŽ¸ 서버"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "보낸 ì´ ì£¼ì†Œ"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "ì¸ì¦ 필요함"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "서버 주소"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "í¬íŠ¸"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "ìžê²© ì •ë³´"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "SMTP 사용ìžëª…"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "SMTP 암호"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "시험용 ì „ìžìš°íŽ¸ ì„¤ì •"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "ì „ìžìš°íŽ¸ 보내기"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "로그"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "로그 단계"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "ë” ì¤‘ìš”í•¨"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "ëœ ì¤‘ìš”í•¨"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "ë²„ì „"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -785,29 +833,33 @@ msgstr "언어"
msgid "Help translate"
msgstr "ë²ˆì— ë•ê¸°"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "WebDAVë¡œ 파ì¼ì— ì ‘ê·¼í•˜ë ¤ë©´ <a href=\"%s\" target=\"_blank\">ì´ ì£¼ì†Œë¥¼ 사용하ì‹ì‹œì˜¤</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "암호화 ì•±ì´ ë¹„í™œì„±í™”ë˜ì—ˆìŠµë‹ˆë‹¤. ëª¨ë“ íŒŒì¼ì„ 복호화해야 합니다."
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "ë¡œê·¸ì¸ ì•”í˜¸"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "ëª¨ë“ íŒŒì¼ ë³µí˜¸í™”"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "ë¡œê·¸ì¸ ì´ë¦„"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index 25bb9527c8c463fcb626ffb45b3b5be6d1324e24..8cf1c5b11b25046750ac6d860f370b1c37534b94 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -73,6 +73,10 @@ msgstr "최근 서버 ì„¤ì •ì„ ë‹¤ì‹œ ë¶ˆëŸ¬ì˜¤ì‹œê² ìŠµë‹ˆê¹Œ?"
msgid "Keep settings?"
msgstr "ì„¤ì •ì„ ìœ ì§€í•˜ê² ìŠµë‹ˆê¹Œ?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "서버 ì„¤ì •ì„ ì¶”ê°€í• ìˆ˜ ì—†ìŒ"
@@ -89,6 +93,18 @@ msgstr "성공"
msgid "Error"
msgstr "오류"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "ì„¤ì • 올바름"
@@ -129,26 +145,42 @@ msgstr "현재 서버 ì„¤ì •ì„ ì§€ìš°ì‹œê² ìŠµë‹ˆê¹Œ?"
msgid "Confirm Deletion"
msgstr "ì‚ì œ 확ì¸"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "그룹 %sê°œ ì°¾ìŒ"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "ì‚¬ìš©ìž %s명 ì°¾ìŒ"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "ìž˜ëª»ëœ í˜¸ìŠ¤íŠ¸"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "필요한 ê¸°ëŠ¥ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ"
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "그룹 필터"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "ì €ìž¥"
@@ -221,10 +253,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "로그ì¸ì„ ì‹œë„í• ë•Œ ì ìš©í• í•„í„°ë¥¼ ìž…ë ¥í•˜ì‹ì‹œì˜¤. %%uid는 ë¡œê·¸ì¸ ë™ìž‘ì˜ ì‚¬ìš©ìž ì´ë¦„으로 대체ë©ë‹ˆë‹¤. 예: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "서버 ì„¤ì • 추가"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "호스트"
@@ -288,6 +333,14 @@ msgstr "뒤로"
msgid "Continue"
msgstr "계ì†"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "ê³ ê¸‰"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 4c2e3e5d925fb6da7252824ad6569fe10fa5050f..fff87fc1a76639e08d6bb1e58d4e03badbee0565 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "ده‌ستكاری"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "پاشکه‌وتده‌کات..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "بەڵێ"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "نەخێر"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "لابردن"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr "هاوبەشی کردن"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "هه‌ڵه"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "وشەی تێپەربو"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "ئاگاداری"
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "وشەی تێپەربو"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index 59d0ed005e803e08e7c258a3c782c618b81bd644..aedcd80bf269bbf8986e9ac1a53898a52bed4d94 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "په‌ڕگەکان"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "هاوبەشی کردن"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "هه‌ڵه"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "ناو"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr "پاشکه‌وتکردن"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "بوخچه"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "داگرتن"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/ku_IQ/files_encryption.po b/l10n/ku_IQ/files_encryption.po
index 71292777a08419eec84ece1061c12fcfbd36d2aa..98cff5b3e6177ff57797c5882e886dcc8e52c153 100644
--- a/l10n/ku_IQ/files_encryption.po
+++ b/l10n/ku_IQ/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "نهێنیکردن"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ku_IQ/files_external.po b/l10n/ku_IQ/files_external.po
index 7baea72403e8c741b856bf52293e9151684816a2..100e50d0e068f31ba5ff18a83c6ab4acee52d917 100644
--- a/l10n/ku_IQ/files_external.po
+++ b/l10n/ku_IQ/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "ناونیشانی به‌سته‌ر"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "ناونیشانی به‌سته‌ر"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index 1c8582199505a77d13b3055224a67ccc0e7a5de7..1790de49ca749914cd1b647d165e715436f03982 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "وشەی تێپەربو"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "داگرتن"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index 951ebab0b455b932c797e5fbadfd5f10aabd1acc..43ba98914db1cf1f49b5d74410d9f4741b876254 100644
--- a/l10n/ku_IQ/files_trashbin.po
+++ b/l10n/ku_IQ/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "هه‌ڵه"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "ناو"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index d976334f5401559e4efde5f54e12c6319f83e722..b87c6d113c337ae0c0c412a5a8d8992965801d1f 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index aed4989ac6e4e827cebb2bf11e22261ffa319a3a..59f5da0dd6608a0b4bb0c02969f2743fdfb823da 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "نهێنیکردن"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr "نوێکردنه‌وه"
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "ناونیشانی ڕاژه"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index fe975ee667d0ede09be568f5b0c26c7995b754ff..4f0f68f37c1bc5e7bda90074d6f1db194a9121b4 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr "سه‌رکه‌وتن"
msgid "Error"
msgstr "هه‌ڵه"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "پاشکه‌وتکردن"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "هه‌ڵبژاردنی پیشكه‌وتوو"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 72fd09a4f2c1f9d0d60abd53effa2518d7d3b395..20be90dc1d62d3ba6c640cf9605e98eac1e02279 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -40,6 +40,11 @@ msgstr "Maintenance Modus ass aus"
msgid "Updated database"
msgstr "Datebank ass geupdate ginn"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Kee Bild oder Fichier uginn"
@@ -60,207 +65,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sonndeg"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Méindeg"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Dënschdeg"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Mëttwoch"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Donneschdeg"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Freideg"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Samschdeg"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mäerz"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Abrëll"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mee"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Dezember"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Astellungen"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Speicheren..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "Sekonnen hir"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n Minutt hir"
msgstr[1] "%n Minutten hir"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "haut"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "gëschter"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "leschte Mount"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "Lescht Joer"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "Joren hir"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Auswielen"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Jo"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nee"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Auswielen"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Weieng Fichieren wëlls de gär behalen?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Ofbriechen"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Weider"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(all ausgewielt)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} ausgewielt)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -292,140 +297,149 @@ msgstr "Gedeelt"
msgid "Share"
msgstr "Deelen"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Feeler"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Feeler beim Deelen"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Feeler beim Annuléiere vum Deelen"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Feeler beim Ännere vun de Rechter"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Gedeelt mat dir an der Grupp {group} vum {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Gedeelt mat dir vum {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Link deelen"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Passwuertgeschützt"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passwuert"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Ëffentlechen Upload erlaaben"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Link enger Persoun mailen"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Schécken"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Verfallsdatum setzen"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Verfallsdatum"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Via E-Mail deelen:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Keng Persoune fonnt"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "Grupp"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Weiderdeelen ass net erlaabt"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Gedeelt an {item} mat {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Net méi deelen"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "via e-mail Bescheed ginn"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "kann änneren"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "Zougrëffskontroll"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "erstellen"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "aktualiséieren"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "läschen"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "deelen"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Passwuertgeschützt"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Feeler beim Läsche vum Verfallsdatum"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Feeler beim Setze vum Verfallsdatum"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Gëtt geschéckt..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Email geschéckt"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Warnung"
@@ -457,18 +471,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "Den Update war net erfollegräich. Mell dëse Problem w.e.gl der<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-Community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Den Update war erfollegräich. Du gëss elo bei d'ownCloud ëmgeleet."
@@ -669,6 +684,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "En <strong>Admin-Account</strong> uleeën"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passwuert"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -794,8 +813,27 @@ msgstr "Merci fir deng Gedold."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud gëtt op d'Versioun %s aktualiséiert, dat kéint e Moment daueren."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 276a983493b46dcf24baed8d647a7c55ce31e1b9..e19c52d78634747d0048011071c7215071fe44eb 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr "Et feelt en temporären Dossier"
msgid "Failed to write to disk"
msgstr "Konnt net op den Disk schreiwen"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Dateien"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Upload ofgebrach."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofg
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Deelen"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Ëm-benennen"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Fehler"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Numm"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Gréisst"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Geännert"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr "Maximal Gréisst fir ZIP Fichieren"
msgid "Save"
msgstr "Späicheren"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "Nei"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Text Fichier"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Dossier"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Upload ofbriechen"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Hei ass näischt. Lued eppes rop!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Download"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Läschen"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Upload ze grouss"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Fichieren gi gescannt, war weg."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Momentane Scan"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
index e812e1d71d521349751556dd7f3b80614e5b9666..d4271fc15385a5f99e4c54bd99924d80c3fc0d3d 100644
--- a/l10n/lb/files_encryption.po
+++ b/l10n/lb/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index 99992791ce59fa6bd0cefa73cfc9afb17f92e19e..bae4eea31be83dd8063c10e886595662b9a4d451 100644
--- a/l10n/lb/files_external.po
+++ b/l10n/lb/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:10+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index b721953d2f1d71f7d18b7cf1d9689f89439bfe2f..a817ba4726ffca52f2f0425dc101b4e95712ef38 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -34,6 +58,14 @@ msgstr "Den Passwuert ass incorrect. Probeier ed nach eng keier."
msgid "Password"
msgstr "Passwuert"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -62,11 +94,11 @@ msgstr ""
msgid "Download"
msgstr "Download"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index 2987c2e4d67d7295352b8f9e1d085a715261e7f5..8907d5aed48f5bc801a23d9b79523e533c5fe4d3 100644
--- a/l10n/lb/files_trashbin.po
+++ b/l10n/lb/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Fehler"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Numm"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Läschen"
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index 3feef4b744f7d9f104419212471bd47e91004b6d..f25430dfd582e3c428018f74b42c208c5470081e 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -77,23 +77,23 @@ msgstr "Ongülteg d'Bild"
msgid "web services under your control"
msgstr "Web-Servicer ënnert denger Kontroll"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -279,127 +279,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "Den/D' %s huet »%s« mat dir gedeelt"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 69abfb6e00ef11b3d0ff357d83dcd2f9fb6e8d99..20d4cd260a221cf0377a9306a69338cde98922ba 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "Email geschéckt"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -99,6 +99,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "E-mail gespäichert"
@@ -115,6 +125,16 @@ msgstr "Onmeiglech d'Grup ze läschen."
msgid "Unable to delete user"
msgstr "Onmeiglech User zu läschen."
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Sprooch huet geännert"
@@ -170,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -226,34 +246,42 @@ msgstr "Update"
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "geläscht"
@@ -266,8 +294,8 @@ msgstr "réckgängeg man"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Gruppen"
@@ -299,7 +327,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__language_name__"
@@ -367,7 +395,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -382,53 +410,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -437,198 +477,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Share API aschalten"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Erlab Apps d'Share API ze benotzen"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Links erlaben"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Resharing erlaben"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Useren erlaben mat egal wiem ze sharen"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Server Adress"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Log"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Méi"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Manner"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,27 +829,31 @@ msgstr "Sprooch"
msgid "Help translate"
msgstr "Hëllef iwwersetzen"
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index 387f494f464d719920fc45edda33b1cb8609612c..0c1453f0fa51afd2fc9aa14933eb0bc0680033ae 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "Fehler"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Späicheren"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Host"
@@ -287,6 +332,14 @@ msgstr "Zeréck"
msgid "Continue"
msgstr "Weider"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avancéiert"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 952a242a031f6733ae13137f04bd416f94455730..5d3b9abd4f78bfa89878104500d1355aa7758281 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -22,11 +22,11 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Nepavyko nusiųsti el. pašto šiems naudotojams: %s "
@@ -43,6 +43,11 @@ msgstr "Išjungta priežiūros veiksena"
msgid "Updated database"
msgstr "Atnaujinta duomenų bazė"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Nenurodytas paveikslÄ—lis ar failas"
@@ -63,212 +68,212 @@ msgstr "NÄ—ra laikino profilio paveikslÄ—lio, bandykite dar kartÄ…"
msgid "No crop data provided"
msgstr "Nenurodyti apkirpimo duomenys"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Sekmadienis"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Pirmadienis"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Antradienis"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "TreÄiadienis"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Ketvirtadienis"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Penktadienis"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Šeštadienis"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Sausis"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Vasaris"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Kovas"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Balandis"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Gegužė"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Birželis"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Liepa"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Rugpjūtis"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "RugsÄ—jis"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Spalis"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Lapkritis"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Gruodis"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Nustatymai"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Saugoma..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "prieš sekundę"
-#: js/js.js:1241
+#: js/js.js:1212
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:1242
+#: js/js.js:1213
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:1243
+#: js/js.js:1214
msgid "today"
msgstr "Å¡iandien"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "vakar"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "prieš %n dieną"
msgstr[1] "prieš %n dienas"
msgstr[2] "prieš %n dienų"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "praeitą mėnesį"
-#: js/js.js:1247
+#: js/js.js:1218
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:1248
+#: js/js.js:1219
msgid "last year"
msgstr "praeitais metais"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "prieš metus"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Pasirinkite"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Klaida įkeliant failo parinkimo ruošinį: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Taip"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Pasirinkite"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Klaida įkeliant failo parinkimo ruošinį: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Gerai"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Klaida įkeliant žinutės ruošinį: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
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:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Vienas failo konfliktas"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Kuriuos failus norite laikyti?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
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:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Atšaukti"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Tęsti"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(visi pažymėti)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} pažymėtų)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Klaida įkeliant esanÄių failų ruoÅ¡inį"
@@ -300,140 +305,149 @@ msgstr "Dalinamasi"
msgid "Share"
msgstr "Dalintis"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Klaida"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Klaida, dalijimosi metu"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Klaida, kai atšaukiamas dalijimasis"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Klaida, keiÄiant privilegijas"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Pasidalino su Jumis ir {group} grupe {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Pasidalino su Jumis {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "Dalintis su vartotoju arba grupe..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Dalintis nuoroda"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Apsaugotas slaptažodžiu"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Slaptažodis"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Leisti viešą įkėlimą"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Nusiųsti nuorodą paštu"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Siųsti"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Nustatykite galiojimo laikÄ…"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Galiojimo laikas"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Dalintis per el. paštą:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Žmonių nerasta"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "grupÄ—"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Dalijinasis išnaujo negalimas"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Pasidalino {item} su {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Nebesidalinti"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "pranešti el. paštu"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "gali redaguoti"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "priÄ—jimo kontrolÄ—"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "sukurti"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "atnaujinti"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "ištrinti"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "dalintis"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Apsaugota slaptažodžiu"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Klaida nuimant galiojimo laikÄ…"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Klaida nustatant galiojimo laikÄ…"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "SiunÄiama..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Laiškas išsiųstas"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Įspėjimas"
@@ -465,18 +479,19 @@ msgstr "Klaida įkeliant dialogo ruošinį: {error}"
msgid "No tags selected for deletion."
msgstr "Trynimui nepasirinkta jokia žymė."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Prašome perkrauti puslapį."
-#: 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 "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud bendruomenei</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud."
@@ -677,6 +692,10 @@ msgstr "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serve
msgid "Create an <strong>admin account</strong>"
msgstr "Sukurti <strong>administratoriaus paskyrÄ…</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Slaptažodis"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -802,8 +821,27 @@ msgstr "Dėkojame už jūsų kantrumą."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Atnaujinama ownCloud į %s versiją. tai gali šiek tiek užtrukti."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 24c24167cdfa4c9d1487aa02ad6f4446a7fe1a4e..06f0514da49fa0795d46e4fe89024a106890d90c 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgstr "Nepavyko perkelti %s - failas su tokiu pavadinimu jau egzistuoja"
msgid "Could not move %s"
msgstr "Nepavyko perkelti %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Failo pavadinimas negali bÅ«ti tuÅ¡Äias."
@@ -39,18 +39,18 @@ msgstr "Failo pavadinimas negali bÅ«ti tuÅ¡Äias."
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -126,44 +126,48 @@ msgstr "NÄ—ra laikinojo katalogo"
msgid "Failed to write to disk"
msgstr "Nepavyko įrašyti į diską"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Nepakanka vietos serveryje"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Įkėlimas nepavyko. Nepavyko rasti įkelto failo"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Įkėlimas nepavyko. Nepavyko gauti failo informacijos."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Neteisingas aplankas"
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Failai"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
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:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Įkėlimas atšauktas."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Nepavyko gauti rezultato iš serverio."
@@ -176,123 +180,123 @@ msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutr
msgid "URL cannot be empty"
msgstr "URL negali bÅ«ti tuÅ¡Äias."
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} jau egzistuoja"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Neįmanoma sukurti failo"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Neįmanoma sukurti aplanko"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Klauda gaunant URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Dalintis"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Ištrinti negrįžtamai"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Pervadinti"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Laukiantis"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Klaida perkeliant failÄ…"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Klaida"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Neįmanoma pervadinti failo"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Klaida trinant failÄ…."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Pavadinimas"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Dydis"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Pakeista"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n aplankas"
msgstr[1] "%n aplankai"
msgstr[2] "%n aplankų"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n failas"
msgstr[1] "%n failai"
msgstr[2] "%n failų"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Įkeliamas %n failas"
msgstr[1] "Įkeliami %n failai"
msgstr[2] "Įkeliama %n failų"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Jūsų visa vieta serveryje užimta"
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Netinkamas privatus raktas Šifravimo programai. Prašome atnaujinti savo privataus rakto slaptažodį asmeniniuose nustatymuose, kad atkurti prieigą prie šifruotų failų."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -302,12 +306,12 @@ msgstr "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Pra
msgid "{dirs} and {files}"
msgstr "{dirs} ir {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s negali būti pervadintas"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -344,68 +348,75 @@ msgstr "Maksimalus ZIP archyvo failo dydis"
msgid "Save"
msgstr "IÅ¡saugoti"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Naudokite šį adresą, kad <a href=\"%s\" target=\"_blank\">pasiektumėte savo failus per WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Naujas"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Naujas tekstinis failas"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Teksto failas"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Naujas aplankas"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Katalogas"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "IÅ¡ nuorodos"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "IÅ¡trinti failai"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Atšaukti siuntimą"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "JÅ«s neturite leidimo Äia įkelti arba kurti failus"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "ÄŒia tuÅ¡Äia. Ä®kelkite kÄ… nors!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Atsisiųsti"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "IÅ¡trinti"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Įkėlimui failas per didelis"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Skenuojami failai, prašome palaukti."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Å iuo metu skenuojama"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index 9dfe56a42a198fb005a28a87fdbf96a5a76d33b5..e9df56d3333caec7b3e199ef95ca6ce609efef8a 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -79,9 +79,9 @@ msgstr "Failo iššifruoti nepavyko, gali būti jog jis yra pasidalintas su jumi
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Neatpažinta klaida, patikrinkite sistemos nustatymus arba kreipkitės į savo sistemos aministratorių"
+msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
" the encryption app has been disabled."
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:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Sekantys naudotojai nenustatyti Å¡ifravimui:"
@@ -114,91 +114,91 @@ msgstr "Eiti tiesiai į Jūsų"
msgid "personal settings"
msgstr "asmeniniai nustatymai"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Å ifravimas"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Atkūrimo rakto slaptažodis"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Pakartokite atkūrimo rakto slaptažodį"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Įjungta"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "IÅ¡jungta"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Pakeisti atkūrimo rakto slaptažodį:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Senas atkūrimo rakto slaptažodis"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Naujas atkūrimo rakto slaptažodis"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Pakartokite naują atkūrimo rakto slaptažodį"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Pakeisti slaptažodį"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Privatus rakto slaptažodis daugiau neatitinka Jūsų prisijungimo slaptažodžio:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Nustatyti Jūsų privataus rakto slaptažodį į Jūsų dabartinį prisijungimo."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Senas prisijungimo slaptažodis"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Dabartinis prisijungimo slaptažodis"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Atnaujinti privataus rakto slaptažodį"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Įjungti slaptažodžio atkūrimą:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį."
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Failų atkūrimo nustatymai pakeisti"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Neišėjo atnaujinti failų atkūrimo"
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index d37d063a0fb87aefdf588dfc04bf11c3cc1d2757..a3b5520690a6467a3764ed06aa5e0d051d108a0c 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Mazgas"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,6 +166,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -198,29 +202,29 @@ msgstr "Klaida nustatinÄ—jant Google Drive talpyklÄ…"
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index aff746d830e5b950a4915e03ec6f69790d1d9ca8..6ad1317323799a87efa91ab6385fc8200dd41fc8 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,34 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Bendrina {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Turinys apsaugotas slaptažodžiu"
@@ -36,6 +60,14 @@ msgstr "Netinka slaptažodis: Bandykite dar kartą."
msgid "Password"
msgstr "Slaptažodis"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Atleiskite, panašu, kad nuoroda yra neveiksni."
@@ -64,11 +96,11 @@ msgstr "DÄ—l tikslesnÄ—s informacijos susisiekite su asmeniu atsiuntusiu nuorod
msgid "Download"
msgstr "Atsisiųsti"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "TiesioginÄ— nuoroda"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index f8985e010ce5b5e156e18a73580cbdb9d461c195..a5b14de50438ff5093ae589e84a7acf3fd865a63 100644
--- a/l10n/lt_LT/files_trashbin.po
+++ b/l10n/lt_LT/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -29,38 +29,34 @@ msgstr "Nepavyko negrįžtamai ištrinti %s"
msgid "Couldn't restore %s"
msgstr "Nepavyko atkurti %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "IÅ¡trinti failai"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Atstatyti"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Klaida"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "IÅ¡trinti failai"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "atstatyta"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Nieko nÄ—ra. JÅ«sų Å¡iukÅ¡liadėžė tuÅ¡Äia!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Pavadinimas"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Atstatyti"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "IÅ¡trinti"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "IÅ¡trinti"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 84af5f81d5bf1580c300234bb209c757fd2e57d1..1d15ca1da69907b0022366357220d33589b48c50 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -80,23 +80,23 @@ msgstr "Netinkamas paveikslÄ—lis"
msgid "web services under your control"
msgstr "jūsų valdomos web paslaugos"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP atsisiuntimo galimybė yra išjungta."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Failai turi bÅ«ti parsiunÄiami vienas po kito."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Atgal į Failus"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Pasirinkti failai per dideli archyvavimui į ZIP."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -282,127 +282,138 @@ msgstr "Nustatyti administratoriaus naudotojo vardÄ…."
msgid "Set an admin password."
msgstr "Nustatyti administratoriaus slaptažodį."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Prašome pažiūrėkite dar kartą <a href='%s'>diegimo instrukcijas</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s pasidalino »%s« su tavimi"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Nepavyko rasti kategorijos „%s“"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index b5a31cb84ba7c6a02d8e2f286fd858f15bd179b1..85b9717381d3913a06816c5526558e455554ec9c 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -52,15 +52,15 @@ msgstr "Laiškas išsiųstas"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Å ifravimas"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -103,6 +103,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "El. paštas išsaugotas"
@@ -119,6 +129,16 @@ msgstr "Nepavyko ištrinti grupės"
msgid "Unable to delete user"
msgstr "Nepavyko ištrinti vartotojo"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Kalba pakeista"
@@ -174,7 +194,7 @@ msgstr "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo rakta
msgid "Unable to change password"
msgstr "Nepavyksta pakeisti slaptažodžio"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -230,34 +250,42 @@ msgstr "Atnaujinti"
msgid "Updated"
msgstr "Atnaujinta"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Pažymėkite profilio paveikslėlį"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Iššifruojami failai... Prašome palaukti, tai gali užtrukti."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "ištrinta"
@@ -270,8 +298,8 @@ msgstr "anuliuoti"
msgid "Unable to remove user"
msgstr "Nepavyko ištrinti vartotojo"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "GrupÄ—s"
@@ -303,7 +331,7 @@ msgstr "Slaptažodis turi būti tinkamas"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Įspėjimas: Vartotojo \"{user}\" namų aplankas jau egzistuoja"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Kalba"
@@ -371,7 +399,7 @@ msgid ""
"root."
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:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Nustatyti perspÄ—jimÄ…"
@@ -386,53 +414,65 @@ msgstr "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizacij
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "Prašome pažiūrėkite dar kartą <a href=\"%s\">diegimo instrukcijas</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Trūksta 'fileinfo' modulio"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "LokalÄ— neveikia"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Nėra interneto ryšio"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -441,198 +481,206 @@ msgid ""
"internet connection for this server if you want to have all features."
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:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Įvykdyti vieną užduotį su kiekvieno puslapio įkėlimu"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php yra registruotas tinklapio suplanuotų užduoÄių paslaugose, kad iÅ¡kviesti cron.php kas 15 minuÄių per http."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Naudoti sistemos planuotų užduoÄių paslaugÄ…, kad iÅ¡kvieti cron.php kas 15 minuÄių."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Dalijimasis"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Įjungti Share API"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Leidžia programoms naudoti Share API"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Lesti nuorodas"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Leisti naudotojams viešai dalintis elementais su nuorodomis"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Leisti viešus įkėlimus"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Leisti naudotojams įgalinti kitus įkelti į savo viešai dalinamus aplankus"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Leisti naudotojams viešai dalintis elementais su nuorodomis"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Leisti dalintis"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Leisti naudotojams toliau dalintis elementais pasidalintais su jais"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Leisti naudotojams dalintis su bet kuo"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Leisti naudotojams dalintis tik su naudotojais savo grupÄ—je"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Leisti el. pašto perspėjimą"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Saugumas"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Reikalauti HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "VerÄia klientus jungtis prie %s per Å¡ifruotÄ… ryšį."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Serverio adresas"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Prievadas"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Žurnalas"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Žurnalo išsamumas"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Daugiau"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Mažiau"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versija"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -785,29 +833,33 @@ msgstr "Kalba"
msgid "Help translate"
msgstr "Padėkite išversti"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Naudokite šį adresą, kad <a href=\"%s\" target=\"_blank\">pasiektumėte savo failus per WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Prisijungimo slaptažodis"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "IÅ¡Å¡ifruoti visus failus"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Vartotojo vardas"
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 52c6a7418ad04ebf25d3e94700565b8007f424b4..93f370f807b93b846b2d0d97b66bd690b5075af8 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -72,6 +72,10 @@ msgstr ""
msgid "Keep settings?"
msgstr "IÅ¡laikyti nustatymus?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Negalima pridėti serverio konfigūracijos"
@@ -88,6 +92,18 @@ msgstr "SÄ—kmingai"
msgid "Error"
msgstr "Klaida"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -128,7 +144,7 @@ msgstr "Ar tikrai norite ištrinti dabartinę serverio konfigūraciją?"
msgid "Confirm Deletion"
msgstr "Patvirtinkite trynimÄ…"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -136,7 +152,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -144,14 +160,30 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "GrupÄ—s filtras"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "IÅ¡saugoti"
@@ -224,10 +256,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Pridėti serverio konfigūraciją"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Mazgas"
@@ -291,6 +336,14 @@ msgstr "Atgal"
msgid "Continue"
msgstr "Tęsti"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "IÅ¡plÄ—stiniai"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index dca8b09ceca08ed6551ebe4a400e19702f5be6bf..5a438e437cfd9c4043e6444b4dc2f711c7e69b57 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -59,212 +64,212 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Svētdiena"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Pirmdiena"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Otrdiena"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Trešdiena"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Ceturtdiena"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Piektdiena"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sestdiena"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "JanvÄris"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "FebruÄris"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marts"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Aprīlis"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maijs"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "JÅ«nijs"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "JÅ«lijs"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Augusts"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Septembris"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktobris"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Novembris"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Decembris"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Iestatījumi"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "SaglabÄ..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "sekundes atpakaļ"
-#: js/js.js:1241
+#: js/js.js:1212
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:1242
+#: js/js.js:1213
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:1243
+#: js/js.js:1214
msgid "today"
msgstr "Å¡odien"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "vakar"
-#: js/js.js:1245
+#: js/js.js:1216
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:1246
+#: js/js.js:1217
msgid "last month"
msgstr "pagÄjuÅ¡ajÄ mÄ“nesÄ«"
-#: js/js.js:1247
+#: js/js.js:1218
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:1248
+#: js/js.js:1219
msgid "last year"
msgstr "gÄjuÅ¡ajÄ gadÄ"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "gadus atpakaļ"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Izvēlieties"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "JÄ"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "NÄ“"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Izvēlieties"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Labi"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "JaunÄs datnes"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Atcelt"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -296,140 +301,149 @@ msgstr "Kopīgs"
msgid "Share"
msgstr "Dalīties"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Kļūda"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Kļūda, daloties"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Kļūda, beidzot dalīties"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Kļūda, mainot atļaujas"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} dalÄ«jÄs ar jums un grupu {group}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "{owner} dalÄ«jÄs ar jums"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "AizsargÄt ar paroli"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Parole"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Ä»aut publisko augÅ¡upielÄdi."
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Sūtīt saiti personai pa e-pastu"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Sūtīt"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Iestaties termiņa datumu"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Termiņa datums"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Dalīties, izmantojot e-pastu:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Nav atrastu cilvēku"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "grupa"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "AtkÄrtota dalÄ«Å¡anÄs nav atļauta"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "DalÄ«jÄs ar {item} ar {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "PÄrtraukt dalÄ«Å¡anos"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "var rediģēt"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "piekļuves vadība"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "izveidot"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "atjauninÄt"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "dzēst"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "dalīties"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "AizsargÄts ar paroli"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Kļūda, noņemot termiņa datumu"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Kļūda, iestatot termiņa datumu"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "SÅ«ta..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Vēstule nosūtīta"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "BrÄ«dinÄjums"
@@ -461,18 +475,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "AtjauninÄÅ¡ana beidzÄs nesekmÄ«gi. LÅ«dzu, ziņojiet par Å¡o problÄ“mu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kopienai</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
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."
@@ -673,6 +688,10 @@ msgstr "VairÄk informÄcijai kÄ konfigurÄ“t serveri, lÅ«dzu skatiet <a href=\"
msgid "Create an <strong>admin account</strong>"
msgstr "Izveidot <strong>administratora kontu</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Parole"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -798,8 +817,27 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Atjaunina ownCloud uz versiju %s. Tas var aizņemt kÄdu laiciņu."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index afbe3fca37dd0ccf238baba16040a436b0ccfce6..a2881037a70b7e662d2023900133836766be319d 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr "NevarÄ“ja pÄrvietot %s — jau eksistÄ“ datne ar tÄdu nosaukumu"
msgid "Could not move %s"
msgstr "NevarÄ“ja pÄrvietot %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Datnes nosaukums nevar būt tukšs."
@@ -37,18 +37,18 @@ msgstr "Datnes nosaukums nevar būt tukšs."
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -124,44 +124,48 @@ msgstr "Trūkst pagaidu mapes"
msgid "Failed to write to disk"
msgstr "NeizdevÄs saglabÄt diskÄ"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Nav pietiekami daudz vietas"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Nederīga direktorija."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Datnes"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "AugÅ¡upielÄde ir atcelta."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -174,123 +178,123 @@ msgstr "Notiek augÅ¡upielÄde. Pametot lapu tagad, tiks atcelta augÅ¡upielÄde."
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} jau eksistē"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Dalīties"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Dzēst pavisam"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "PÄrsaukt"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Gaida savu kÄrtu"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Kļūda"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Nosaukums"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Izmērs"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Mainīts"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n mapes"
msgstr[1] "%n mape"
msgstr[2] "%n mapes"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n faili"
msgstr[1] "%n fails"
msgstr[2] "%n faili"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
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/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "JÅ«su krÄtuve ir gandrÄ«z pilna ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -300,12 +304,12 @@ msgstr "Å ifrÄ“Å¡ana tika atslÄ“gta, tomÄ“r jÅ«su faili joprojÄm ir Å¡ifrÄ“ti.
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s nevar tikt pÄrsaukts"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -342,68 +346,75 @@ msgstr "MaksimÄlais ievades izmÄ“rs ZIP datnÄ“m"
msgid "Save"
msgstr "SaglabÄt"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "Jauna"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Teksta datne"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Jauna mape"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Mape"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "No saites"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "DzÄ“stÄs datnes"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Atcelt augÅ¡upielÄdi"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
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/list.php:68
msgid "Download"
msgstr "LejupielÄdÄ“t"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Dzēst"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Datne ir par lielu, lai to augÅ¡upielÄdÄ“tu"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Šobrīd tiek caurskatīts"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
index bff5224e340cb3626246f616ffefe5a46b22e128..85eb5e2aa75e2c73a7cef595854e4ae66067a5f7 100644
--- a/l10n/lv/files_encryption.po
+++ b/l10n/lv/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Šifrēšana"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index 47d9f19c6fd184c08e2aba9cb94344b7e041b7e5..bfa5af02d746471746db93f25f642f275b424bdd 100644
--- a/l10n/lv/files_external.po
+++ b/l10n/lv/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Resursdators"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,6 +166,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -198,29 +202,29 @@ msgstr "Kļūda, konfigurÄ“jot Google Drive krÄtuvi"
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index f8368d733c1e8b91e8a0998d2969ec697461fa05..b412dd26c2b61796161921f2aa5f70513ed475de 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "DalÄ«jÄs {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "Parole"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "LejupielÄdÄ“t"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index 42da8f58584d274903b65db96d4139f1f8366c6f..ab45a367bdab6c48ccc57dc3a23b5dc580ef604b 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "NevarÄ“ja pilnÄ«bÄ izdzÄ“st %s"
msgid "Couldn't restore %s"
msgstr "Nevarēja atjaunot %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "DzÄ“stÄs datnes"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Atjaunot"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Kļūda"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "DzÄ“stÄs datnes"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "atjaunots"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Å eit nekÄ nav. JÅ«su miskaste ir tukÅ¡a!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nosaukums"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Atjaunot"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Dzēsts"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Dzēst"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index c45e0ef27a8b782db90de9e470b73bf4a5c2b6af..fce92e65b5fc11ea691d0e9bdf32d7a1cef048b5 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -77,23 +77,23 @@ msgstr ""
msgid "web services under your control"
msgstr "tÄ«mekļa servisi tavÄ varÄ"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP lejupielÄdÄ“Å¡ana ir izslÄ“gta."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Datnes var lejupielÄdÄ“t tikai katru atseviÅ¡Ä·i."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Atpakaļ pie datnēm"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "IzvÄ“lÄ“tÄs datnes ir pÄrÄk lielas, lai izveidotu zip datni."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -279,127 +279,138 @@ msgstr "Iestatiet administratora lietotÄjvÄrdu."
msgid "Set an admin password."
msgstr "Iestatiet administratora paroli."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "JÅ«su serveris vÄ“l nav pareizi iestatÄ«ts, lai ļautu sinhronizÄ“t datnes, jo izskatÄs, ka WebDAV saskarne ir salauzta."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
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>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s kopīgots »%s« ar jums"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "NevarÄ“ja atrast kategoriju “%sâ€"
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index dcbc92544ec7a14d993be9dc40ffb9669ce91c72..448b100a428ff1d52e45dda89130a00385993d3d 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "Vēstule nosūtīta"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Šifrēšana"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -99,6 +99,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "E-pasts tika saglabÄts"
@@ -115,6 +125,16 @@ msgstr "Nevar izdzēst grupu"
msgid "Unable to delete user"
msgstr "Nevar izdzÄ“st lietotÄju"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Valoda tika nomainīta"
@@ -170,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -226,34 +246,42 @@ msgstr "AtjauninÄt"
msgid "Updated"
msgstr "AtjauninÄta"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
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:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "izdzests"
@@ -266,8 +294,8 @@ msgstr "atsaukt"
msgid "Unable to remove user"
msgstr "Nevar izņemt lietotÄju"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupas"
@@ -299,7 +327,7 @@ msgstr "JÄnorÄda derÄ«ga parole"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__valodas_nosaukums__"
@@ -367,7 +395,7 @@ msgid ""
"root."
msgstr "JÅ«su datu direktorija un faili visticamÄk ir pieejami no interneta. .htaccess fails nedarbojas. Ir rekomendÄ“ts konfigurÄ“t serveri tÄ lai jÅ«su datu direktorija nav lasÄma vai pÄrvietot to Ärpus tÄ«mekļa servera dokumentu mapes."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "IestatÄ«Å¡anas brÄ«dinÄjums"
@@ -382,53 +410,65 @@ 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 kÄrtÄ«gi izlasiet <a href=\"%s\">uzstÄdÄ«Å¡anas norÄdÄ«jumus</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "TrÅ«kst modulis “fileinfoâ€"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "TrÅ«kst PHP modulis “fileinfoâ€. MÄ“s iesakÄm to aktivÄ“t, lai pÄ“c iespÄ“jas labÄk noteiktu mime tipus."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "LokÄle nestrÄdÄ"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Interneta savienojums nedarbojas"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -437,198 +477,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Å im serverim nav savienojums ar internetu. Tas nozÄ«mÄ“ ka nebÅ«s tÄdas iespÄ“jas kÄ ÄrÄ“jo datu nesÄ“ju montÄ“Å¡ana, paziņojumi par atjauninÄjumiem vai citu izstrÄdÄtÄju programmu uzstÄdÄ«Å¡ana. AttÄlinÄta failu piekļuve vai paziņojumu epastu sÅ«tÄ«Å¡ana iespÄ“jams arÄ« nedarbosies. Ir rekomendÄ“ts iespÄ“jot interneta savienojumu lai gÅ«tu iespÄ“ju izmantotu visus risinÄjumus."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "IzpildÄ«t vienu uzdevumu ar katru ielÄdÄ“to lapu"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "DalÄ«Å¡anÄs"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Aktivēt koplietošanas API"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Ļauj lietotnēm izmantot koplietošanas API"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Atļaut saites"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Ä»aut lietotÄjiem publiski dalÄ«ties ar vienumiem, izmantojot saites"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Atļaut publisko augÅ¡upielÄdi"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Ä»aut lietotÄjiem iespÄ“jot atļaut citiem augÅ¡upielÄdÄ“t failus viņu publiskajÄs mapÄ“s"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Ä»aut lietotÄjiem publiski dalÄ«ties ar vienumiem, izmantojot saites"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Atļaut atkÄrtotu koplietoÅ¡anu"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Ä»aut lietotÄjiem dalÄ«ties ar vienumiem atkÄrtoti"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Ä»aut lietotÄjiem dalÄ«ties ar visiem"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Ä»aut lietotÄjiem dalÄ«ties ar lietotÄjiem to grupÄs"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Drošība"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Uzspiest HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Uzspiest klientiem pieslēgties pie %s caur šifrētu savienojumu."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Lūdzu slēdzieties pie %s caur HTTPS lai iespējotu vai atspējotu SSL izpildīšanu"
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Servera adrese"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Ports"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "AkreditÄcijas dati"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "ŽurnÄls"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "ŽurnÄla lÄ«menis"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "VairÄk"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "MazÄk"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versija"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +829,33 @@ msgstr "Valoda"
msgid "Help translate"
msgstr "Palīdzi tulkot"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr ""
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "PieslÄ“gÅ¡anÄs parole"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Atšifrēt visus failus"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "IerakstÄ«Å¡anÄs vÄrds"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 2834b8846a204cee594905dff156c33011395523..71608d510c1b3b99f0a4ca016cf717b1c7449fa0 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr "Paņemt iestatÄ«jumus no nesenas servera konfigurÄcijas?"
msgid "Keep settings?"
msgstr "Paturēt iestatījumus?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Nevar pievienot servera konfigurÄciju"
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "Kļūda"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,7 +142,7 @@ msgstr "Vai tieÅ¡Äm vÄ“laties dzÄ“st paÅ¡reizÄ“jo servera konfigurÄciju?"
msgid "Confirm Deletion"
msgstr "ApstiprinÄt dzÄ“Å¡anu"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -134,7 +150,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -142,14 +158,30 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Grupu filtrs"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "SaglabÄt"
@@ -222,10 +254,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Pievienot servera konfigurÄciju"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Resursdators"
@@ -289,6 +334,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "PaplaÅ¡inÄti"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 1514e6d523d369172bfbf963ed24afda174ca139..14c155875602601eec634729e41c8d51090da2e9 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -39,6 +39,11 @@ msgstr "ИÑлкучен е модот за одржување"
msgid "Updated database"
msgstr "Базата е надградена"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Ðе е доÑтавена фотографија или датотека"
@@ -59,207 +64,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Ðедела"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Понеделник"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Вторник"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Среда"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Четврток"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Петок"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Сабота"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Јануари"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Февруари"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Март"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Ðприл"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Мај"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Јуни"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Јули"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "ÐвгуÑÑ‚"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Септември"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Октомври"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Ðоември"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Декември"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "ПодеÑувања"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Снимам..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "пред Ñекунди"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "денеÑка"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "минатиот меÑец"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "минатата година"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "пред години"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Избери"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ðе"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Избери"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Во ред"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Конфликт Ñо една датотека"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Откажи"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Продолжи"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(Ñите одбрани)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} одбраните)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Грешка при вчитување на датотеката, шаблонот поÑтои "
@@ -291,140 +296,149 @@ msgstr "Споделен"
msgid "Share"
msgstr "Сподели"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Грешка"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Грешка при Ñподелување"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Грешка при прекин на Ñподелување"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Грешка при промена на привилегии"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Споделено Ñо Ð’Ð°Ñ Ð¸ групата {group} од {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Споделено Ñо Ð’Ð°Ñ Ð¾Ð´ {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Сподели ја врÑката"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Заштити Ñо лозинка"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Лозинка"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Дозволи јавен аплоуд"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Прати врÑка по е-пошта на личноÑÑ‚"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Прати"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "ПоÑтави рок на траење"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Рок на траење"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Сподели по е-пошта:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Ðе Ñе најдени луѓе"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "група"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Повторно Ñподелување не е дозволено"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Споделено во {item} Ñо {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Ðе Ñподелувај"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "извеÑти преку електронÑка пошта"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "може да Ñе измени"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "контрола на приÑтап"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "креирај"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "ажурирај"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "избриши"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "Ñподели"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Заштитено Ñо лозинка"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Грешка при тргање на рокот на траење"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Грешка при поÑтавување на рок на траење"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Праќање..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Е-порака пратена"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Предупредување"
@@ -456,18 +470,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr "Ðе Ñе Ñелектирани тагови за бришење."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "Ðадградбата беше неуÑпешна. Ве молиме пријавете го овој проблем на <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Ðадградбата беше уÑпешна. Веднаш ве префрлам на вашиот ownCloud."
@@ -668,6 +683,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Ðаправете <strong>админиÑтраторÑка Ñметка</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Лозинка"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -793,8 +812,27 @@ msgstr "Благодариме на вашето трпение."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Ðадградбата на ownCloud на верзијата %s, може да потрае."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index d1a70a160376da1ed2719c20c0d597358981382e..036e2e428b6f0ff4b29ec2a871e2d32242719b92 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr "Ðе можам да го премеÑтам %s - Датотека Ñо
msgid "Could not move %s"
msgstr "Ðе можам да ги префрлам %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Името на датотеката не може да биде празно."
@@ -37,18 +37,18 @@ msgstr "Името на датотеката не може да биде пра
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ðеправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не Ñе дозволени."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -124,44 +124,48 @@ msgstr "ÐедоÑтаÑува привремена папка"
msgid "Failed to write to disk"
msgstr "ÐеуÑпеав да запишам на диÑк"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Ðема доволно Ñлободен Ñториџ"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Префрлањето е неуÑпешно. Ðе можам да го најдам префрлената датотека."
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Погрешна папка."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Датотеки"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Преземањето е прекинато."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Ðе можам да добијам резултат од Ñерверот."
@@ -174,120 +178,120 @@ msgstr "Подигање на датотека е во тек. Ðапуштењ
msgid "URL cannot be empty"
msgstr "URL-то не може да биде празно"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} веќе поÑтои"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Ðе множам да креирам датотека"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Ðе можам да креирам папка"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Сподели"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Трајно избришани"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Преименувај"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Вашето преземање Ñе подготвува. Ова може да потрае до колку датотеките Ñе големи."
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Чека"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Грешка при префрлање на датотека"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Грешка"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Ðе можам да ја преименувам датотеката"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Име"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Големина"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Променето"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Вашиот Ñториџ е полн, датотеките веќе не можат да Ñе оÑвежуваат или Ñинхронизираат!"
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Вашиот Ñториџ е Ñкоро полн ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -297,12 +301,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr "{dirs} и {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s не може да биде преименуван"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -339,68 +343,75 @@ msgstr "МакÑимална големина за Ð²Ð½ÐµÑ Ð½Ð° ZIP датот
msgid "Save"
msgstr "Сними"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "Ðово"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "ТекÑтуална датотека"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Папка"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Од врÑка"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Избришани датотеки"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Откажи прикачување"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Тука нема ништо. Снимете нешто!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Преземи"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Избриши"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Фајлот кој Ñе вчитува е преголем"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Датотеките кои Ñе обидувате да ги подигнете ја надминуваат макÑималната големина за подигнување датотеки на овој Ñервер."
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Се Ñкенираат датотеки, ве молам почекајте."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Моментално Ñкенирам"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index 30acd200ab1a040c05556ec5bc90f7b3ad455bf8..f356a80886cdd29c9661469bc53a503ae0f336b3 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -92,7 +92,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -112,91 +112,91 @@ msgstr "Одете директно на вашиот"
msgid "personal settings"
msgstr "лични подеÑувања"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Енкрипција"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Повтори ја лозинката за клучот на обновување"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Овозможен"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Оневозможен"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Старата лозинка за клучот на обновување "
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Повтори ја лозинката за клучот на обновувањето"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Смени лозинка"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Старата лозинка за најавување"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Тековната лозинка за најавување"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Овозможи го обновувањето на лозинката:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index fb8b8b320e96fc4ad9911aa2afbcf3575e6d4a5f..ccd34d9e73a76cd8f0ce92ba9a8597381a33c8c6 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "ÐдреÑа"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Домаќин"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "ÐдреÑа"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr "Грешка при конфигурација на Google Drive"
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index e2db790c6443d5ae5ae4c510f6db4d8a900de5c5..24b7eef01a4bca32023e01c5da88d62c02eefced 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Споделени од {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "Лозинка"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "Преземи"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index eceeee5f0e99d18a664c2ac8966c68d5e6958b67..1261f9fd58a5703f2ac4418c6fde6531ad786970 100644
--- a/l10n/mk/files_trashbin.po
+++ b/l10n/mk/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:55+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "Ðе можеше трајно да Ñе избрише %s"
msgid "Couldn't restore %s"
msgstr "Ðе можеше да Ñе поврати %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Избришани датотеки"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Поврати"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Грешка"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Избришани датотеки"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "повратени"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Тука нема ништо. Вашата корпа за отпадоци е празна!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Име"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Поврати"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Избришан"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Избриши"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index dc91ccc317210bdbf51c4cf4dd2890aa37f920ff..3a7f7c50beccea9f2dbcfef3f7a611e14e87f79f 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr "Ðевалидна фотографија"
msgid "web services under your control"
msgstr "веб ÑервиÑи под Ваша контрола"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Преземање во ZIP е иÑклучено"
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Датотеките треба да Ñе Ñимнат една по една."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Ðазад кон датотеки"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Избраните датотеки Ñе преголеми за да Ñе генерира zip."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Ðе можам да најдам категорија „%s“"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index d95df2458f15f017823189dd48ed963bb0f17332..95dd3cb1b20bf44da6c86a383788bf8c7c077e82 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "Е-порака пратена"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Енкрипција"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -99,6 +99,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "ЕлектронÑката пошта е Ñнимена"
@@ -115,6 +125,16 @@ msgstr "Ðеможе да избришам група"
msgid "Unable to delete user"
msgstr "Ðеможам да избришам кориÑник"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Јазикот е Ñменет"
@@ -170,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr "Вашата лозинка неможе да Ñе Ñмени"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -226,34 +246,42 @@ msgstr "Ðжурирај"
msgid "Updated"
msgstr "Ðадграден"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Одбери фотографија за профилот"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "избришан"
@@ -266,8 +294,8 @@ msgstr "врати"
msgid "Unable to remove user"
msgstr "Ðе можам да го одÑтранам кориÑникот"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Групи"
@@ -299,7 +327,7 @@ msgstr "Мора да Ñе обезбеди валидна лозинка"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__language_name__"
@@ -367,7 +395,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Предупредување при подеÑување"
@@ -382,53 +410,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Локалето не функционира"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -437,198 +477,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Споделување"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Овозможи го API-то за Ñподелување"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Дозволете апликациите да го кориÑтат API-то за Ñподелување"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Дозволи врÑки"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Дозволи јавен аплоуд"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Овозможи повторно Ñподелување"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Овозможи кориÑниците да Ñподелуваат Ñо Ñекого"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Овозможи кориÑниците да Ñподелуваат Ñо кориÑници од Ñвоите групи"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Овозможи извеÑтување по електронÑка пошта"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "БезбедноÑÑ‚"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Ðаметни HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "ÐдреÑа на Ñервер"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Порта"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "ЗапиÑник"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Ðиво на логирање"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Повеќе"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Помалку"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Верзија"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +829,33 @@ msgstr "Јазик"
msgid "Help translate"
msgstr "Помогни во преводот"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr ""
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Лозинка за најавување"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Дешифрирај ги Ñите датотеки"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Име за најава"
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 3540c3e664c189088aa5e3560f6a8a7dd5d05a66..c0da2b583d48c39e3287fb8a3f8569ef8ce44e8e 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr ""
msgid "Keep settings?"
msgstr "Да ги Ñочувам нагодувањата?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Ðе можам да ја додадам конфигурацијата на Ñерверот"
@@ -87,6 +91,18 @@ msgstr ""
msgid "Error"
msgstr "Грешка"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -127,28 +143,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr "Потврдете го бришењето"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Сними"
@@ -221,10 +253,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Домаќин"
@@ -288,6 +333,14 @@ msgstr "Ðазад"
msgid "Continue"
msgstr "Продолжи"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Ðапредно"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ml/core.po b/l10n/ml/core.po
index bc9734a075167a3a5033ce5404925e2478828a1f..8fba5490cf4b6e3838d2dd9a5e7d7d2c6eef3ca8 100644
--- a/l10n/ml/core.po
+++ b/l10n/ml/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ml\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/ml/files.po b/l10n/ml/files.po
index 9c197c2a6993bcda73180dbefae55e0e0999c341..fed39c7d450ae2cd03d3c192d8b2b12b04270f90 100644
--- a/l10n/ml/files.po
+++ b/l10n/ml/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/ml/files_encryption.po b/l10n/ml/files_encryption.po
index 798e7fb2e3ac6db8f54f0ddd2c014b9904c37dc7..97a4e829836c601cbd5972a3cc3227c834769a08 100644
--- a/l10n/ml/files_encryption.po
+++ b/l10n/ml/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ml/files_external.po b/l10n/ml/files_external.po
index 06dfc90a79419a9a0a7180246e5318cc2e5327cd..2801451ebe2e30eda7a57852269211e9dd253670 100644
--- a/l10n/ml/files_external.po
+++ b/l10n/ml/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ml/files_sharing.po b/l10n/ml/files_sharing.po
index 7a71f3189c349b573c78b88e5cefd149656ab1b8..698e2a7b32388b70d2599b03d4f95afb91903131 100644
--- a/l10n/ml/files_sharing.po
+++ b/l10n/ml/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: ml\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/ml/files_trashbin.po b/l10n/ml/files_trashbin.po
index 789bc95d804b7ea8f2ee188e8be786579851e21f..f1318135ddc4abb7173558bc6193bfaf8a108a5c 100644
--- a/l10n/ml/files_trashbin.po
+++ b/l10n/ml/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/ml/lib.po b/l10n/ml/lib.po
index a68fe40ea57819b9917924a331168cd551d48e1e..2671114a521ec17778b5320f8f06e32e15097bdb 100644
--- a/l10n/ml/lib.po
+++ b/l10n/ml/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ml\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/ml/settings.po b/l10n/ml/settings.po
index 9c4432176ca33f4fc449d3f55de87a9fe6393eaa..c0554003565c6c45fa7c4ebfb84e438424b5858c 100644
--- a/l10n/ml/settings.po
+++ b/l10n/ml/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/ml/user_ldap.po b/l10n/ml/user_ldap.po
index 51de77c3900d1df528e1d728a5c63426d6fb9d8b..15d0b842bf1ed9bc94a3d2a5b0fc2312b7c4978a 100644
--- a/l10n/ml/user_ldap.po
+++ b/l10n/ml/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index bb6ef01bf7cd50c38c50a5c6149f9931aacb1702..20187804052ceebe3dc297818df7ec24c3b33345 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ml_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/ml_IN/files.po b/l10n/ml_IN/files.po
index ec42a9a6a28f1104a5158eed32c385f86fedd8a4..59d4e8fc01c487906f071c83ea23887fd60334ad 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/ml_IN/files_encryption.po b/l10n/ml_IN/files_encryption.po
index 7d4bee7e4e030cd0db0d8cbe012c9cc5e7ad1181..b9990473a7041962b085311ce0ffe43823b3e895 100644
--- a/l10n/ml_IN/files_encryption.po
+++ b/l10n/ml_IN/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ml_IN/files_external.po b/l10n/ml_IN/files_external.po
index 6e27c658ca16d6101c31d3e0fdc1f75f213b88ff..f340ef292a778ab554d17e58c3a0f941604a7144 100644
--- a/l10n/ml_IN/files_external.po
+++ b/l10n/ml_IN/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ml_IN/files_sharing.po b/l10n/ml_IN/files_sharing.po
index 3ae42065eaf58ea26c472fde262bd47a525dd8c4..cd4d6ae314d64261b79a2bc25e1623cdf0e91bd2 100644
--- a/l10n/ml_IN/files_sharing.po
+++ b/l10n/ml_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: ml_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/ml_IN/files_trashbin.po b/l10n/ml_IN/files_trashbin.po
index 87bb8f596386e12c242be91d2fb6b416db2da91a..bd29963cdb0ab3770f2f31976a4934f655f6423e 100644
--- a/l10n/ml_IN/files_trashbin.po
+++ b/l10n/ml_IN/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/ml_IN/lib.po b/l10n/ml_IN/lib.po
index ed8460a87ab9bf918573f5db092698ec0999ca88..0815b1426ec2e6e38afebbc8126c5ec37d87a2f1 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ml_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po
index 0e584edd601cf5e40466430de40ca61ea7bec3bd..a009dafaf652b7641c618f2beb82d7bd560d4264 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/ml_IN/user_ldap.po b/l10n/ml_IN/user_ldap.po
index 90c87e5cabfa7abf0b833d2ab7d58ff352183ef0..136c9dba5244900ea7189b4c010d819f072bd44e 100644
--- a/l10n/ml_IN/user_ldap.po
+++ b/l10n/ml_IN/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/mn/core.po b/l10n/mn/core.po
index c2ebf09969616ae361fb8e3373d613e581495e52..802b48cade40ad373057e60c27e9dd76ce4018c0 100644
--- a/l10n/mn/core.po
+++ b/l10n/mn/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: mn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/mn/files.po b/l10n/mn/files.po
index 62be8ef315fb2fa7e38c098dbfd198915f0ac456..360ceb773443054c3d6ad055c582bdf2d31df7c8 100644
--- a/l10n/mn/files.po
+++ b/l10n/mn/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/mn/files_encryption.po b/l10n/mn/files_encryption.po
index d9b203ee57938825ec2b36e18fbf887064c05967..52576cbdca53c86097bb2a3cf92dd99dc6342b71 100644
--- a/l10n/mn/files_encryption.po
+++ b/l10n/mn/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/mn/files_external.po b/l10n/mn/files_external.po
index a8a479ea618c4b43a93386ce17c1b0a04fbb7c03..4642a175754b1f6cb2d63e337ed3f1cef90cd51b 100644
--- a/l10n/mn/files_external.po
+++ b/l10n/mn/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/mn/files_sharing.po b/l10n/mn/files_sharing.po
index 629410fa58538143b930c2e6adf5b93530f8a35a..e0000e0db0a9829c1bc043137e493d45be8686a1 100644
--- a/l10n/mn/files_sharing.po
+++ b/l10n/mn/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: mn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/mn/files_trashbin.po b/l10n/mn/files_trashbin.po
index 999826e02f92d535c41c42fd1f43995030a7e5c2..52bd47e6224d97fae00cdbcb3291d427b4dd5a38 100644
--- a/l10n/mn/files_trashbin.po
+++ b/l10n/mn/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/mn/lib.po b/l10n/mn/lib.po
index 79ec88835ceed0950f19dc9c661f797772595b44..2a5648645c89d9113b22862109d77e8e3e317427 100644
--- a/l10n/mn/lib.po
+++ b/l10n/mn/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: mn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/mn/settings.po b/l10n/mn/settings.po
index 5b2d9dcaf46700e6ea1af73388199011abf46665..1416d2e0b98354c8095f1d7bca504d0d86a362ec 100644
--- a/l10n/mn/settings.po
+++ b/l10n/mn/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/mn/user_ldap.po b/l10n/mn/user_ldap.po
index 57ae6aeee200808cf1bdbb3c74d20ddb518d1c7a..4a5453d89dfff439ebb0f3d70898442bc1f88dbd 100644
--- a/l10n/mn/user_ldap.po
+++ b/l10n/mn/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 26b822f38558c3acd151442b505b91fdf353199e..a0a7a76b9dc950d1d749b8249ed00bec6dbe3a3b 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,202 +63,202 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Ahad"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Isnin"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Selasa"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Rabu"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Khamis"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Jumaat"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sabtu"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januari"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februari"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mac"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mei"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Jun"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Julai"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Ogos"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Disember"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Tetapan"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Simpan..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ya"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Tidak"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Batal"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,140 +290,149 @@ msgstr ""
msgid "Share"
msgstr "Kongsi"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Ralat"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Kata laluan"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Amaran"
@@ -450,18 +464,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -662,6 +677,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "buat <strong>akaun admin</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Kata laluan"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -787,7 +806,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index afa41600bfc0e2c2f665d5ebed8248363b0422c3..d6d3d2ec8ba9f0cc1f418ee8f6dc669dbb771d95 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr "Direktori sementara hilang"
msgid "Failed to write to disk"
msgstr "Gagal untuk disimpan"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Fail-fail"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Muatnaik dibatalkan."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,117 +177,117 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Kongsi"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Namakan"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Dalam proses"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Ralat"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Nama"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Saiz"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Dimodifikasi"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -293,12 +297,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -335,68 +339,75 @@ msgstr "Saiz maksimum input untuk fail ZIP"
msgid "Save"
msgstr "Simpan"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "Baru"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Fail teks"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Folder"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Batal muat naik"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Tiada apa-apa di sini. Muat naik sesuatu!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Muat turun"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Padam"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Muatnaik terlalu besar"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Fail sedang diimbas, harap bersabar."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Imbasan semasa"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
index 9c79c66dd3759a5f38634664ba81506cf8c1afae..ee50309f9270caf2a3d45634b5beb3a42b60fec2 100644
--- a/l10n/ms_MY/files_encryption.po
+++ b/l10n/ms_MY/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index 5b27738bc9782b482e519d7c33910631b1558122..417c492c92b364d4988dd4c706060d96dffb8c71 100644
--- a/l10n/ms_MY/files_external.po
+++ b/l10n/ms_MY/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:10+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index 16aae3a399e2924a72127ce1f71d5d79875cd0b1..43c7a21b77e10d5df8d3c54cb8814168e339d23a 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "Kata laluan"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "Muat turun"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index 9c95c7b8f12325edfb717cc701b200b486d8cfac..e2c6d9ac0b967a4746177d6ab46c02d0fc377be0 100644
--- a/l10n/ms_MY/files_trashbin.po
+++ b/l10n/ms_MY/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "Tidak dapat menghapuskan %s secara kekal"
msgid "Couldn't restore %s"
msgstr "Tidak dapat memulihkan %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Pulihkan"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Ralat"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Fail Dihapus"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "dipulihkan"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Tiada apa disini. Tong sampah anda kosong!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nama"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Pulihkan"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Dihapuskan"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Padam"
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 5000b5a4ad1a60ce6b17ccc31a3b4b67628ba377..d345b06cc4b54f12a07e31d389a3ce85a5a8a8cb 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr "Perkhidmatan web di bawah kawalan anda"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 47f87095856b854ea91d14245c9a8e3e630348cc..648db5e34f355c8c53085a971e531d07cd8c706d 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Emel disimpan"
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Bahasa diubah"
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr "Kemaskini"
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "dihapus"
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Kumpulan"
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "_nama_bahasa_"
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Alamat pelayan"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Log"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Tahap Log"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Lanjutan"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr "Bahasa"
msgid "Help translate"
msgstr "Bantu terjemah"
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 56dbadc8b64314bc33de4136d00f060171314bb8..bee8b9ae2165d7c910eac91e3504b77b3268549e 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "Ralat"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,26 +142,42 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Simpan"
@@ -218,10 +250,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -285,6 +330,14 @@ msgstr "Kembali"
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Maju"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 57da0a700ef200beeecde8c8883ee53f6d1e58de..1c0f026c201281801328e674bf6c813bb9902f01 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: my_MM\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,202 +63,202 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "ဇန်နá€á€«á€›á€®"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "ဖေဖော်á€á€«á€›á€®"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "မá€á€º"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "ဧပြီ"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "မေ"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "ဇွန်"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "ဇူလá€á€¯á€„်"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "ဩဂုá€á€º"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "စက်á€á€„်ဘာ"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "အောက်á€á€á€¯á€˜á€¬"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "နá€á€¯á€á€„်ဘာ"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "ဒီဇင်ဘာ"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "စက္ကန့်အနည်းငယ်က"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "ယနေ့"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "မနေ့က"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "ပြီးá€á€²á€·á€žá€±á€¬á€œ"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "မနှစ်က"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "နှစ် အရင်က"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "ရွေးá€á€»á€šá€º"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "ဟုá€á€º"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "မဟုá€á€ºá€˜á€°á€¸"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "ရွေးá€á€»á€šá€º"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "အá€á€¯á€€á€±"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "ပယ်ဖျက်မည်"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,140 +290,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "စကားá€á€¾á€€á€º"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "သက်á€á€™á€ºá€¸á€€á€¯á€”်ဆုံးမည့်ရက်သá€á€ºá€™á€¾á€á€ºá€™á€Šá€º"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "သက်á€á€™á€ºá€¸á€€á€¯á€”်ဆုံးမည့်ရက်"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "အီးမေးလ်ဖြင့်á€á€±á€™á€»á€¾á€™á€Šá€º -"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "ပြန်လည်á€á€±á€™á€»á€¾á€á€¼á€„်းá€á€½á€„့်မပြုပါ"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "ပြင်ဆင်နá€á€¯á€„်"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "ဖန်á€á€®á€¸á€™á€Šá€º"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "ဖျက်မည်"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "á€á€±á€™á€»á€¾á€™á€Šá€º"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "စကားá€á€¾á€€á€ºá€–ြင့်ကာကွယ်ထားသည်"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -450,18 +464,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -662,6 +677,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>အက်ဒမင်အကောင့်</strong>á€á€…်á€á€¯á€–န်á€á€®á€¸á€™á€Šá€º"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "စကားá€á€¾á€€á€º"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -787,7 +806,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index d82c17507d59eaac742911a9a11c14f3ed0a38e1..e4da7bfc15e5b4e5b47f08a9e2bc0d923047cded 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "ဖá€á€¯á€„်များ"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,117 +177,117 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -293,12 +297,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -335,68 +339,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "ဒေါင်းလုá€á€º"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po
index ee2aba0405a8296e882ed525e8f4a945b804152e..cec974e15855dbd86ff53abf6c2e57138542a28e 100644
--- a/l10n/my_MM/files_encryption.po
+++ b/l10n/my_MM/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/my_MM/files_external.po b/l10n/my_MM/files_external.po
index 1a4e8bcfac24fb84d8e72a509bd772c49bf016b7..26f3f635b7dcd50dd3f5972a9a8457708d0a962d 100644
--- a/l10n/my_MM/files_external.po
+++ b/l10n/my_MM/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index 8664c543ee4354755c0e4cb68f0b9f10e5fdabc5..254276402ec0bb64d3a553c32d1555bb79172a5b 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: my_MM\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "စကားá€á€¾á€€á€º"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "ဒေါင်းလုá€á€º"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/my_MM/files_trashbin.po b/l10n/my_MM/files_trashbin.po
index db27619e260e07dc9323d96a781744f2f5fdb75a..3e84868cbd8430daf2a9265462772def0b2c45d2 100644
--- a/l10n/my_MM/files_trashbin.po
+++ b/l10n/my_MM/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index a7058f2d242df0f3bdbdb3f622e2dc980e02096d..1a80e27e80ab24958580a1e6715ab912c64f4feb 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: my_MM\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr "သင်áထá€á€”်းá€á€»á€¯á€•á€ºá€™á€¾á€¯á€·á€¡á€±á€¬á€€á€ºá€á€½á€„်ရှá€á€žá€±á€¬ Web services"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP ဒေါင်းလုá€á€ºá€€á€á€¯á€•á€á€á€ºá€‘ားသည်"
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "ဖá€á€¯á€„်များသည် á€á€…်á€á€¯á€•á€¼á€®á€¸ á€á€…်á€á€¯á€’ေါင်းလုá€á€ºá€á€»á€›á€”်လá€á€¯á€¡á€•á€ºá€žá€Šá€º"
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "ဖá€á€¯á€„်သá€á€¯á€·á€•á€¼á€”်သွားမည်"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "zip ဖá€á€¯á€„်အဖြစ်ပြုလုပ်ရန် ရွေးá€á€»á€šá€ºá€‘ားသောဖá€á€¯á€„်များသည် အရမ်းကြီးလွန်းသည်"
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "\"%s\"á€á€±á€«á€„်းစဉ်ကá€á€¯ ရှာမá€á€½á€±á€·á€•á€«"
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index fdc7a2cb400563c4950ab08f89c22b431cd18cf7..8fc57dc9b9494e00010d55fb6854797ec59cdf50 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index a720ea8b9cd16a375f0ac323e1a343cdf3b56dd4..f3b20110b7e22110fe25ffaebe08ce7d739ff1a4 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr ""
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,26 +142,42 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -218,10 +250,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -285,6 +330,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "အဆင့်မြင့်"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 84e452107ff8eaa73e5bb3d9a1f86c3d58b91f38..330e40b893412f4db0eb4f6467136b722a02ada1 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 18:31+0000\n"
+"Last-Translator: vidaren <news@vidartysse.net>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,11 +21,11 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
-msgstr ""
+msgstr "Utløpsdato er tilbake i tid."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Klarte ikke å sende mail til følgende brukere: %s"
@@ -42,6 +42,11 @@ msgstr "Slo av vedlikeholdsmodus"
msgid "Updated database"
msgstr "Oppdaterte databasen"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr "Deaktiverte ukompatible apper: %s"
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Bilde eller fil ikke angitt"
@@ -62,207 +67,207 @@ msgstr "Foreløpig profilbilde ikke tilgjengelig. Prøv igjen"
msgid "No crop data provided"
msgstr "Ingen beskjæringsinformasjon angitt"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Søndag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Mandag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Tirsdag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Onsdag"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Torsdag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Fredag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Lørdag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mars"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Desember"
-#: js/js.js:483
+#: js/js.js:496
msgid "Settings"
msgstr "Innstillinger"
-#: js/js.js:583
+#: js/js.js:596
msgid "Saving..."
msgstr "Lagrer..."
-#: js/js.js:1240
+#: js/js.js:1220
msgid "seconds ago"
msgstr "sekunder siden"
-#: js/js.js:1241
+#: js/js.js:1221
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minutt siden"
msgstr[1] "%n minutter siden"
-#: js/js.js:1242
+#: js/js.js:1222
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n time siden"
msgstr[1] "%n timer siden"
-#: js/js.js:1243
+#: js/js.js:1223
msgid "today"
msgstr "i dag"
-#: js/js.js:1244
+#: js/js.js:1224
msgid "yesterday"
msgstr "i går"
-#: js/js.js:1245
+#: js/js.js:1225
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dag siden"
msgstr[1] "%n dager siden"
-#: js/js.js:1246
+#: js/js.js:1226
msgid "last month"
msgstr "forrige måned"
-#: js/js.js:1247
+#: js/js.js:1227
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n dag siden"
msgstr[1] "%n dager siden"
-#: js/js.js:1248
+#: js/js.js:1228
msgid "last year"
msgstr "i fjor"
-#: js/js.js:1249
+#: js/js.js:1229
msgid "years ago"
msgstr "Ã¥r siden"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Velg"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Feil ved lasting av filvelger-mal: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Velg"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Feil ved lasting av filvelger-mal: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Feil ved lasting av meldingsmal: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} filkonflikt"
msgstr[1] "{count} filkonflikter"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "En filkonflikt"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
-msgstr ""
+msgstr "Nye filer"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
-msgstr ""
+msgstr "Allerede eksisterende filer"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Hvilke filer vil du beholde?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Hvis du velger begge versjonene vil den kopierte filen få et nummer lagt til i navnet."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Fortsett"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(alle valgt)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} valgt)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Feil ved lasting av \"filen eksisterer\"-mal"
@@ -276,7 +281,7 @@ msgstr "Svakt passord"
#: js/setup.js:86
msgid "So-so password"
-msgstr ""
+msgstr "So-so-passord"
#: js/setup.js:87
msgid "Good password"
@@ -286,148 +291,157 @@ msgstr "Bra passord"
msgid "Strong password"
msgstr "Sterkt passord"
-#: js/share.js:51 js/share.js:66 js/share.js:106
+#: js/share.js:69 js/share.js:84 js/share.js:127
msgid "Shared"
msgstr "Delt"
-#: js/share.js:109
+#: js/share.js:130
msgid "Share"
msgstr "Del"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:195 js/share.js:208 js/share.js:215 js/share.js:822
#: templates/installation.php:10
msgid "Error"
msgstr "Feil"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:197 js/share.js:885
msgid "Error while sharing"
msgstr "Feil under deling"
-#: js/share.js:171
+#: js/share.js:208
msgid "Error while unsharing"
msgstr "Feil ved oppheving av deling"
-#: js/share.js:178
+#: js/share.js:215
msgid "Error while changing permissions"
msgstr "Feil ved endring av tillatelser"
-#: js/share.js:188
+#: js/share.js:225
msgid "Shared with you and the group {group} by {owner}"
msgstr "Delt med deg og gruppen {group} av {owner}"
-#: js/share.js:190
+#: js/share.js:227
msgid "Shared with you by {owner}"
msgstr "Delt med deg av {owner}"
-#: js/share.js:214
+#: js/share.js:251
msgid "Share with user or group …"
msgstr "Del med bruker eller gruppe …"
-#: js/share.js:220
+#: js/share.js:257
msgid "Share link"
msgstr "Del lenke"
-#: js/share.js:223
+#: js/share.js:263
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Den offentlige lenken vil utløpe senest {days} dager etter at den lages"
+
+#: js/share.js:265
+msgid "By default the public link will expire after {days} days"
+msgstr "Som standard vil den offentlige lenken utløpe etter {days} dager"
+
+#: js/share.js:270
msgid "Password protect"
msgstr "Passordbeskyttet"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passord"
+#: js/share.js:272
+msgid "Choose a password for the public link"
+msgstr "Velg et passord for den offentlige lenken"
-#: js/share.js:230
+#: js/share.js:278
msgid "Allow Public Upload"
msgstr "Tillat Offentlig Opplasting"
-#: js/share.js:234
+#: js/share.js:282
msgid "Email link to person"
msgstr "Email lenke til person"
-#: js/share.js:235
+#: js/share.js:283
msgid "Send"
msgstr "Send"
-#: js/share.js:240
+#: js/share.js:288
msgid "Set expiration date"
msgstr "Set utløpsdato"
-#: js/share.js:241
+#: js/share.js:289
msgid "Expiration date"
msgstr "Utløpsdato"
-#: js/share.js:277
+#: js/share.js:326
msgid "Share via email:"
msgstr "Del på epost"
-#: js/share.js:280
+#: js/share.js:329
msgid "No people found"
msgstr "Ingen personer funnet"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:377 js/share.js:438
msgid "group"
msgstr "gruppe"
-#: js/share.js:357
+#: js/share.js:410
msgid "Resharing is not allowed"
msgstr "Videredeling er ikke tillatt"
-#: js/share.js:401
+#: js/share.js:454
msgid "Shared in {item} with {user}"
msgstr "Delt i {item} med {user}"
-#: js/share.js:423
+#: js/share.js:476
msgid "Unshare"
msgstr "Avslutt deling"
-#: js/share.js:431
+#: js/share.js:484
msgid "notify by email"
msgstr "Varsle på email"
-#: js/share.js:434
+#: js/share.js:487
msgid "can edit"
msgstr "kan endre"
-#: js/share.js:436
+#: js/share.js:489
msgid "access control"
msgstr "tilgangskontroll"
-#: js/share.js:439
+#: js/share.js:492
msgid "create"
msgstr "opprett"
-#: js/share.js:442
+#: js/share.js:495
msgid "update"
msgstr "oppdater"
-#: js/share.js:445
+#: js/share.js:498
msgid "delete"
msgstr "slett"
-#: js/share.js:448
+#: js/share.js:501
msgid "share"
msgstr "del"
-#: js/share.js:721
+#: js/share.js:803
msgid "Password protected"
msgstr "Passordbeskyttet"
-#: js/share.js:734
+#: js/share.js:822
msgid "Error unsetting expiration date"
msgstr "Feil ved nullstilling av utløpsdato"
-#: js/share.js:752
+#: js/share.js:843
msgid "Error setting expiration date"
msgstr "Kan ikke sette utløpsdato"
-#: js/share.js:777
+#: js/share.js:872
msgid "Sending ..."
msgstr "Sender..."
-#: js/share.js:788
+#: js/share.js:883
msgid "Email sent"
msgstr "E-post sendt"
-#: js/share.js:812
+#: js/share.js:907
msgid "Warning"
msgstr "Advarsel"
@@ -459,18 +473,19 @@ msgstr "Feil ved lasting av dialogmal: {error}"
msgid "No tags selected for deletion."
msgstr "Ingen merkelapper valgt for sletting."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid."
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Vennligst last siden på nytt."
-#: 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 "Oppdateringen mislyktes. Vennligst rapporter dette problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr "Oppdateringen var vellykket."
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud."
@@ -483,7 +498,7 @@ msgstr "%s nullstilling av passord"
msgid ""
"A problem has occurred whilst sending the email, please contact your "
"administrator."
-msgstr ""
+msgstr "Et problem oppstod ved sending av mailen. Kontakt administratoren."
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -546,12 +561,12 @@ msgstr "Tilbakestill passord"
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
-msgstr ""
+msgstr "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!"
#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
-msgstr ""
+msgstr "For beste resultat, vurder å bruke en GNU/Linux-server i stedet."
#: strings.php:5
msgid "Personal"
@@ -671,6 +686,10 @@ msgstr "For informasjon om hvordan du setter opp serveren din riktig, se <a href
msgid "Create an <strong>admin account</strong>"
msgstr "opprett en <strong>administrator-konto</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passord"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Lagring og database"
@@ -774,7 +793,7 @@ msgstr "Alternative innlogginger"
msgid ""
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
"with you.<br><a href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Hei der,<br><br>bare informerer om at %s delte <strong>%s</strong> med deg.<br><a href=\"%s\">Vis!</a><br><br>"
#: templates/singleuser.user.php:3
msgid "This ownCloud instance is currently in single user mode."
@@ -796,8 +815,27 @@ msgstr "Takk for din tålmodighet."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Oppdaterer ownCloud til versjon %s, dette kan ta en stund."
+msgid "%s will be updated to version %s."
+msgstr "%s vil bli oppdatert til versjon %s."
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr "Følgende apps vil bli deaktivert:"
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr "Temaet %s har blitt deaktivert."
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr "Forsikre deg om at databasen, config-mappen og datamappen er blitt sikkerhetskopiert før du fortsetter."
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr "Start oppdatering"
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 27d7b60b712b8dd90226605e645c238b4eba4db8..bc99d4012fde45966c5335097abf01ae9132bb47 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 19:21+0000\n"
+"Last-Translator: vidaren <news@vidartysse.net>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -31,27 +31,27 @@ msgstr "Kan ikke flytte %s - En fil med samme navn finnes allerede"
msgid "Could not move %s"
msgstr "Kunne ikke flytte %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Filnavn kan ikke være tomt."
#: ajax/newfile.php:63
#, php-format
msgid "\"%s\" is an invalid file name."
-msgstr ""
+msgstr "\"%s\" er et ugyldig filnavn."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "MÃ¥lmappen er blitt flyttet eller slettet."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -127,44 +127,48 @@ msgstr "Mangler midlertidig mappe"
msgid "Failed to write to disk"
msgstr "Klarte ikke å skrive til disk"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Ikke nok lagringsplass"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Opplasting feilet. Fant ikke opplastet fil."
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Opplasting feilet. Klarte ikke å finne informasjon om fil."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Ugyldig katalog."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Filer"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Alle filer"
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "Kan ikke laste opp {filename} fordi det er en mappe eller har 0 bytes"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "Total filstørrelse {size1} overstiger grense for opplasting {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "Ikke nok ledig plass. Du laster opp size1} men bare {size2} er ledig"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Opplasting avbrutt."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Fikk ikke resultat fra serveren."
@@ -177,120 +181,124 @@ msgstr "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen."
msgid "URL cannot be empty"
msgstr "URL kan ikke være tom"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1188
msgid "{new_name} already exists"
msgstr "{new_name} finnes allerede"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Klarte ikke å opprette fil"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Klarte ikke å opprette mappe"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Feil ved henting av URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:211
msgid "Share"
msgstr "Del"
-#: js/fileactions.js:173
+#: js/fileactions.js:224
msgid "Delete permanently"
msgstr "Slett permanent"
-#: js/fileactions.js:234
+#: js/fileactions.js:226 templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr "Slett"
+
+#: js/fileactions.js:262
msgid "Rename"
msgstr "Gi nytt navn"
-#: js/filelist.js:221
+#: js/filelist.js:314
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:619 js/filelist.js:1691
msgid "Pending"
msgstr "Ventende"
-#: js/filelist.js:916
+#: js/filelist.js:1139
msgid "Error moving file."
-msgstr ""
+msgstr "Feil ved flytting av fil."
-#: js/filelist.js:924
+#: js/filelist.js:1147
msgid "Error moving file"
msgstr "Feil ved flytting av fil"
-#: js/filelist.js:924
+#: js/filelist.js:1147
msgid "Error"
msgstr "Feil"
-#: js/filelist.js:988
+#: js/filelist.js:1225
msgid "Could not rename file"
msgstr "Klarte ikke å gi nytt navn til fil"
-#: js/filelist.js:1122
+#: js/filelist.js:1346
msgid "Error deleting file."
msgstr "Feil ved sletting av fil."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1449 templates/list.php:62
msgid "Name"
msgstr "Navn"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1450 templates/list.php:75
msgid "Size"
msgstr "Størrelse"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1451 templates/list.php:78
msgid "Modified"
msgstr "Endret"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n mappe"
msgstr[1] "%n mapper"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fil"
msgstr[1] "%n filer"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1599 js/filelist.js:1638
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Laster opp %n fil"
msgstr[1] "Laster opp %n filer"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
-msgstr ""
+msgstr "\"{name}\" er et uglydig filnavn."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen."
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -300,15 +308,15 @@ msgstr "Kryptering ble slått av men filene dine er fremdeles kryptert. Gå til
msgid "{dirs} and {files}"
msgstr "{dirs} og {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "Kunne ikke gi nytt navn til %s"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
-msgstr ""
+msgstr "Opplasting (maks. %s)"
#: templates/admin.php:4
msgid "File handling"
@@ -342,68 +350,71 @@ msgstr "Maksimal størrelse på ZIP-filer"
msgid "Save"
msgstr "Lagre"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Bruk denne adressen for å <a href=\"%s\" target=\"_blank\">aksessere filene dine via WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Ny"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Ny tekstfil"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Tekstfil"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Ny mappe"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Mappe"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Fra link"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Slettede filer"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Avbryt opplasting"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Du har ikke tillatelse til å laste opp eller opprette filer her"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Ingenting her. Last opp noe!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Last ned"
-#: templates/index.php:84 templates/index.php:85
-msgid "Delete"
-msgstr "Slett"
-
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Filen er for stor"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Skanner filer, vennligst vent."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Pågående skanning"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr "Skanner nå"
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
index f56d81690bfbd3f42794a081143ee351348438e1..abe60fe08d7400d5bc06636cbfef7ea748ea2a73 100644
--- a/l10n/nb_NO/files_encryption.po
+++ b/l10n/nb_NO/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 19:21+0000\n"
+"Last-Translator: vidaren <news@vidartysse.net>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -77,9 +77,9 @@ msgstr "Kan ikke dekryptere denne filen. Dette er sannsynligvis en delt fil. Sp
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Ukjent feil. Sjekk systeminnstillingene dine eller kontakt administratoren"
+msgstr "Ukjent feil. Sjekk systeminnstillingene eller kontakt administratoren."
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -92,7 +92,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "Vennligst se til at PHP 5.3.3 eller nyere er installert og at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Enn så lenge er krypterings-appen deaktivert."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Følgende brukere er ikke satt opp for kryptering:"
@@ -102,7 +102,7 @@ msgstr "Første gangs kryptering startet... Dette kan ta litt tid. Vennligst ven
#: js/detect-migration.js:25
msgid "Initial encryption running... Please try again later."
-msgstr ""
+msgstr "Førstegangs kryptering kjører... Prøv igjen senere."
#: templates/invalid_private_key.php:8
msgid "Go directly to your "
@@ -112,91 +112,91 @@ msgstr "GÃ¥ direkte til din"
msgid "personal settings"
msgstr "personlige innstillinger"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Kryptering"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Passord for gjenopprettingsnøkkel"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Gjenta passord for gjenopprettingsnøkkel"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Aktiv"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Inaktiv"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Endre passord for gjenopprettingsnøkkel:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Gammelt passord for gjenopprettingsnøkkel"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Nytt passord for gjenopprettingsnøkkel"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Gjenta nytt passord for gjenopprettingsnøkkel"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Endre passord"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Ditt passord for privat nøkkel stemmer ikke med påloggingspassordet ditt lenger:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Sett ditt gamle passord for privat nøkkel til ditt nåværende påloggingspassord."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Hvis du ikke husker det gamle passordet ditt kan du spørre administratoren om å gjenopprette filene dine."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Gammelt påloggingspassord"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Nåværende påloggingspassord"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Oppdater passord for privat nøkkel"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Aktiver gjenoppretting av passord:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Aktivering av dette valget tillater deg å gjenerobre tilgang til dine krypterte filer i tilfelle du mister passordet ditt."
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Innstillinger for gjenoppretting av filer ble oppdatert"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Klarte ikke å oppdatere gjenoppretting av filer"
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index 0a858716ef0c36184b3f85b1a021eb8667168ea9..702b20b2386bd4a5dc1a089ecc50b5c0657c8f79 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -5,13 +5,14 @@
# Translators:
# Hans Nesse <>, 2013
# dizzi90 <dizzi90@gmail.com>, 2014
+# vidaren <news@vidartysse.net>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2014-04-30 11:40+0000\n"
-"Last-Translator: dizzi90 <dizzi90@gmail.com>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 19:31+0000\n"
+"Last-Translator: vidaren <news@vidartysse.net>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,157 +24,161 @@ msgstr ""
msgid "Local"
msgstr "Lokal"
-#: appinfo/app.php:36
+#: appinfo/app.php:37
msgid "Location"
msgstr "Sted"
-#: appinfo/app.php:39
+#: appinfo/app.php:40
msgid "Amazon S3"
msgstr "Amazon S3"
-#: appinfo/app.php:41
+#: appinfo/app.php:43
msgid "Key"
-msgstr ""
+msgstr "Key"
-#: appinfo/app.php:42
+#: appinfo/app.php:44
msgid "Secret"
-msgstr ""
+msgstr "Secret"
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
msgid "Bucket"
-msgstr ""
+msgstr "Bucket"
-#: appinfo/app.php:47
+#: appinfo/app.php:49
msgid "Amazon S3 and compliant"
-msgstr ""
+msgstr "Amazon S3 og tilsvarende"
-#: appinfo/app.php:49
+#: appinfo/app.php:52
msgid "Access Key"
-msgstr ""
+msgstr "Access Key"
-#: appinfo/app.php:50
+#: appinfo/app.php:53
msgid "Secret Key"
-msgstr ""
+msgstr "Secret Key"
-#: appinfo/app.php:52
+#: appinfo/app.php:55
msgid "Hostname (optional)"
-msgstr ""
+msgstr "Servernavn (ikke påkrevd)"
-#: appinfo/app.php:53
+#: appinfo/app.php:56
msgid "Port (optional)"
-msgstr ""
+msgstr "Port (ikke påkrevd)"
-#: appinfo/app.php:54
+#: appinfo/app.php:57
msgid "Region (optional)"
-msgstr ""
+msgstr "Region (ikke påkrevd)"
-#: appinfo/app.php:55
+#: appinfo/app.php:58
msgid "Enable SSL"
-msgstr ""
+msgstr "Aktiver SSL"
-#: appinfo/app.php:56
+#: appinfo/app.php:59
msgid "Enable Path Style"
-msgstr ""
+msgstr "Aktiver Path Style"
-#: appinfo/app.php:63
+#: appinfo/app.php:67
msgid "App key"
-msgstr ""
+msgstr "App key"
-#: appinfo/app.php:64
+#: appinfo/app.php:68
msgid "App secret"
-msgstr ""
+msgstr "App secret"
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
+msgid "Host"
+msgstr "Tjener"
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
msgid "Username"
msgstr "Brukernavn"
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
msgid "Password"
msgstr "Passord"
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
msgid "Root"
-msgstr ""
+msgstr "Rot"
-#: appinfo/app.php:77
+#: appinfo/app.php:82
msgid "Secure ftps://"
-msgstr ""
+msgstr "Sikker ftps://"
-#: appinfo/app.php:84
+#: appinfo/app.php:90
msgid "Client ID"
-msgstr ""
+msgstr "Client ID"
-#: appinfo/app.php:85
+#: appinfo/app.php:91
msgid "Client secret"
-msgstr ""
+msgstr "Client secret"
-#: appinfo/app.php:92
+#: appinfo/app.php:98
msgid "OpenStack Object Storage"
-msgstr ""
+msgstr "OpenStack Object Storage"
-#: appinfo/app.php:94
+#: appinfo/app.php:101
msgid "Username (required)"
-msgstr ""
+msgstr "Brukernavn (påkrevet)"
-#: appinfo/app.php:95
+#: appinfo/app.php:102
msgid "Bucket (required)"
-msgstr ""
+msgstr "Bucket (påkrevet)"
-#: appinfo/app.php:96
+#: appinfo/app.php:103
msgid "Region (optional for OpenStack Object Storage)"
-msgstr ""
+msgstr "Region (ikke påkrevet for OpenStack Object Storage)"
-#: appinfo/app.php:97
+#: appinfo/app.php:104
msgid "API Key (required for Rackspace Cloud Files)"
-msgstr ""
+msgstr "API Key (påkrevet for Rackspace Cloud Files)"
-#: appinfo/app.php:98
+#: appinfo/app.php:105
msgid "Tenantname (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Tenantname (påkrevet for OpenStack Object Storage)"
-#: appinfo/app.php:99
+#: appinfo/app.php:106
msgid "Password (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Passord (påkrevet for OpenStack Object Storage)"
-#: appinfo/app.php:100
+#: appinfo/app.php:107
msgid "Service Name (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Tjenestenavn (påkrevet for OpenStack Object Storage)"
-#: appinfo/app.php:101
+#: appinfo/app.php:108
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "URL for identity endpoint (påkrevet for OpenStack Object Storage)"
-#: appinfo/app.php:102
+#: appinfo/app.php:109
msgid "Timeout of HTTP requests in seconds (optional)"
-msgstr ""
+msgstr "Tidsavbrudd for HTTP-spørringer i sekunder (ikke påkrevet)"
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
msgid "Share"
msgstr "Del"
-#: appinfo/app.php:119
+#: appinfo/app.php:127
msgid "SMB / CIFS using OC login"
-msgstr ""
+msgstr "SMB / CIFS med OC-pålogging"
-#: appinfo/app.php:122
+#: appinfo/app.php:131
msgid "Username as share"
-msgstr ""
+msgstr "Brukernavn som share"
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:141 appinfo/app.php:152
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:145 appinfo/app.php:156
msgid "Secure https://"
-msgstr ""
+msgstr "Sikker https://"
-#: appinfo/app.php:144
+#: appinfo/app.php:155
msgid "Remote subfolder"
-msgstr ""
+msgstr "Ekstern undermappe"
#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
msgid "Access granted"
@@ -199,34 +204,34 @@ msgstr "Feil med konfigurering av Google Drive"
msgid "Saved"
msgstr "Lagret"
-#: lib/config.php:598
+#: lib/config.php:674
msgid "<b>Note:</b> "
msgstr "<b>Notat:</b> "
-#: lib/config.php:608
+#: lib/config.php:684
msgid " and "
msgstr "og"
-#: lib/config.php:630
+#: lib/config.php:706
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Montering av %s er ikke mulig. Be systemadministratoren om å installere det."
-#: lib/config.php:632
+#: lib/config.php:708
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Merk:</b> FTP støtte i PHP er ikke slått på eller innstallert. Kan ikke montere %s. Ta kontakt med din systemadministrator for å installere det."
-#: lib/config.php:634
+#: lib/config.php:710
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
" ask your system administrator to install it."
-msgstr ""
+msgstr "<b>NB:</b> \"%s\" er ikke installert. Montering av %s er ikke mulig. Spør systemadministratoren om å installere det."
#: templates/settings.php:2
msgid "External Storage"
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index 65c7005a429ef28f6de630956980936b1d0b9013..1f322a3b743d687d1041da2baf1169567af89936 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,34 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Delt av {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Denne delingen er passordbeskyttet"
@@ -35,6 +59,14 @@ msgstr "Passordet er feil. Prøv på nytt."
msgid "Password"
msgstr "Passord"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Beklager, denne lenken ser ikke ut til å virke lenger."
@@ -63,11 +95,11 @@ msgstr "For mer informasjon, spør personen som sendte lenken."
msgid "Download"
msgstr "Last ned"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
-msgstr ""
+msgstr "Last ned %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Direkte lenke"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index 8647b1afb93fc985e33d201ac2355230aec2e632..dcb28e1ad176cd3e18ba6f9a76ae7927cad798f9 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -29,38 +29,34 @@ msgstr "Kunne ikke slette %s fullstendig"
msgid "Couldn't restore %s"
msgstr "Kunne ikke gjenopprette %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Slettede filer"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Gjenopprett"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Feil"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Slettede filer"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "gjenopprettet"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Ingenting her. Søppelkassen din er tom!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Navn"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Gjenopprett"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Slettet"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Slett"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 2eb5583b1f8d9cb5c7bec8095a463e8c8bfb3f8e..2d61a1c6f0d7096895b044b3c611de2a3eb3370d 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 20:01+0000\n"
+"Last-Translator: vidaren <news@vidartysse.net>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +19,16 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:710
msgid "You are accessing the server from an untrusted domain."
-msgstr ""
+msgstr "Du aksesserer serveren fra et ikke tiltrodd domene."
-#: base.php:724
+#: base.php:711
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
"example configuration is provided in config/config.sample.php."
-msgstr ""
+msgstr "Vennligst kontakt administratoren. Hvis du er administrator for denne instansen, konfigurer innstillingen \"trusted_domain\" i config/config.php. En eksempelkonfigurasjon er gitt i config/config.sample.php."
#: private/app.php:236
#, php-format
@@ -78,23 +78,23 @@ msgstr "Ugyldig bilde"
msgid "web services under your control"
msgstr "web tjenester du kontrollerer"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP-nedlasting av avslått"
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Filene må lastes ned en om gangen"
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Tilbake til filer"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "De valgte filene er for store til å kunne generere ZIP-fil"
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -129,29 +129,29 @@ msgstr "App-en inneholder ikke filen info.xml"
msgid "App can't be installed because of not allowed code in the App"
msgstr "App kan ikke installeres på grunn av ulovlig kode i appen."
-#: private/installer.php:141
+#: private/installer.php:138
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "App kan ikke installeres fordi den ikke er kompatibel med denne versjonen av ownCloud"
-#: private/installer.php:147
+#: private/installer.php:144
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "App kan ikke installeres fordi den inneholder tag <shipped>true</shipped> som ikke er tillatt for apper som ikke leveres med systemet"
-#: private/installer.php:160
+#: private/installer.php:157
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 kan ikke installeres fordi versjonen i info.xml/version ikke er den samme som versjonen som rapporteres fra app-butikken"
-#: private/installer.php:170
+#: private/installer.php:167
msgid "App directory already exists"
msgstr "App-mappe finnes allerede"
-#: private/installer.php:183
+#: private/installer.php:180
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Kan ikke opprette app-mappe. Vennligst ordne opp i tillatelser. %s"
@@ -170,7 +170,7 @@ msgstr "Symbol utløpt. Vennligst last inn siden på nytt."
#: private/json.php:74
msgid "Unknown user"
-msgstr ""
+msgstr "Ukjent bruker"
#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
@@ -212,7 +212,7 @@ msgstr "Du må legge inn enten en eksisterende konto eller administratoren."
#: private/setup/mysql.php:12
msgid "MySQL/MariaDB username and/or password not valid"
-msgstr ""
+msgstr "MySQL/MariaDB-brukernavn og/eller -passord ikke gyldig"
#: private/setup/mysql.php:67 private/setup/oci.php:54
#: private/setup/oci.php:121 private/setup/oci.php:144
@@ -240,20 +240,20 @@ msgstr "Kommandoen som feilet: \"%s\""
#: private/setup/mysql.php:85
#, php-format
msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL/MariaDB-bruker '%s'@'localhost' finnes allerede."
#: private/setup/mysql.php:86
msgid "Drop this user from MySQL/MariaDB"
-msgstr ""
+msgstr "Fjern denne brukeren fra MySQL/MariaDB"
#: private/setup/mysql.php:91
#, php-format
msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL/MariaDB-bruker '%s'@'%%' finnes allerede"
#: private/setup/mysql.php:92
msgid "Drop this user from MySQL/MariaDB."
-msgstr ""
+msgstr "Fjern denne brukeren fra MySQL/MariaDB."
#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
@@ -280,127 +280,138 @@ msgstr "Sett et admin-brukernavn."
msgid "Set an admin password."
msgstr "Sett et admin-passord."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s delte »%s« med deg"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
-msgstr ""
+msgstr "Deling av %s feilet, fordi filen ikke eksisterer"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Du har ikke lov til å dele %s"
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
-msgstr ""
+msgstr "Deling av %s feilet, fordi brukeren %s er eier av elementet"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
-msgstr ""
+msgstr "Deling av %s feilet, fordi brukeren %s ikke finnes"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
-msgstr ""
+msgstr "Deling av %s feilet, fordi brukeren %s ikke er medlem av noen grupper som %s er medlem av"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
-msgstr ""
+msgstr "Deling av %s feilet, fordi dette elementet allerede er delt med %s"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
-msgstr ""
+msgstr "Deling av %s feilet, fordi gruppen %s ikke finnes"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
-msgstr ""
+msgstr "Deling av %s feilet, fordi %s ikke er medlem av gruppen %s"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Du må oppgi et passord for å lage en offentlig lenke. Bare beskyttede lenker er tillatt"
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
-msgstr ""
+msgstr "Deling av %s feilet, fordi deling med lenker ikke er tillatt"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
-msgstr ""
+msgstr "Delingstype %s er ikke gyldig for %s"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
-msgstr ""
+msgstr "Setting av tillatelser for %s feilet, fordi tillatelsene gikk ut over tillatelsene som er gitt til %s"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
-msgstr ""
+msgstr "Setting av tillatelser for %s feilet, fordi elementet ikke ble funnet"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
-msgstr ""
+msgstr "Delings-server %s må implementere grensesnittet OCP\\Share_Backend"
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
-msgstr ""
+msgstr "Delings-server %s ikke funnet"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
-msgstr ""
+msgstr "Delings-server for %s ikke funnet"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
-msgstr ""
+msgstr "Deling av %s feilet, fordi brukeren %s er den opprinnelige eieren"
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
-msgstr ""
+msgstr "Deling av %s feilet, fordi tillatelsene går utover tillatelsene som er gitt til %s"
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
-msgstr ""
+msgstr "Deling av %s feilet, fordi videre-deling ikke er tillatt"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
-msgstr ""
+msgstr "Deling av %s feilet, fordi delings-serveren for %s ikke kunne finne kilden"
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
-msgstr ""
+msgstr "Deling av %s feilet, fordi filen ikke ble funnet i fil-mellomlageret"
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Kunne ikke finne kategori \"%s\""
@@ -453,20 +464,20 @@ msgstr "forrige år"
msgid "years ago"
msgstr "Ã¥r siden"
-#: private/user/manager.php:232
+#: private/user/manager.php:238
msgid ""
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
"\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "Bare disse tegnene tillates i et brukernavn: \"a-z\", \"A-Z\", \"0-9\" og \"_.@-\""
-#: private/user/manager.php:237
+#: private/user/manager.php:243
msgid "A valid username must be provided"
msgstr "Oppgi et gyldig brukernavn"
-#: private/user/manager.php:241
+#: private/user/manager.php:247
msgid "A valid password must be provided"
msgstr "Oppgi et gyldig passord"
-#: private/user/manager.php:246
+#: private/user/manager.php:252
msgid "The username is already being used"
-msgstr ""
+msgstr "Brukernavnet er allerede i bruk"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 67a8d3f2b1e622d5ce628311a52c9dc4e1976876..aa34b6289bf5bed7a0e6216784106e5c1104b5d1 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\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 @@ msgstr ""
#: admin/controller.php:66
#, php-format
msgid "Invalid value supplied for %s"
-msgstr ""
+msgstr "Ugyldig verdi angitt for %s"
#: admin/controller.php:73
msgid "Saved"
@@ -32,16 +32,16 @@ msgstr "Lagret"
#: admin/controller.php:90
msgid "test email settings"
-msgstr ""
+msgstr "test innstillinger for e-post"
#: admin/controller.php:91
msgid "If you received this email, the settings seem to be correct."
-msgstr ""
+msgstr "Hvis du mottok denne e-posten er innstillingene tydeligvis korrekte."
#: admin/controller.php:94
msgid ""
"A problem occurred while sending the e-mail. Please revisit your settings."
-msgstr ""
+msgstr "Et problem oppstod under sending av e-posten. Sjekk innstillingene."
#: admin/controller.php:99
msgid "Email sent"
@@ -49,19 +49,19 @@ msgstr "E-post sendt"
#: admin/controller.php:101
msgid "You need to set your user email before being able to send test emails."
-msgstr ""
+msgstr "Du må sette e-postadressen for brukeren din før du kan teste sending av e-post."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
-msgstr ""
+msgstr "Sendemodus"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Kryptering"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
-msgstr ""
+msgstr "Autentiseringsmetode"
#: ajax/apps/ocs.php:20
msgid "Unable to load list from App Store"
@@ -90,17 +90,27 @@ msgstr "Kan ikke legge til gruppe"
#: ajax/decryptall.php:31
msgid "Files decrypted successfully"
-msgstr ""
+msgstr "Dekryptering av filer vellykket"
#: ajax/decryptall.php:33
msgid ""
"Couldn't decrypt your files, please check your owncloud.log or ask your "
"administrator"
-msgstr ""
+msgstr "Kunne ikke dekryptere filene dine. Sjekk owncloud.log eller spør administratoren"
#: ajax/decryptall.php:36
msgid "Couldn't decrypt your files, check your password and try again"
-msgstr ""
+msgstr "Kunne ikke dekryptere filene dine. Sjekk passordet ditt og prøv igjen"
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Krypteringsnøkler permanent slettet"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Kunne ikke slette krypteringsnøklene dine permanent. Sjekk owncloud.log eller spør administratoren"
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -118,6 +128,16 @@ msgstr "Kan ikke slette gruppe"
msgid "Unable to delete user"
msgstr "Kan ikke slette bruker"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Vellykket gjenoppretting fra sikkerhetskopier"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Kunne ikke gjenopprette krypteringsnøklene dine. Sjekk owncloud.log eller spør administratoren"
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Språk endret"
@@ -173,7 +193,7 @@ msgstr "Serveren støtter ikke endring av passord, men oppdatering av brukerens
msgid "Unable to change password"
msgstr "Kunne ikke endre passord"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Sender..."
@@ -183,7 +203,7 @@ msgstr "Brukerdokumentasjon"
#: js/apps.js:50
msgid "Admin Documentation"
-msgstr ""
+msgstr "Admin-dokumentasjon"
#: js/apps.js:67
msgid "Update to {appversion}"
@@ -229,34 +249,42 @@ msgstr "Oppdater"
msgid "Updated"
msgstr "Oppdatert"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Velg et profilbilde"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Veldig svakt passord"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Svakt passord"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
-msgstr ""
+msgstr "So-so-passord"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Bra passord"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Sterkt passord"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Dekrypterer filer... Vennligst vent, dette kan ta litt tid."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Slett krypteringsnøkler permanent."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Gjenopprett krypteringsnøkler."
+
#: js/users.js:47
msgid "deleted"
msgstr "slettet"
@@ -269,8 +297,8 @@ msgstr "angre"
msgid "Unable to remove user"
msgstr "Kunne ikke slette bruker"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupper"
@@ -302,7 +330,7 @@ msgstr "Oppgi et gyldig passord"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Advarsel: Hjemmemappe for bruker \"{user}\" eksisterer allerede"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__language_name__"
@@ -336,11 +364,11 @@ msgstr "Logg inn"
#: templates/admin.php:18
msgid "Plain"
-msgstr ""
+msgstr "Enkel"
#: templates/admin.php:19
msgid "NT LAN Manager"
-msgstr ""
+msgstr "NT LAN Manager"
#: templates/admin.php:24
msgid "SSL"
@@ -370,7 +398,7 @@ msgid ""
"root."
msgstr "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer. Vi anbefaler på det sterkeste at du konfigurerer web-serveren din slik at datamappen ikke lenger er tilgjengelig eller at du flytter datamappen ut av web-serverens dokument-rotmappe."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Installasjonsadvarsel"
@@ -385,53 +413,65 @@ msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "Vennligst dobbeltsjekk <a href=\"%s\">installasjonsveilederne</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Modulen 'fileinfo' mangler"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Din PHP-versjon er udatert"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "PHP-versjonen din er utdatert. Vi anbefaler på det sterkeste at du oppdaterer til 5.3.8 eller nyere fordi eldre versjoner ikke vil virke. Det er mulig at denne installasjoner ikke fungerer korrekt."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Språk virker ikke"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Kan ikke sette systemets nasjonale innstillinger til en som støtter UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Dette betyr at det kan forekomme problemer med visse tegn i filnavn."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Vi anbefaler på det sterkeste å installere pakkene som er nødvendig for at systemet skal støtte en av følgende nasjonale innstillinger: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Ingen internettilkopling"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -440,198 +480,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Denne serveren har ikke en fungerende Internett-tilkobling. Dette betyr at noen av funksjonene, slik som montering av ekstern lagring, påminnelser om oppdatering eller installering av 3-parts apper ikke fungerer. Fjerntilgang til filer og utsending av påminnelser i e-post virker kanskje ikke heller. Vi anbefaler at Internett-forbindelsen for denne serveren aktiveres hvis du vil ha full funksjonalitet."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
-msgstr ""
+msgstr "Siste cron ble utført %s."
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
-msgstr ""
+msgstr "Siste cron ble utført %s. Dette er mer enn en time siden. Noe ser ut til å være galt."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
-msgstr ""
+msgstr "Cron er ikke utført ennå!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Utfør en oppgave med hver side som blir lastet"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Bruk systemets cron-tjeneste for å kalle cron.php hvert 15. minutt."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Deling"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Aktiver API for Deling"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Tillat apps å bruke API for Deling"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Tillat lenker"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Tillat brukere å dele filer offentlig med lenker"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr "Tving passordbeskyttelse"
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Tillat offentlig opplasting"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Tillat at brukere lar andre laste opp til deres offentlig delte mapper"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "Sett standard utløpsdato"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Utløper etter"
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "dager"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Tving utløpsdato"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Tillat brukere å dele filer offentlig med lenker"
-#: templates/admin.php:235
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "TIllat videredeling"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Tillat brukere å dele filer som allerede har blitt delt med dem"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Tillat brukere å dele med alle"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Tillat kun deling med andre brukere i samme gruppe"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Tillat påminnelser i e-post"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
+msgstr "Tlllat at brukere sender e-postvarsler for delte filer"
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr "Utelukk grupper fra deling"
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Disse gruppene vil fremdeles kunne motta delinger men ikke lage dem."
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Sikkerhet"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Tving HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Tvinger klientene til å koble til %s via en kryptert forbindelse."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Vennligst koble til din %s via HTTPS for å aktivere eller deaktivere tvungen SSL."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
-msgstr ""
+msgstr "E-postserver"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
-msgstr ""
+msgstr "Dette brukes for utsending av varsler."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Fra adresse"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr "e-post"
+
+#: templates/admin.php:396
msgid "Authentication required"
-msgstr ""
+msgstr "Autentisering kreves"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Server-adresse"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Port"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
-msgstr ""
+msgstr "PÃ¥loggingsdetaljer"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "SMTP-brukernavn"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "SMTP-passord"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
-msgstr ""
+msgstr "Test innstillinger for e-post"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Send e-post"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Logg"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Loggnivå"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Mer"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versjon"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -663,7 +711,7 @@ msgstr "Se applikasjonens side på apps.owncloud.org"
#: templates/apps.php:51
msgid "See application website"
-msgstr ""
+msgstr "Vis applikasjonens nettsted"
#: templates/apps.php:53
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
@@ -742,7 +790,7 @@ msgstr "Din e-postadresse"
msgid ""
"Fill in an email address to enable password recovery and receive "
"notifications"
-msgstr ""
+msgstr "Legg inn en e-postadresse for å aktivere passordgjenfinning og motta varsler"
#: templates/personal.php:89
msgid "Profile picture"
@@ -784,29 +832,33 @@ msgstr "Språk"
msgid "Help translate"
msgstr "Bidra til oversettelsen"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Bruk denne adressen for å <a href=\"%s\" target=\"_blank\">aksessere filene dine via WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "Krypterings-appen er ikke aktiv lenger. Vennligst dekrypter alle filene dine"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Innloggingspassord"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Dekrypter alle filer"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Krypteringsnøklene dine er flyttet til en plass for sikkerhetskopier. Hvis noe gikk galt kan du gjenopprette nøklene. Ikke slett dem permanent før du er ikker på at alle filer er dekryptert korrekt."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Gjenopprett krypteringsnøkler"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Slett krypteringsnøkler"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Logginn navn"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 3c1e77798f93041ac2e21dc3db45443e31f73d19..c40b399180889612083cb7f875d3ef982e1307d2 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 21:31+0000\n"
+"Last-Translator: vidaren <news@vidartysse.net>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -71,6 +71,10 @@ msgstr "Hent innstillinger fra tidligere tjener-konfigurasjon?"
msgid "Keep settings?"
msgstr "Behold innstillinger?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Server"
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Kan ikke legge til tjener-konfigurasjon"
@@ -87,6 +91,18 @@ msgstr "Suksess"
msgid "Error"
msgstr "Feil"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Vennligst spesifiser en hoved-DN"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Kunne ikke fastslå hoved-DN"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Vennligst spesifiser port"
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Konfigurasjon OK"
@@ -127,28 +143,44 @@ msgstr "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?"
msgid "Confirm Deletion"
msgstr "Bekreft sletting"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s gruppe funnet"
msgstr[1] "%s grupper funnet"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s bruker funnet"
msgstr[1] "%s brukere funnet"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Ugyldig tjener"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Fant ikke den ønskede funksjonaliteten"
+#: settings.php:52
+msgid "Server"
+msgstr "Server"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Brukerfilter"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Innloggingsfilter"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Gruppefilter"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Lagre"
@@ -164,7 +196,7 @@ msgstr "Hjelp"
#: templates/part.wizard-groupfilter.php:4
#, php-format
msgid "Groups meeting these criteria are available in %s:"
-msgstr ""
+msgstr "Grupper som tilfredsstiller disse kriteriene er tilgjengelige i %s:"
#: templates/part.wizard-groupfilter.php:8
#: templates/part.wizard-userfilter.php:8
@@ -200,7 +232,7 @@ msgstr "grupper funnet"
#: templates/part.wizard-loginfilter.php:4
msgid "Users login with this attribute:"
-msgstr ""
+msgstr "Brukere logger inn med denne attributten:"
#: templates/part.wizard-loginfilter.php:8
msgid "LDAP Username:"
@@ -221,10 +253,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "Definerer filteret som skal brukes når innlogging forsøkes. %%uid erstatter brukernavnet i innloggingshandlingen. Eksempel: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. server"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. server:"
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Legg til tjener-konfigurasjon"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Slett konfigurasjon"
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Tjener"
@@ -259,16 +304,16 @@ msgstr "For anonym tilgang, la DN- og passord-feltet stå tomt."
#: templates/part.wizard-server.php:60
msgid "One Base DN per line"
-msgstr "En hoved DN pr. linje"
+msgstr "En hoved-DN pr. linje"
#: templates/part.wizard-server.php:61
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "Du kan spesifisere Base DN for brukere og grupper under Avansert fanen"
+msgstr "Du kan spesifisere hoved-DN for brukere og grupper under Avansert fanen"
#: templates/part.wizard-userfilter.php:4
#, php-format
msgid "Limit %s access to users meeting these criteria:"
-msgstr ""
+msgstr "Begrens %s-tilgang til brukere som tilfredsstiller disse kriteriene:"
#: templates/part.wizard-userfilter.php:31
#, php-format
@@ -288,6 +333,14 @@ msgstr "Tilbake"
msgid "Continue"
msgstr "Fortsett"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Ekspert"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avansert"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
@@ -337,7 +390,7 @@ msgstr "Koble til bare replika-tjeneren."
#: templates/settings.php:26
msgid "Case insensitive LDAP server (Windows)"
-msgstr ""
+msgstr "LDAP-server som ikke skiller mellom store og små bokstaver (Windows)"
#: templates/settings.php:27
msgid "Turn off SSL certificate validation."
@@ -376,7 +429,7 @@ msgstr "Hovedbruker tre"
#: templates/settings.php:33
msgid "One User Base DN per line"
-msgstr "En Bruker Base DN pr. linje"
+msgstr "En Bruker hoved-DN pr. linje"
#: templates/settings.php:34
msgid "User Search Attributes"
@@ -412,24 +465,24 @@ msgstr "gruppe-medlem assosiasjon"
#: templates/settings.php:39
msgid "Nested Groups"
-msgstr ""
+msgstr "Nestede grupper"
#: templates/settings.php:39
msgid ""
"When switched on, groups that contain groups are supported. (Only works if "
"the group member attribute contains DNs.)"
-msgstr ""
+msgstr "Grupper som inneholder grupper er tillatt når denne er slått på. (Virker bare hvis gruppenes member-attributt inneholder DN-er.)"
#: templates/settings.php:40
msgid "Paging chunksize"
-msgstr ""
+msgstr "Sidestørrelse"
#: templates/settings.php:40
msgid ""
"Chunksize used for paged LDAP searches that may return bulky results like "
"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
"those situations.)"
-msgstr ""
+msgstr "Sidestørrelsen brukes for sidevise (paged) LDAP-søk som kan returnere store resultater, som f.eks. gjennomløping av brukere eller grupper. (Sett til 0 for å deaktivere sidevis LDAP-spørring i disse situasjonene.)"
#: templates/settings.php:42
msgid "Special Attributes"
diff --git a/l10n/nds/core.po b/l10n/nds/core.po
index 9ce7cea032ce114022891fe49a7cf92fa2dc796a..b30f94737e28699687b25e4710d82453db454ace 100644
--- a/l10n/nds/core.po
+++ b/l10n/nds/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: nds\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/nds/files.po b/l10n/nds/files.po
index 1229a0adde1c4cbdcddc67ec5db2b6af0fa67073..b746dcf8a297a010a4ec451e882476b14dfcdb39 100644
--- a/l10n/nds/files.po
+++ b/l10n/nds/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/nds/files_encryption.po b/l10n/nds/files_encryption.po
index defa439e7a7d58cda3d8aecf22a633dfda745e3f..f60a7386d0e105b9f503c3c8a4c72fab62b9cd32 100644
--- a/l10n/nds/files_encryption.po
+++ b/l10n/nds/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/nds/files_external.po b/l10n/nds/files_external.po
index ec347bfeb6205e43fa3ae0c5b65fa09e0cd32b14..1cf422057b9876b025605ff3da4eca71ca8d8e0d 100644
--- a/l10n/nds/files_external.po
+++ b/l10n/nds/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/nds/files_sharing.po b/l10n/nds/files_sharing.po
index d519385a8bc429fca7ba8be8c5575eadff2b12a4..8c1c5ea1f045911ec5271db61174548f3399d8c8 100644
--- a/l10n/nds/files_sharing.po
+++ b/l10n/nds/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: nds\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/nds/files_trashbin.po b/l10n/nds/files_trashbin.po
index 2ec4379ecc365545875e6b22d0fd3f283577713e..641cc979b1d22df9ef99c16db890d446720b535d 100644
--- a/l10n/nds/files_trashbin.po
+++ b/l10n/nds/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/nds/lib.po b/l10n/nds/lib.po
index 3ea275f0b99296f66ed458e7360d457987318f4d..31f74639014e51e29f9bcbddebcecd27b4332a02 100644
--- a/l10n/nds/lib.po
+++ b/l10n/nds/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: nds\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/nds/settings.po b/l10n/nds/settings.po
index aca2bdf5836a18be3e80dc12ca49a4e200ac0a1f..9fb7bb6d97be54224fe8efd82f03a2d2a455bccf 100644
--- a/l10n/nds/settings.po
+++ b/l10n/nds/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/nds/user_ldap.po b/l10n/nds/user_ldap.po
index 6ad765a099a6d8ef92a205987c10b5ab47d4ea72..cefaa560fb78534732b360d0f2a44cdbf15c0880 100644
--- a/l10n/nds/user_ldap.po
+++ b/l10n/nds/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index eccb8156098de155400ea76fa8553ba26368a52e..83370c91a6fef8d68c571cd8e1732e1844b23ddd 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ne\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index a780cb157938132a4181e0495bd43d6a84b47416..06a85a7bfc00fa2f1770992f2c7fdc41db54162b 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/ne/files_encryption.po b/l10n/ne/files_encryption.po
index 79efb4cb4b14da5282780b009c4e2c7b464156e7..565b48ecf4cfcc02c775ed5d5326f8d4c2311c38 100644
--- a/l10n/ne/files_encryption.po
+++ b/l10n/ne/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ne/files_external.po b/l10n/ne/files_external.po
index b88740e133453320de806f4e5b6696165dae2620..8815be2add6d9016182ef2f0a56058e4628f9b5f 100644
--- a/l10n/ne/files_external.po
+++ b/l10n/ne/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ne/files_sharing.po b/l10n/ne/files_sharing.po
index 491d20507b71de2e84f424e723b5cf3ecfac81cf..fc6db7815dc637ad471af695995313447a0b2dce 100644
--- a/l10n/ne/files_sharing.po
+++ b/l10n/ne/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: ne\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/ne/files_trashbin.po b/l10n/ne/files_trashbin.po
index b964888914e001c4e8cad27f438bfec82b7bb8e7..b6bc61076e9e44e83ca1556cbfdbf1c9636f4527 100644
--- a/l10n/ne/files_trashbin.po
+++ b/l10n/ne/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index dbd664f4f16e7a1b2a603a2a103c81fca0db6b8c..cf6f1ffaa1dd0b744f4751f633829cc848a20a47 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ne\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index c232c9c8c40feb2380a57da2c0713221857e85b3..fa9c40046cfe5087f6848b544731c612c89e8917 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po
index da064c9e5fa2ff9d504b70ea84539e88adcf6280..1d2329e90b88d572751d4d8ef3a97d79f770507f 100644
--- a/l10n/ne/user_ldap.po
+++ b/l10n/ne/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 6f77db706fa07cfcd5ddfe140fa73d7091435a1c..6011d475d28472a6ed9d0dc148d3b2ae00b21b8e 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -4,15 +4,15 @@
#
# Translators:
# André Koot <meneer@tken.net>, 2013-2014
-# kwillems <kwillems@zonnet.nl>, 2013
+# kwillems <kwillems@zonnet.nl>, 2013-2014
# Jorcee <mail@jordyc.nl>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 09:59+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 07:32+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"
@@ -20,11 +20,11 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "De vervaldatum ligt in het verleden."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Kon geen e-mail sturen aan de volgende gebruikers: %s"
@@ -41,6 +41,11 @@ msgstr "Onderhoudsmodus uitgeschakeld"
msgid "Updated database"
msgstr "Database bijgewerkt"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr "Gedeactiveerde incompatibele apps: %s"
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Geen afbeelding of bestand opgegeven"
@@ -61,207 +66,207 @@ msgstr "Geen tijdelijke profielafbeelding beschikbaar. Probeer het opnieuw"
msgid "No crop data provided"
msgstr "Geen bijsnijdingsgegevens opgegeven"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "zondag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "maandag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "dinsdag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "woensdag"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "donderdag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "vrijdag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "zaterdag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "januari"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "februari"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "maart"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "april"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "mei"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "augustus"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "september"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "november"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "december"
-#: js/js.js:483
+#: js/js.js:496
msgid "Settings"
msgstr "Instellingen"
-#: js/js.js:583
+#: js/js.js:596
msgid "Saving..."
msgstr "Opslaan"
-#: js/js.js:1240
+#: js/js.js:1220
msgid "seconds ago"
msgstr "seconden geleden"
-#: js/js.js:1241
+#: js/js.js:1221
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] "%n minuten geleden"
-#: js/js.js:1242
+#: js/js.js:1222
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] "%n uur geleden"
-#: js/js.js:1243
+#: js/js.js:1223
msgid "today"
msgstr "vandaag"
-#: js/js.js:1244
+#: js/js.js:1224
msgid "yesterday"
msgstr "gisteren"
-#: js/js.js:1245
+#: js/js.js:1225
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] "%n dagen geleden"
-#: js/js.js:1246
+#: js/js.js:1226
msgid "last month"
msgstr "vorige maand"
-#: js/js.js:1247
+#: js/js.js:1227
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] "%n maanden geleden"
-#: js/js.js:1248
+#: js/js.js:1228
msgid "last year"
msgstr "vorig jaar"
-#: js/js.js:1249
+#: js/js.js:1229
msgid "years ago"
msgstr "jaar geleden"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Kies"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Fout bij laden bestandenselecteur sjabloon: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nee"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Kies"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Fout bij laden bestandenselecteur sjabloon: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Fout bij laden berichtensjabloon: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} bestandsconflict"
msgstr[1] "{count} bestandsconflicten"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Een bestandsconflict"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nieuwe bestanden"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Al aanwezige bestanden"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Welke bestanden wilt u bewaren?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Als u beide versies selecteerde, zal het gekopieerde bestand een nummer aan de naam toegevoegd krijgen."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Annuleer"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Verder"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(alles geselecteerd)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} geselecteerd)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Fout bij laden bestand bestaat al sjabloon"
@@ -285,148 +290,157 @@ msgstr "Goed wachtwoord"
msgid "Strong password"
msgstr "Sterk wachtwoord"
-#: js/share.js:51 js/share.js:66 js/share.js:106
+#: js/share.js:69 js/share.js:84 js/share.js:127
msgid "Shared"
msgstr "Gedeeld"
-#: js/share.js:109
+#: js/share.js:130
msgid "Share"
msgstr "Delen"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:195 js/share.js:208 js/share.js:215 js/share.js:822
#: templates/installation.php:10
msgid "Error"
msgstr "Fout"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:197 js/share.js:885
msgid "Error while sharing"
msgstr "Fout tijdens het delen"
-#: js/share.js:171
+#: js/share.js:208
msgid "Error while unsharing"
msgstr "Fout tijdens het stoppen met delen"
-#: js/share.js:178
+#: js/share.js:215
msgid "Error while changing permissions"
msgstr "Fout tijdens het veranderen van permissies"
-#: js/share.js:188
+#: js/share.js:225
msgid "Shared with you and the group {group} by {owner}"
msgstr "Gedeeld met u en de groep {group} door {owner}"
-#: js/share.js:190
+#: js/share.js:227
msgid "Shared with you by {owner}"
msgstr "Gedeeld met u door {owner}"
-#: js/share.js:214
+#: js/share.js:251
msgid "Share with user or group …"
msgstr "Delen met gebruiker of groep ..."
-#: js/share.js:220
+#: js/share.js:257
msgid "Share link"
msgstr "Deel link"
-#: js/share.js:223
+#: js/share.js:263
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken"
+
+#: js/share.js:265
+msgid "By default the public link will expire after {days} days"
+msgstr "Standaard vervalt een openbare link na {days} dagen"
+
+#: js/share.js:270
msgid "Password protect"
msgstr "Wachtwoord beveiligd"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Wachtwoord"
+#: js/share.js:272
+msgid "Choose a password for the public link"
+msgstr "Kies een wachtwoord voor de openbare link"
-#: js/share.js:230
+#: js/share.js:278
msgid "Allow Public Upload"
msgstr "Sta publieke uploads toe"
-#: js/share.js:234
+#: js/share.js:282
msgid "Email link to person"
msgstr "E-mail link naar persoon"
-#: js/share.js:235
+#: js/share.js:283
msgid "Send"
msgstr "Versturen"
-#: js/share.js:240
+#: js/share.js:288
msgid "Set expiration date"
msgstr "Stel vervaldatum in"
-#: js/share.js:241
+#: js/share.js:289
msgid "Expiration date"
msgstr "Vervaldatum"
-#: js/share.js:277
+#: js/share.js:326
msgid "Share via email:"
msgstr "Deel via e-mail:"
-#: js/share.js:280
+#: js/share.js:329
msgid "No people found"
msgstr "Geen mensen gevonden"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:377 js/share.js:438
msgid "group"
msgstr "groep"
-#: js/share.js:357
+#: js/share.js:410
msgid "Resharing is not allowed"
msgstr "Verder delen is niet toegestaan"
-#: js/share.js:401
+#: js/share.js:454
msgid "Shared in {item} with {user}"
msgstr "Gedeeld in {item} met {user}"
-#: js/share.js:423
+#: js/share.js:476
msgid "Unshare"
msgstr "Stop met delen"
-#: js/share.js:431
+#: js/share.js:484
msgid "notify by email"
msgstr "melden per e-mail"
-#: js/share.js:434
+#: js/share.js:487
msgid "can edit"
msgstr "kan wijzigen"
-#: js/share.js:436
+#: js/share.js:489
msgid "access control"
msgstr "toegangscontrole"
-#: js/share.js:439
+#: js/share.js:492
msgid "create"
msgstr "creëer"
-#: js/share.js:442
+#: js/share.js:495
msgid "update"
msgstr "bijwerken"
-#: js/share.js:445
+#: js/share.js:498
msgid "delete"
msgstr "verwijderen"
-#: js/share.js:448
+#: js/share.js:501
msgid "share"
msgstr "deel"
-#: js/share.js:721
+#: js/share.js:803
msgid "Password protected"
msgstr "Wachtwoord beveiligd"
-#: js/share.js:734
+#: js/share.js:822
msgid "Error unsetting expiration date"
-msgstr "Fout tijdens het verwijderen van de verval datum"
+msgstr "Fout tijdens het verwijderen van de vervaldatum"
-#: js/share.js:752
+#: js/share.js:843
msgid "Error setting expiration date"
msgstr "Fout tijdens het instellen van de vervaldatum"
-#: js/share.js:777
+#: js/share.js:872
msgid "Sending ..."
msgstr "Versturen ..."
-#: js/share.js:788
+#: js/share.js:883
msgid "Email sent"
msgstr "E-mail verzonden"
-#: js/share.js:812
+#: js/share.js:907
msgid "Warning"
msgstr "Waarschuwing"
@@ -458,20 +472,21 @@ msgstr "Fout bij laden dialoog sjabloon: {error}"
msgid "No tags selected for deletion."
msgstr "Geen tags geselecteerd voor verwijdering."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr "Bijwerken {productName} naar versie {version}, dit kan even duren."
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Herlaad deze pagina."
-#: 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 "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr "De update is niet geslaagd."
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud."
+msgstr "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud."
#: lostpassword/controller.php:70
#, php-format
@@ -486,22 +501,22 @@ msgstr "Er ontstond een probleem bij het versturen van het e-mailbericht, neem c
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
-msgstr "Gebruik de volgende link om je wachtwoord te resetten: {link}"
+msgstr "Gebruik de volgende link om uw wachtwoord te resetten: {link}"
#: lostpassword/templates/lostpassword.php: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 "De link voor het resetten van je wachtwoord is verzonden naar je e-mailadres.<br>Als je dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan je beheerder om te helpen."
+msgstr "De link voor het resetten van uw wachtwoord is verzonden naar uw e-mailadres.<br>Als u dat bericht niet snel ontvangen hebt, controleer dan uw spammap.<br>Als het daar ook niet is, vraag dan uw beheerder om hulp."
#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoord goed waren?"
+msgstr "Aanvraag mislukt!<br>Weet u zeker dat uw gebruikersnaam en/of wachtwoord goed waren?"
#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
-msgstr "Je ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail."
+msgstr "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail."
#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
#: templates/login.php:32
@@ -514,7 +529,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 "Je bestanden zijn versleuteld. Als je geen recoverykey hebt ingeschakeld is er geen manier om je data terug te krijgen indien je je wachtwoord reset!\nAls je niet weet wat te doen, neem dan alsjeblieft contact op met je administrator eer je doorgaat.\nWil je echt doorgaan?"
+msgstr "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?"
#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
@@ -526,7 +541,7 @@ msgstr "Reset"
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
-msgstr "Je wachtwoord is gewijzigd"
+msgstr "Uw wachtwoord is gewijzigd"
#: lostpassword/templates/resetpassword.php:5
msgid "To login page"
@@ -616,7 +631,7 @@ msgid ""
"just letting you know that %s shared %s with you.\n"
"View it: %s\n"
"\n"
-msgstr "Hallo daar,\n\neven een berichtje dat %s %s met u deelde.\nBekijk het: %s\n\n"
+msgstr "Hallo,\n\n%s deelt %s met u.\nBekijk het: %s\n\n"
#: templates/altmail.php:4 templates/mail.php:17
#, php-format
@@ -634,7 +649,7 @@ msgstr "Beveiligingswaarschuwing"
#: templates/installation.php:26
msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)"
+msgstr "Uw PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)"
#: templates/installation.php:27
#, php-format
@@ -657,7 +672,7 @@ msgstr "Zonder random nummer generator is het mogelijk voor een aanvaller om de
msgid ""
"Your data directory and files are probably accessible from the internet "
"because the .htaccess file does not work."
-msgstr "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet werkt."
+msgstr "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert."
#: templates/installation.php:42
#, php-format
@@ -670,6 +685,10 @@ msgstr "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informa
msgid "Create an <strong>admin account</strong>"
msgstr "Maak een <strong>beheerdersaccount</strong> aan"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Wachtwoord"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Opslag & database"
@@ -719,7 +738,7 @@ msgid ""
"This application requires JavaScript to be enabled for correct operation. "
"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
"JavaScript</a> and re-load this interface."
-msgstr "Deze applicatie heeft een werkend JavaScript nodig. <a href=\"http://enable-javascript.com/\" target=\"_blank\">activeer JavaScript</a> en herlaad deze interface."
+msgstr "Deze applicatie heeft JavaScript nodig om correct te functioneren. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeer JavaScript</a> en herlaad deze interface."
#: templates/layout.user.php:44
#, php-format
@@ -738,11 +757,11 @@ msgstr "Automatische aanmelding geweigerd!"
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
-msgstr "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overgenomen zijn!"
+msgstr "Als u uw wachtwoord niet onlangs heeft aangepast, kan uw account overgenomen zijn!"
#: templates/login.php:12
msgid "Please change your password to secure your account again."
-msgstr "Wijzig je wachtwoord zodat je account weer beveiligd is."
+msgstr "Wijzig uw wachtwoord zodat uw account weer beveiligd is."
#: templates/login.php:17
msgid "Server side authentication failed!"
@@ -762,7 +781,7 @@ msgstr "onthoud gegevens"
#: templates/login.php:54
msgid "Log in"
-msgstr "Meld je aan"
+msgstr "Meld u aan"
#: templates/login.php:60
msgid "Alternative Logins"
@@ -773,7 +792,7 @@ msgstr "Alternatieve inlogs"
msgid ""
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
"with you.<br><a href=\"%s\">View it!</a><br><br>"
-msgstr "Hallo daar,<br><br>we willen even laten weten dat %s <strong>%s</strong> met u heeft gedeeld.<br><a href=\"%s\">Bekijk het!</a><br><br>"
+msgstr "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk het!</a><br><br>"
#: templates/singleuser.user.php:3
msgid "This ownCloud instance is currently in single user mode."
@@ -795,8 +814,27 @@ msgstr "Bedankt voor uw geduld."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Updaten ownCloud naar versie %s, dit kan even duren..."
+msgid "%s will be updated to version %s."
+msgstr "%s wordt bijgewerkt naar versie %s."
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr "De volgende apps worden gedeactiveerd:"
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr "Het thema %s is gedeactiveerd."
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr "Let erop dat de database, de config map en de data map zijn gebackupped voordat u verder gaat."
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr "Begin de update"
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index f844d855f960139863260a6b5809ae0a50c8c881..c99adad9481b5d613691cfb396c2d88a55096402 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -4,13 +4,13 @@
#
# Translators:
# André Koot <meneer@tken.net>, 2013-2014
-# kwillems <kwillems@zonnet.nl>, 2013
+# kwillems <kwillems@zonnet.nl>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 07:21+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"
@@ -29,7 +29,7 @@ msgstr "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam"
msgid "Could not move %s"
msgstr "Kon %s niet verplaatsen"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Bestandsnaam kan niet leeg zijn."
@@ -38,18 +38,18 @@ msgstr "Bestandsnaam kan niet leeg zijn."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" is een ongeldige bestandsnaam."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "De doelmap is verplaatst of verwijderd."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -125,44 +125,48 @@ msgstr "Er ontbreekt een tijdelijke map"
msgid "Failed to write to disk"
msgstr "Schrijven naar schijf mislukt"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Niet genoeg opslagruimte beschikbaar"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Upload mislukt. Kon ge-uploade bestand niet vinden"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Upload mislukt, Kon geen bestandsinfo krijgen."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Ongeldige directory."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Bestanden"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Alle bestanden"
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "Totale bestandsgrootte {size1} groter dan uploadlimiet {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Niet genoeg vrije ruimte. U upload {size1}, maar is is slechts {size2} beschikbaar"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Uploaden geannuleerd."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Kon het resultaat van de server niet terugkrijgen."
@@ -175,120 +179,124 @@ msgstr "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de u
msgid "URL cannot be empty"
msgstr "URL mag niet leeg zijn"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1188
msgid "{new_name} already exists"
msgstr "{new_name} bestaat al"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Kon bestand niet creëren"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Kon niet creëren map"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Fout bij ophalen URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:211
msgid "Share"
msgstr "Delen"
-#: js/fileactions.js:173
+#: js/fileactions.js:224
msgid "Delete permanently"
msgstr "Verwijder definitief"
-#: js/fileactions.js:234
+#: js/fileactions.js:226 templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr "Verwijder"
+
+#: js/fileactions.js:262
msgid "Rename"
msgstr "Hernoem"
-#: js/filelist.js:221
+#: js/filelist.js:314
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:619 js/filelist.js:1691
msgid "Pending"
msgstr "In behandeling"
-#: js/filelist.js:916
+#: js/filelist.js:1139
msgid "Error moving file."
msgstr "Fout bij verplaatsen bestand"
-#: js/filelist.js:924
+#: js/filelist.js:1147
msgid "Error moving file"
msgstr "Fout bij verplaatsen bestand"
-#: js/filelist.js:924
+#: js/filelist.js:1147
msgid "Error"
msgstr "Fout"
-#: js/filelist.js:988
+#: js/filelist.js:1225
msgid "Could not rename file"
msgstr "Kon niet hernoemen bestand"
-#: js/filelist.js:1122
+#: js/filelist.js:1346
msgid "Error deleting file."
msgstr "Fout bij verwijderen bestand."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1449 templates/list.php:62
msgid "Name"
msgstr "Naam"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1450 templates/list.php:75
msgid "Size"
msgstr "Grootte"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1451 templates/list.php:78
msgid "Modified"
msgstr "Aangepast"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] "%n mappen"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] "%n bestanden"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1599 js/filelist.js:1638
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n bestand aan het uploaden"
msgstr[1] "%n bestanden aan het uploaden"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" is een ongeldige bestandsnaam."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in."
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Ongeldige privésleutel voor crypto app. Werk het privésleutel wachtwoord bij in uw persoonlijke instellingen om opnieuw toegang te krijgen tot uw versleutelde bestanden."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -298,12 +306,12 @@ msgstr "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld
msgid "{dirs} and {files}"
msgstr "{dirs} en {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s kon niet worden hernoemd"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Upload (max. %s)"
@@ -340,68 +348,71 @@ msgstr "Maximale grootte voor ZIP bestanden"
msgid "Save"
msgstr "Bewaren"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Gebruik deze link <a href=\"%s\" target=\"_blank\">om uw bestanden via WebDAV te benaderen</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Nieuw"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Nieuw tekstbestand"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Tekstbestand"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Nieuwe map"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Map"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Vanaf link"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Verwijderde bestanden"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Upload afbreken"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "U hebt geen toestemming om hier te uploaden of bestanden te maken"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Er bevindt zich hier niets. Upload een bestand!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Downloaden"
-#: templates/index.php:84 templates/index.php:85
-msgid "Delete"
-msgstr "Verwijder"
-
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Upload is te groot"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Bestanden worden gescand, even wachten."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Er wordt gescand"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr "Nu aan het scannen"
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index 0e0cf6cab7223a80d16a51bcd504dc3383fbc9d7..6647356b035682e5b9b8eedff50fddf06c0e9d52 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 18:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 07:32+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"
@@ -78,9 +78,9 @@ msgstr "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld best
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Onbekende fout, Controleer uw systeeminstellingen of neem contact op met uw systeembeheerder"
+msgstr "Onbekende fout. Controleer uw systeeminstellingen of neem contact op met de beheerder"
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -93,7 +93,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "De volgende gebruikers hebben geen configuratie voor encryptie:"
@@ -113,91 +113,91 @@ msgstr "Ga meteen naar uw"
msgid "personal settings"
msgstr "persoonlijke instellingen"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Versleuteling"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Wachtwoord herstelsleulel"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Herhaal het herstelsleutel wachtwoord"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Geactiveerd"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Gedeactiveerd"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Wijzig wachtwoord herstelsleutel:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Oude wachtwoord herstelsleutel"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Nieuwe wachtwoord herstelsleutel"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Herhaal het nieuwe herstelsleutel wachtwoord"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Wijzigen wachtwoord"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Het wachtwoord van uw privésleutel komt niet meer overeen met uw inlogwachtwoord:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Stel het wachtwoord van uw oude privésleutel in op uw huidige inlogwachtwoord."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Als u uw oude wachtwoord niet meer weet, kunt u uw beheerder vragen uw bestanden terug te halen."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Oude wachtwoord"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Huidige wachtwoord"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Bijwerken wachtwoord Privésleutel"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Activeren wachtwoord herstel:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Het activeren van deze optie maakt het mogelijk om uw versleutelde bestanden te benaderen als uw wachtwoord kwijt is"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Bestandsherstel instellingen bijgewerkt"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Kon bestandsherstel niet bijwerken"
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index bf470c0837e7e0f58f32673c558767f69273d273..50ff05f11bebc58e12c75be70938de360a78073d 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/files_external.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 09:59+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: I Robot\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"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr "App secret"
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,6 +166,10 @@ msgstr "SMB / CIFS via OC inlog"
msgid "Username as share"
msgstr "Gebruikersnaam als share"
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr "Secure https://"
@@ -198,29 +202,29 @@ msgstr "Fout tijdens het configureren van Google Drive opslag"
msgid "Saved"
msgstr "Bewaard"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr "<b>Let op:</b> "
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr "en"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren."
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren."
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 7355d565606c1533e841101db5eec62ccaa51b9f..443033455afd971b7e042502b3b770a109f945ae 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,34 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Gedeeld door {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Deze share is met een wachtwoord beveiligd"
@@ -35,6 +59,14 @@ msgstr "Wachtwoord ongeldig. Probeer het nogmaals."
msgid "Password"
msgstr "Wachtwoord"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Sorry, deze link lijkt niet meer in gebruik te zijn."
@@ -63,11 +95,11 @@ msgstr "Voor meer informatie, neem contact op met de persoon die u deze link hee
msgid "Download"
msgstr "Downloaden"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Download %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Directe link"
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index 17d352ef3b1b98156173fae636f3edb601d8a08b..4ab3b317b7129df3e97106c8ac02a51de67544c9 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "Kon %s niet permanent verwijderen"
msgid "Couldn't restore %s"
msgstr "Kon %s niet herstellen"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Verwijderde bestanden"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Herstellen"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Fout"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Verwijderde bestanden"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "hersteld"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Niets te vinden. Uw prullenbak is leeg!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Naam"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Herstellen"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Verwijderd"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Verwijder"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index 43aa8aecfec4a13101e71630ecdd1306a77b631d..bc070dc8740f5498727696c3bbdc47003e85876a 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -4,15 +4,15 @@
#
# Translators:
# André Koot <meneer@tken.net>, 2013-2014
-# kwillems <kwillems@zonnet.nl>, 2013
+# kwillems <kwillems@zonnet.nl>, 2013-2014
# Len <lenny@weijl.org>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 09:59+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-25 21:40+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:712
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr "U benadert de server vanaf een niet vertrouwd domein."
-#: base.php:713
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -79,23 +79,23 @@ msgstr "Ongeldige afbeelding"
msgid "web services under your control"
msgstr "Webdiensten in eigen beheer"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP download is uitgeschakeld."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Bestanden moeten één voor één worden gedownload."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Terug naar bestanden"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "De geselecteerde bestanden zijn te groot om een zip bestand te maken."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -292,116 +292,127 @@ 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."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s deelde »%s« met jou"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr "Delen van %s is mislukt, omdat het bestand niet bestaat"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "U bent niet bevoegd om %s te delen"
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "Delen van %s is mislukt, omdat de gebruiker %s de eigenaar is"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "Delen van %s is mislukt, omdat gebruiker %s niet bestaat"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr "Delen van %s is mislukt, omdat gebruiker %s geen lid is van een groep waar %s lid van is"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "Delen van %s is mislukt, omdat groep %s niet bestaat"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "Delen van %s is mislukt, omdat %s geen lid is van groep %s"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "U moet een wachtwoord verstrekken om een openbare koppeling te maken, alleen beschermde links zijn toegestaan"
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "Delen van %s is mislukt, omdat het delen met links niet is toegestaan"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr "Delen van type %s is niet geldig voor %s"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr "Instellen van de permissies voor %s is mislukt, omdat de permissies hoger zijn dan de aan %s toegekende permissies"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "Instellen van de permissies voor %s is mislukt, omdat het object niet is gevonden"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr "Het share-backend %s moet de OCP\\Share_Backend interface implementeren"
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr "Het share-backend %s is niet gevonden"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr "Het share-backend voor %s is niet gevonden"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr "Delen van %s is mislukt, omdat gebruiker %s de originele deler is"
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr "Delen van %s is mislukt, omdat de rechten de aan %s toegekende autorisaties overschrijden"
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr "Delen van %s is mislukt, omdat her-delen niet is toegestaan"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr "Delen van %s is mislukt, omdat de share-backend voor %s de bron niet kon vinden"
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr "Delen van %s is mislukt, omdat het bestand niet in de bestandscache kon worden gevonden"
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Kon categorie \"%s\" niet vinden"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 8295ce6a75d1125a490187c72f4a86a6f7fd64d9..e04acbe354c30a53b7f1b7419e519b28103f7de0 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -5,15 +5,15 @@
# Translators:
# André Koot <meneer@tken.net>, 2013-2014
# helonaut, 2013
-# kwillems <kwillems@zonnet.nl>, 2013
+# kwillems <kwillems@zonnet.nl>, 2013-2014
# Len <lenny@weijl.org>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 09:59+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -51,15 +51,15 @@ msgstr "E-mail verzonden"
msgid "You need to set your user email before being able to send test emails."
msgstr "U moet uw e-mailadres instellen voordat u testberichten kunt versturen."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Verstuurmodus"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Versleuteling"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Authenticatiemethode"
@@ -102,6 +102,16 @@ msgstr "Kon uw bestanden niet ontsleutelem. Controleer uw owncloud logs of vraag
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Cryptosleutels permanent verwijderd"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Kom uw cryptosleutels niet permanent verwijderen. Controleer uw owncloud.log, of neem contact op met uw beheerder."
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "E-mail bewaard"
@@ -118,6 +128,16 @@ msgstr "Niet in staat om groep te verwijderen"
msgid "Unable to delete user"
msgstr "Niet in staat om gebruiker te verwijderen"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Backup succesvol terggezet"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Kon uw cryptosleutels niet herstellen. Controleer uw owncloud.log of neem contact op met uw beheerder"
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Taal aangepast"
@@ -173,7 +193,7 @@ msgstr "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleute
msgid "Unable to change password"
msgstr "Kan wachtwoord niet wijzigen"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Versturen..."
@@ -229,34 +249,42 @@ msgstr "Bijwerken"
msgid "Updated"
msgstr "Bijgewerkt"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Kies een profielafbeelding"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Zeer zwak wachtwoord"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Zwak wachtwoord"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Matig wachtwoord"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Goed wachtwoord"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Sterk wachtwoord"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Verwijder de encryptiesleutels permanent"
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Herstel de encryptiesleutels"
+
#: js/users.js:47
msgid "deleted"
msgstr "verwijderd"
@@ -269,8 +297,8 @@ msgstr "ongedaan maken"
msgid "Unable to remove user"
msgstr "Kon gebruiker niet verwijderen"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Groepen"
@@ -302,7 +330,7 @@ msgstr "Er moet een geldig wachtwoord worden opgegeven"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Waarschuwing: Home directory voor gebruiker \"{user}\" bestaat al"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Nederlands"
@@ -370,7 +398,7 @@ msgid ""
"root."
msgstr "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar. Het .htaccess-bestand werkt niet. We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datamap niet bereikbaar is vanaf het internet of om uw datamap te verplaatsen naar een locatie buiten de document root van de webserver."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Instellingswaarschuwing"
@@ -385,53 +413,65 @@ msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omda
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "Conntroleer de <a href='%s'>installatie handleiding</a> goed."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Module 'fileinfo' ontbreekt"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Uw PHP versie is verouderd"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Uw PHP versie is verouderd. We adviseren met klem om bij te werken naar versie 5.3.8 of later, omdat oudere versies corrupt kunnen zijn. Het is mogelijk dat deze installatie niet goed werkt."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Taalbestand werkt niet"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Dat betekent dat er problemen kunnen optreden met bepaalde tekens in bestandsnamen."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "We adviseren met klem om de noodzakelijke pakketten op uw systeem te installeren om een van de volgende talen te ondersteunen: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Internet verbinding werkt niet"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -440,198 +480,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "Laatst uitgevoerde cron op %s."
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "Laatst uitgevoerde cron op %s. Dat is langer dan een uur geleden, er is iets fout gegaan."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "Cron is nog niet uitgevoerd!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Bij laden van elke pagina één taak uitvoeren"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Delen"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Activeren Share API"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Apps toestaan de Share API te gebruiken"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Toestaan links"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Toestaan dat gebruikers objecten met links delen met anderen"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr "Dwing wachtwoordbeveiliging af"
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Sta publieke uploads toe"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Sta gebruikers toe anderen in hun publiek gedeelde mappen bestanden te uploaden"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "Stel standaard vervaldatum in"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Vervalt na"
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "dagen"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Verplicht de vervaldatum"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Toestaan dat gebruikers objecten met links delen met anderen"
-#: templates/admin.php:235
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Toestaan opnieuw delen"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Toestaan dat gebruikers met iedereen delen"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Instellen dat gebruikers alleen met leden binnen hun groepen delen"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Toestaan e-mailnotificaties"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Sta gebruikers toe om e-mailnotificaties te versturen voor gedeelde bestanden"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr "Stel standaard vervaldatum in"
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Vervalt na"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr "Sluit groepen uit van delen"
-#: templates/admin.php:266
-msgid "days"
-msgstr "dagen"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr "Verplicht de vervaldatum"
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Laat shares standaard vervallen na N dagen"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Deze groepen kunnen gedeelde mappen bestanden ontvangen, maar kunnen ze niet starten."
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Beveiliging"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Afdwingen HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Dwingt de clients om een versleutelde verbinding te maken met %s"
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "E-mailserver"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "Dit wordt gestuurd voor het verzenden van meldingen."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Afzenderadres"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr "e-mail"
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Authenticatie vereist"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Server adres"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Poort"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Inloggegevens"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "SMTP gebruikersnaam"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "SMTP wachtwoord"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Test e-mailinstellingen"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Versturen e-mail"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Log"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Log niveau"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Meer"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Minder"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versie"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -784,29 +832,33 @@ msgstr "Taal"
msgid "Help translate"
msgstr "Help met vertalen"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Gebruik deze link <a href=\"%s\" target=\"_blank\">om uw bestanden via WebDAV te benaderen</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "De crypto app is niet langer geactiveerd, u moet alle bestanden decrypten."
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Inlog-wachtwoord"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Decodeer alle bestanden"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Uw cryptosleutels zijn verplaatst naar een backup locatie. Als iets iets verkeerd ging, kunt u de sleutels herstellen. Verwijder ze alleen permanent als u zeker weet dat de bestanden goed zijn versleuteld."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Herstel cryptosleutels"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Verwijder cryptosleutels"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Inlognaam"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 37b6230cbfb48df9f806e8392e03c10f5bee2889..3aab2cc242f77f8454de1455a6befd0293d7764b 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 09:59+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 07:32+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"
@@ -73,6 +73,10 @@ msgstr "Overnemen instellingen van de recente serverconfiguratie?"
msgid "Keep settings?"
msgstr "Instellingen bewaren?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Server"
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Kon de serverconfiguratie niet toevoegen"
@@ -89,6 +93,18 @@ msgstr "Succes"
msgid "Error"
msgstr "Fout"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Geef een Base DN op"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Kon de Base DN niet vaststellen"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Geef de poort op"
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Configuratie OK"
@@ -129,28 +145,44 @@ msgstr "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?"
msgid "Confirm Deletion"
msgstr "Bevestig verwijderen"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s groep gevonden"
msgstr[1] "%s groepen gevonden"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s gebruiker gevonden"
msgstr[1] "%s gebruikers gevonden"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Ongeldige server"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Kon de gewenste functie niet vinden"
+#: settings.php:52
+msgid "Server"
+msgstr "Server"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Gebruikersfilter"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Inlogfilter"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Groep Filter"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Bewaren"
@@ -223,10 +255,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "Definiëert het toe te passen filter als er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam bij het inloggen. Bijvoorbeeld: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Server"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Server:"
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Toevoegen serverconfiguratie"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Verwijder configuratie"
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Host"
@@ -290,6 +335,14 @@ msgstr "Terug"
msgid "Continue"
msgstr "Verder"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Expert"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Geavanceerd"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 7ea8af0593164618941f00c575b861be50ea0d5a..bb1a02d4f652521a95b753fea3de2bc6f8db4df3 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2014-04-30 14:20+0000\n"
-"Last-Translator: brekkjen <leif.brekke@oppstryn.no>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -21,11 +21,11 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Kunne ikkje snede e-post til følgande brukarar: %s "
@@ -42,6 +42,11 @@ msgstr "Skrudde av vedlikehaldsmodus"
msgid "Updated database"
msgstr "Database oppdatert"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Inga bilete eller fil gitt"
@@ -62,207 +67,207 @@ msgstr "Inga midlertidig profilbilete tilgjengeleg, prøv igjen"
msgid "No crop data provided"
msgstr "Ingen beskjeringsdata gitt"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Søndag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "MÃ¥ndag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Tysdag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Onsdag"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Torsdag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Fredag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Laurdag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mars"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Desember"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Innstillingar"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Lagrar …"
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "sekund sidan"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minutt sidan"
msgstr[1] "%n minutt sidan"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n time sidan"
msgstr[1] "%n timar sidan"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "i dag"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "i går"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dag sidan"
msgstr[1] "%n dagar sidan"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "førre månad"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n månad sidan"
msgstr[1] "%n månadar sidan"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "i fjor"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "Ã¥r sidan"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Vel"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Klarte ikkje å lasta filplukkarmal: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Vel"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Klarte ikkje å lasta filplukkarmal: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Greitt"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Klarte ikkje å lasta meldingsmal: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} filkonflikt"
msgstr[1] "{count} filkonfliktar"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Éin filkonflikt"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Kva filer vil du spara?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
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:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "GÃ¥ vidare"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(alle valte)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} valte)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Klarte ikkje å lasta fil-finst-mal"
@@ -294,140 +299,149 @@ msgstr "Delt"
msgid "Share"
msgstr "Del"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Feil"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Feil ved deling"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Feil ved udeling"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Feil ved endring av tillatingar"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Delt med deg og gruppa {group} av {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Delt med deg av {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Passordvern"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Passord"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Tillat offentleg opplasting"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Send lenkja over e-post"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Send"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Set utløpsdato"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Utløpsdato"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Del over e-post:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Fann ingen personar"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "gruppe"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Vidaredeling er ikkje tillate"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Delt i {item} med {brukar}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Udel"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "kan endra"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "tilgangskontroll"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "lag"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "oppdater"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "slett"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "del"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Passordverna"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Klarte ikkje fjerna utløpsdato"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Klarte ikkje setja utløpsdato"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Sender …"
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "E-post sendt"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Ã…tvaring"
@@ -459,18 +473,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Oppdateringa er fullført. Sender deg vidare til ownCloud no."
@@ -671,6 +686,10 @@ msgstr "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> f
msgid "Create an <strong>admin account</strong>"
msgstr "Lag ein <strong>admin-konto</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Passord"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -796,8 +815,27 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Oppdaterer ownCloud til utgåve %s, dette kan ta ei stund."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 41c6b8f1d4237bfde262e7138beb7348bed68299..0b1777ad766107a8f3163a8b378cfd9a07229cda 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgstr "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet"
msgid "Could not move %s"
msgstr "Klarte ikkje flytta %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Filnamnet kan ikkje vera tomt."
@@ -39,18 +39,18 @@ msgstr "Filnamnet kan ikkje vera tomt."
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -126,44 +126,48 @@ msgstr "Manglar ei mellombels mappe"
msgid "Failed to write to disk"
msgstr "Klarte ikkje skriva til disk"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Ikkje nok lagringsplass tilgjengeleg"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Feil ved opplasting. Klarte ikkje å finna opplasta fil."
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Feil ved opplasting. Klarte ikkje å henta filinfo."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Ugyldig mappe."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Filer"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
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:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Opplasting avbroten."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Klarte ikkje å henta resultat frå tenaren."
@@ -176,120 +180,120 @@ msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbrot
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} finst allereie"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Del"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Slett for godt"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Endra namn"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Under vegs"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Feil ved flytting av fil"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Feil"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Namn"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Storleik"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Endra"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n mappe"
msgstr[1] "%n mapper"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fil"
msgstr[1] "%n filer"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Lastar opp %n fil"
msgstr[1] "Lastar opp %n filer"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Lagringa di er nesten full ({usedSpacePercent} %)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -299,12 +303,12 @@ msgstr "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekry
msgid "{dirs} and {files}"
msgstr "{dirs} og {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "Klarte ikkje å omdøypa på %s"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -341,68 +345,75 @@ msgstr "Maksimal storleik for ZIP-filer"
msgid "Save"
msgstr "Lagre"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "Ny"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Tekst fil"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Ny mappe"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Mappe"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Frå lenkje"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Sletta filer"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Avbryt opplasting"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Ingenting her. Last noko opp!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Last ned"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Slett"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "For stor opplasting"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Skannar filer, ver venleg og vent."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Køyrande skanning"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index cba4f8cebb70c8d0aa98dfcc1f6dd89fdcad0ff6..895762c0e47366bad6de2031f44d135f3be252e7 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Kryptering"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index f2cf1bf5c7a2bebeb35bb6c2374e92321e2df1d8..bdc7acabd5756c8dea39800d6b035abcd269e85e 100644
--- a/l10n/nn_NO/files_external.po
+++ b/l10n/nn_NO/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2014-04-30 14:10+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "Nettstad"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Tenar"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "Nettstad"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 36b39a6c212d40ffbb1f182c68af05b515b027a0..9dfd6357f5f166e0fb94a0bcab4e0e2e3dbea611 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Delt av {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -34,6 +58,14 @@ msgstr "Passordet er gale. Prøv igjen."
msgid "Password"
msgstr "Passord"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Orsak, denne lenkja fungerer visst ikkje lenger."
@@ -62,11 +94,11 @@ msgstr "Spør den som sende deg lenkje om du vil ha meir informasjon."
msgid "Download"
msgstr "Last ned"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index ab286c9bb311f3561c4cd8163cc350eb8c126eb0..493249fc6965c49f12e248f6d93af2a19b5342af 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -29,38 +29,34 @@ msgstr "Klarte ikkje sletta %s for godt"
msgid "Couldn't restore %s"
msgstr "Klarte ikkje gjenoppretta %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Sletta filer"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Gjenopprett"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Feil"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Sletta filer"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "gjenoppretta"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Ingenting her. Papirkorga di er tom!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Namn"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Gjenopprett"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Sletta"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Slett"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index 81d07812d1a864512d5dbf01e681364fc273504a..04f329bb82f76eab80c65365c805059f2381251d 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -78,23 +78,23 @@ msgstr "Ugyldig bilete"
msgid "web services under your control"
msgstr "Vev tjenester under din kontroll"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -280,127 +280,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s delte «%s» med deg"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index f2823c996ba7ccf525f6f79435f3c42498bf24ee..1a2d4ac7546f85354e1d102b176fe91f249b4c57 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -50,15 +50,15 @@ msgstr "E-post sendt"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Kryptering"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -101,6 +101,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "E-postadresse lagra"
@@ -117,6 +127,16 @@ msgstr "Klarte ikkje å sletta gruppa"
msgid "Unable to delete user"
msgstr "Klarte ikkje sletta brukaren"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Språk endra"
@@ -172,7 +192,7 @@ msgstr "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til b
msgid "Unable to change password"
msgstr "Klarte ikkje å endra passordet"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -228,34 +248,42 @@ msgstr "Oppdater"
msgid "Updated"
msgstr "Oppdatert"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Vel eit profilbilete"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "sletta"
@@ -268,8 +296,8 @@ msgstr "angra"
msgid "Unable to remove user"
msgstr "Klarte ikkje fjerna brukaren"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupper"
@@ -301,7 +329,7 @@ msgstr "Du må oppgje eit gyldig passord"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Nynorsk"
@@ -369,7 +397,7 @@ msgid ""
"root."
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:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Oppsettsåtvaring"
@@ -384,53 +412,65 @@ msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering s
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "Ver venleg og dobbeltsjekk <a href=\"%s\">installasjonsrettleiinga</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Modulen «fileinfo» manglar"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Regionaldata fungerer ikkje"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Nettilkoplinga fungerer ikkje"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -439,198 +479,206 @@ msgid ""
"internet connection for this server if you want to have all features."
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:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Utfør éi oppgåve for kvar sidelasting"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Deling"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Slå på API-et for deling"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "La app-ar bruka API-et til deling"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Tillat lenkjer"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "La brukarar dela ting offentleg med lenkjer"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Tillat offentlege opplastingar"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "La brukarar tillata andre å lasta opp i deira offentleg delte mapper"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "La brukarar dela ting offentleg med lenkjer"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Tillat vidaredeling"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "La brukarar vidaredela delte ting"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "La brukarar dela med kven som helst"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "La brukarar dela berre med brukarar i deira grupper"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Tryggleik"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Krev HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Tvingar klientar til å kopla til %s med ei kryptert tilkopling."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet)."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Tenaradresse"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Logg"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Log nivå"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Meir"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Utgåve"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -783,29 +831,33 @@ msgstr "Språk"
msgid "Help translate"
msgstr "Hjelp oss å omsetja"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr ""
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Innloggingspassord"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Dekrypter alle filene"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Innloggingsnamn"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index f8501e7e953a1625cb23d515eccf3a23fb1d8e16..add6e3596db61608b28e35803c888dad15dde1f9 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "Feil"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Lagra"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Tenar"
@@ -287,6 +332,14 @@ msgstr "Tilbake"
msgid "Continue"
msgstr "GÃ¥ vidare"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avansert"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po
index 654b95dd28126d8f3665fb0a646103eef522974d..b6ce2f698db1b9424b5e644a43fb21801d7b8ab6 100644
--- a/l10n/nqo/core.po
+++ b/l10n/nqo/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: nqo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,202 +63,202 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,140 +290,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -450,18 +464,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -662,6 +677,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -787,7 +806,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/nqo/files.po b/l10n/nqo/files.po
index 992c57a4a929a328f6135a5ca8fcb171f82d35f8..89c9eac5d0d7ddec39ec2b43a25f2624a066e2b8 100644
--- a/l10n/nqo/files.po
+++ b/l10n/nqo/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,117 +177,117 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -293,12 +297,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -335,68 +339,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/nqo/files_encryption.po b/l10n/nqo/files_encryption.po
index f8d0e13d326ecb36542aa1ba9a2a55033228764a..c514d7022167b7bd41bea859ed3cfe8f662d1739 100644
--- a/l10n/nqo/files_encryption.po
+++ b/l10n/nqo/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/nqo/files_external.po b/l10n/nqo/files_external.po
index f42f49216ccb2eb9d89ba2c034c9c46de3ccc13b..6331f53f10af167833eb05aa4d5bde0531dde09d 100644
--- a/l10n/nqo/files_external.po
+++ b/l10n/nqo/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/nqo/files_sharing.po b/l10n/nqo/files_sharing.po
index ca3371aeaf09ccd42dee6adc9b12bb1e2b88d637..18d0c2a20347627f75d71c0d800ddc2886a1c003 100644
--- a/l10n/nqo/files_sharing.po
+++ b/l10n/nqo/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: nqo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/nqo/files_trashbin.po b/l10n/nqo/files_trashbin.po
index bd77f4c205700a4675f6988e7e41405fc0404db5..440e5fd8b37799ae24b33705934a709ad6b8463e 100644
--- a/l10n/nqo/files_trashbin.po
+++ b/l10n/nqo/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/nqo/lib.po b/l10n/nqo/lib.po
index 44df77512c47307e20f2aaa6e2e7be29d4b50f7e..a20ad12f296627d2c5f165bad499dd02aafe2fd2 100644
--- a/l10n/nqo/lib.po
+++ b/l10n/nqo/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: nqo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/nqo/settings.po b/l10n/nqo/settings.po
index 57d51e389199718c2783c7ca82903630de2c5268..59ed5d59468fabbb4c7bb721cb5728a4124f3f70 100644
--- a/l10n/nqo/settings.po
+++ b/l10n/nqo/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/nqo/user_ldap.po b/l10n/nqo/user_ldap.po
index ea2c1a10a680277cdc8c2f39e37759db593a8e98..8136812f8a7980f98a4c2c0e4b47fe097b15285d 100644
--- a/l10n/nqo/user_ldap.po
+++ b/l10n/nqo/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,66 +90,94 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -218,10 +250,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -285,6 +330,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index db505501bd77b8482a2e1a3c62cc5051e41b79d8..33743af8ac5e766c9b83d45a9e1ebbd02cb70d05 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Dimenge"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Diluns"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Dimarç"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Dimecres"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Dijòus"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Divendres"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Dissabte"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "genièr"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "febrièr"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "març"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "junh"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "julhet"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "agost"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "septembre"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "octobre"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Novembre"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Decembre"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Configuracion"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Enregistra..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "segonda a"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "uèi"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "ièr"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "mes passat"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "an passat"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "ans a"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "CausÃs"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ã’c"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "CausÃs"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "D'accòrdi"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Annula"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr "Parteja"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Error"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Error al partejar"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Error al non partejar"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Error al cambiar permissions"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Parat per senhal"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Senhal"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Met la data d'expiracion"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Data d'expiracion"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Parteja tras corrièl :"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Deguns trobat"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "grop"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Tornar partejar es pas permis"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Pas partejador"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "pòt modificar"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "Contraròtle d'acces"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "crea"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "met a jorn"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "escafa"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "parteja"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Parat per senhal"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Error al metre de la data d'expiracion"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Error setting expiration date"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Crea un <strong>compte admin</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Senhal"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 61ba41a3c4c7379f31ff9ed3c837fbe3b065d946..4c8adf75dce0380d2128ad4859f405ba5e0841e7 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr "Un dorsièr temporari manca"
msgid "Failed to write to disk"
msgstr "L'escriptura sul disc a fracassat"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Fichièrs"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Amontcargar anullat."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo carga
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Parteja"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Torna nomenar"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Al esperar"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Error"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Nom"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Talha"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Modificat"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr "Talha maximum de dintrada per fichièrs ZIP"
msgid "Save"
msgstr "Enregistra"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "Nòu"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Fichièr de tèxte"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Dorsièr"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr " Anulla l'amontcargar"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Pas res dedins. Amontcarga qualquaren"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Avalcarga"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Escafa"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Amontcargament tròp gròs"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Los fiichièrs son a èsser explorats, "
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Exploracion en cors"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
index 75356e1c0443ee48d6761438265c82f3b5d3d466..10b03869650939ff01a6b35abb10dbc4f8cf4651 100644
--- a/l10n/oc/files_encryption.po
+++ b/l10n/oc/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index d237696694001e8fc7bb6b99969f44fa0af06e45..a5b84ff7249311666241fb09107e89dcc2546b5a 100644
--- a/l10n/oc/files_external.po
+++ b/l10n/oc/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:10+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index a59c0fca5742aee4e19953b511d7041a2e98897e..a3b34dc125b82b6dc8a7d31789b4ec0144a601fd 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "Senhal"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "Avalcarga"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index 61e5f8bd16b24fe12341fd2568f52e87b3cb0fad..507762d8c2a4e9d7b7a05c63c21dde640408977b 100644
--- a/l10n/oc/files_trashbin.po
+++ b/l10n/oc/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Error"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nom"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Escafa"
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index 2f98ab1f76d5fd0edce1109cb78e824ac10125e0..7afd95a3173076fa17d9e1e5db2e089f4b894ad3 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr "Services web jos ton contraròtle"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Avalcargar los ZIP es inactiu."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Los fichièrs devan èsser avalcargats un per un."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Torna cap als fichièrs"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 469dc4fbdb680a30ec7b6901d4850f94062e5cb0..6e72c72215558e01872afaf1d737d2102c16c1f6 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Corrièl enregistrat"
@@ -114,6 +124,16 @@ msgstr "Pas capable d'escafar un grop"
msgid "Unable to delete user"
msgstr "Pas capable d'escafar un usancièr"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Lengas cambiadas"
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "escafat"
@@ -265,8 +293,8 @@ msgstr "defar"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grops"
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__language_name__"
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Executa un prètfach amb cada pagina cargada"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Al partejar"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Activa API partejada"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Jornal"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Mai d'aquò"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr "Lenga"
msgid "Help translate"
msgstr "Ajuda a la revirada"
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index c7403807c876d166df4faa2ce2432014a550376c..6a2d80b77601bf1706b734cc2a3f9833fe94a445 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "Error"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Enregistra"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avançat"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/or_IN/core.po b/l10n/or_IN/core.po
index fedef0897a2f3902b818ba8f844d991d69b3775f..2262cbeaa04af3bc3548b330e0ef6c5b988f60e6 100644
--- a/l10n/or_IN/core.po
+++ b/l10n/or_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: or_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/or_IN/files.po b/l10n/or_IN/files.po
index 9761ac79114c91512f19b976bc6288b8910ddb53..01d76b1575f74919349c72a4ae6414d4cfd26267 100644
--- a/l10n/or_IN/files.po
+++ b/l10n/or_IN/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/or_IN/files_encryption.po b/l10n/or_IN/files_encryption.po
index 3de51d97c54cc3f36c11fdad3a637fc5cbcd9eb6..fc0ac2cadca440e9095aed5e45103ecf465bda12 100644
--- a/l10n/or_IN/files_encryption.po
+++ b/l10n/or_IN/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 22:46+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/or_IN/files_external.po b/l10n/or_IN/files_external.po
index 72973f8a94b7d108a44fda35e967d104f8a9ff69..d7c69ee3b9a5898cec1ead7bc3c851765474a407 100644
--- a/l10n/or_IN/files_external.po
+++ b/l10n/or_IN/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/or_IN/files_sharing.po b/l10n/or_IN/files_sharing.po
index 3d04a3f2478ccb6c49f9378e3120b96bb70abe68..760e08adf24297206bad234d818a39ad262adeaf 100644
--- a/l10n/or_IN/files_sharing.po
+++ b/l10n/or_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: or_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/or_IN/files_trashbin.po b/l10n/or_IN/files_trashbin.po
index efddff7ea5541bf6e4446a497eac06b80db0ab12..473760836479840cad605b67f8e848fba15efe60 100644
--- a/l10n/or_IN/files_trashbin.po
+++ b/l10n/or_IN/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 22:46+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
-msgid "Error"
-msgstr ""
-
-#: js/trash.js:62 templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
msgid "Restore"
msgstr ""
-#: js/trash.js:264
-msgid "Deleted Files"
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
msgstr ""
#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
diff --git a/l10n/or_IN/lib.po b/l10n/or_IN/lib.po
index 19063e130e42faee8cb55416fc3f72becb80ba56..e4fbb8c52a2781ddc335910a4ebce4d50b6330d3 100644
--- a/l10n/or_IN/lib.po
+++ b/l10n/or_IN/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: or_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/or_IN/settings.po b/l10n/or_IN/settings.po
index e3510389e2d4467cc04bce8da2176c9872c5d944..166965d2319262610eb4ef78c6916e487c28101b 100644
--- a/l10n/or_IN/settings.po
+++ b/l10n/or_IN/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/or_IN/user_ldap.po b/l10n/or_IN/user_ldap.po
index 8e1675057b344d4c1c02890c8e7699b892c3079f..f3ec3cae63139026938b8d3e1212ddade0369e48 100644
--- a/l10n/or_IN/user_ldap.po
+++ b/l10n/or_IN/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 22:46+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/pa/core.po b/l10n/pa/core.po
index 2de3d0bd4649d01b8c821427f84b32ae9fe0490b..906efacaac1f10b54a72974779399479a509c5a3 100644
--- a/l10n/pa/core.po
+++ b/l10n/pa/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: pa\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -59,207 +64,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "à¨à¨¤à¨µà¨¾à¨°"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "ਸੋਮਵਾਰ"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "ਮੰਗਲਵਾਰ"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "ਬà©à©±à¨§à¨µà¨¾à¨°"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "ਵੀਰਵਾਰ"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "ਸ਼à©à©±à¨•à¨°à¨µà¨¾à¨°"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "ਸ਼ਨਿੱਚਰਵਾਰ"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "ਜਨਵਰੀ"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "ਫਰਵਰੀ"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "ਮਾਰਚ"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "ਅਪਰੈ"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "ਮਈ"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "ਜੂਨ"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "ਜà©à¨²à¨¾à¨ˆ"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "ਅਗਸਤ"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "ਸਤੰਬ"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "ਅਕਤੂਬਰ"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "ਨਵੰਬ"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "ਦਸੰਬਰ"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "ਸੈਟਿੰਗ"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "...ਸੰà¨à¨¾à¨²à¨¿à¨† ਜਾ ਰਿਹਾ ਹੈ"
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "ਸਕਿੰਟ ਪਹਿਲਾਂ"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "ਅੱਜ"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "ਕੱਲà©à¨¹"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "ਪਿਛਲੇ ਮਹੀਨੇ"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "ਪਿਛਲੇ ਸਾਲ"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "ਚà©à¨£à©‹"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "ਹਾਂ"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "ਨਹੀਂ"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "ਚà©à¨£à©‹"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "ਠੀਕ ਹੈ"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "ਰੱਦ ਕਰੋ"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -291,140 +296,149 @@ msgstr ""
msgid "Share"
msgstr "ਸਾਂà¨à¨¾ ਕਰੋ"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "ਗਲ"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "ਪਾਸਵਰ"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "à¨à©‡à¨œà©‹"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "ਚੇਤਾਵਨੀ"
@@ -456,18 +470,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -668,6 +683,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "ਪਾਸਵਰ"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -793,7 +812,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/pa/files.po b/l10n/pa/files.po
index b93cb7f09802b62971cd42dbca4edc35b1d33865..2f7c9ec8197eb87dd227c2d9bf1ebc33369e9907 100644
--- a/l10n/pa/files.po
+++ b/l10n/pa/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "ਫਾਇਲਾਂ"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "ਸਾਂà¨à¨¾ ਕਰੋ"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "ਨਾਂ ਬਦਲੋ"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "ਗਲਤੀ"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "ਡਾਊਨਲੋਡ"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "ਹਟਾਓ"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/pa/files_encryption.po b/l10n/pa/files_encryption.po
index 078a3d3183c99726273be05522adeadb86f5ee37..2adfb595ca217b0ccac1f5b99bcf496938a3e1f8 100644
--- a/l10n/pa/files_encryption.po
+++ b/l10n/pa/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/pa/files_external.po b/l10n/pa/files_external.po
index 66a3b40acf1d6c2bc5be663f8ed347953416cfc3..e1bedd6479cd9d0494b98afc2cc9d4eea62e29a3 100644
--- a/l10n/pa/files_external.po
+++ b/l10n/pa/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/pa/files_sharing.po b/l10n/pa/files_sharing.po
index fccb1b02ec6665279131b296fd3a9336bf37f75e..3dde06cf4983cc1feb3f958c784cdbe126fce5b9 100644
--- a/l10n/pa/files_sharing.po
+++ b/l10n/pa/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: pa\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "ਪਾਸਵਰ"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "ਡਾਊਨਲੋਡ"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/pa/files_trashbin.po b/l10n/pa/files_trashbin.po
index 4ab7cac41e5b234427c3c172c5758b1657091548..4387e8432410b5a330c9f11d336cecccbea59e2b 100644
--- a/l10n/pa/files_trashbin.po
+++ b/l10n/pa/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "ਗਲਤੀ"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "ਹਟਾਓ"
diff --git a/l10n/pa/lib.po b/l10n/pa/lib.po
index 54b06e1d396d777d77e0a69cf13e5df0e84248f7..4901b5f88db80c10474f5b28c6e65e7d2c69c469 100644
--- a/l10n/pa/lib.po
+++ b/l10n/pa/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: pa\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/pa/settings.po b/l10n/pa/settings.po
index 62937ff7f60dc5f5f6f5def172151d236db0de89..8bd1d8f2f23b0ed56a740777b536ea09e4865caa 100644
--- a/l10n/pa/settings.po
+++ b/l10n/pa/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -99,6 +99,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -115,6 +125,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "à¨à¨¾à¨¶à¨¾ ਬਦਲੀ"
@@ -170,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -226,34 +246,42 @@ msgstr ""
msgid "Updated"
msgstr "ਅੱਪਡੇਟ ਕੀਤਾ"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "ਹਟਾਈ"
@@ -266,8 +294,8 @@ msgstr "ਵਾਪਸ"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "ਗਰà©à©±à¨ª"
@@ -299,7 +327,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__à¨à¨¾à¨¶à¨¾_ਨਾਂ__"
@@ -367,7 +395,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "ਸੈਟਅੱਪ ਚੇਤਾਵਨੀ"
@@ -382,53 +410,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -437,198 +477,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "ਸਰਵਰ à¨à¨¡à¨°à©ˆà¨¸"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,27 +829,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/pa/user_ldap.po b/l10n/pa/user_ldap.po
index 4054753ff7ac76bd8f7880fe7cf33cc0edf92586..119f335330acf7152ffdcde9070eba381a9cde73 100644
--- a/l10n/pa/user_ldap.po
+++ b/l10n/pa/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "ਗਲਤੀ"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 4b8db80a3201988c6f059f8b0d9b8c3d4b3b3d0a..39c646cd4cabdf7c7cd0062f76e29e717e6b0958 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ 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"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "Data wygaśnięcia jest w przeszłości"
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Nie można było wysłać wiadomości do następujących użytkowników: %s"
@@ -42,6 +42,11 @@ msgstr "Wyłączony tryb konserwacji"
msgid "Updated database"
msgstr "Zaktualizuj bazÄ™"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Brak obrazu lub pliku dostarczonego"
@@ -62,212 +67,212 @@ msgstr "Brak obrazka profilu tymczasowego, spróbuj ponownie"
msgid "No crop data provided"
msgstr "Brak danych do przycięcia"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Niedziela"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Poniedziałek"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Wtorek"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Åšroda"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Czwartek"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "PiÄ…tek"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sobota"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Styczeń"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Luty"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marzec"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Kwiecień"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Czerwiec"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Lipiec"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Sierpień"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Wrzesień"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Październik"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Listopad"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Grudzień"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Ustawienia"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Zapisywanie..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "sekund temu"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minute temu"
msgstr[1] "%n minut temu"
msgstr[2] "%n minut temu"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n godzine temu"
msgstr[1] "%n godzin temu"
msgstr[2] "%n godzin temu"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "dziÅ›"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "wczoraj"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dzień temu"
msgstr[1] "%n dni temu"
msgstr[2] "%n dni temu"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "w zeszłym miesiącu"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n miesiÄ…c temu"
msgstr[1] "%n miesięcy temu"
msgstr[2] "%n miesięcy temu"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "w zeszłym roku"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "lat temu"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Wybierz"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "BÅ‚Ä…d podczas Å‚adowania pliku wybranego szablonu: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Tak"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nie"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Wybierz"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "BÅ‚Ä…d podczas Å‚adowania pliku wybranego szablonu: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Błąd podczas ładowania szablonu wiadomości: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
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:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Konflikt pliku"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nowe pliki"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Już istniejące pliki"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Które pliki chcesz zachować?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Jeśli wybierzesz obie wersje, skopiowany plik będzie miał dodany numerek w nazwie"
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Anuluj"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Kontynuuj "
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(wszystkie zaznaczone)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} zaznaczonych)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "BÅ‚Ä…d podczas Å‚adowania szablonu istniejÄ…cego pliku"
@@ -299,140 +304,149 @@ msgstr "Udostępniono"
msgid "Share"
msgstr "Udostępnij"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "BÅ‚Ä…d"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Błąd podczas współdzielenia"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Błąd podczas zatrzymywania współdzielenia"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Błąd przy zmianie uprawnień"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Udostępnione tobie i grupie {group} przez {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Udostępnione tobie przez {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "Współdziel z użytkownikiem lub grupą ..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Udostępnij link"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia"
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr "Domyślnie link publiczny wygaśnie po {days} dniach"
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Zabezpiecz hasłem"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Hasło"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr "Wybierz hasło dla linku publicznego"
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Pozwól na publiczne wczytywanie"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Wyślij osobie odnośnik poprzez e-mail"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Wyślij"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Ustaw datę wygaśnięcia"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Data wygaśnięcia"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Współdziel poprzez e-mail:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Nie znaleziono ludzi"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "grupa"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Współdzielenie nie jest możliwe"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Współdzielone w {item} z {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Zatrzymaj współdzielenie"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "powiadom przez emaila"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "może edytować"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "kontrola dostępu"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "utwórz"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "uaktualnij"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "usuń"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "współdziel"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Zabezpieczone hasłem"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Błąd podczas usuwania daty wygaśnięcia"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Błąd podczas ustawiania daty wygaśnięcia"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Wysyłanie..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "E-mail wysłany"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Ostrzeżenie"
@@ -464,18 +478,19 @@ msgstr "BÅ‚Ä…d podczas Å‚adowania szablonu dialogu: {error}"
msgid "No tags selected for deletion."
msgstr "Nie zaznaczono tagów do usunięcia."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Proszę przeładować stronę"
-#: 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 "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">spoleczności ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud."
@@ -676,6 +691,10 @@ msgstr "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoz
msgid "Create an <strong>admin account</strong>"
msgstr "Utwórz <strong>konta administratora</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Hasło"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Zasoby dysku & baza danych"
@@ -801,8 +820,27 @@ msgstr "Dziękuję za cierpliwość."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Aktualizowanie ownCloud do wersji %s. Może to trochę potrwać."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index e98cc9873b460fcd1b150601a10dfb5f55aa0ad0..e62b66493e410597bad4d28c5f0bd7010b663309 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-04 05:52+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-27 07:01+0000\n"
"Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr "Nie można było przenieść %s - Plik o takiej nazwie już istnieje"
msgid "Could not move %s"
msgstr "Nie można było przenieść %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Nazwa pliku nie może być pusta."
@@ -42,18 +42,18 @@ msgstr "Nazwa pliku nie może być pusta."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" jest nieprawidłową nazwą pliku."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "Folder docelowy został przeniesiony lub usunięty"
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -129,44 +129,48 @@ msgstr "Brak folderu tymczasowego"
msgid "Failed to write to disk"
msgstr "BÅ‚Ä…d zapisu na dysk"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Za mało dostępnego miejsca"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Nieudane przesłanie. Nie można znaleźć przesyłanego pliku"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Nieudane przesłanie. Nie można pobrać informacji o pliku."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Zła ścieżka."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Pliki"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Wszystkie pliki"
+
+#: js/file-upload.js:257
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:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "Całkowity rozmiar {size1} przekracza limit uploadu {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Brak wolnej przestrzeni, przesyłasz {size1} a pozostało tylko {size2}"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Wczytywanie anulowane."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Nie można uzyskać wyniku z serwera."
@@ -179,123 +183,123 @@ msgstr "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie z
msgid "URL cannot be empty"
msgstr "URL nie może być pusty"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1170
msgid "{new_name} already exists"
msgstr "{new_name} już istnieje"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Nie można utworzyć pliku"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Nie można utworzyć folderu"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "BÅ‚Ä…d przy pobieraniu adresu URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Udostępnij"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Trwale usuń"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Zmień nazwę"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:596 js/filelist.js:1665
msgid "Pending"
msgstr "OczekujÄ…ce"
-#: js/filelist.js:916
+#: js/filelist.js:1121
msgid "Error moving file."
msgstr "BÅ‚Ä…d podczas przenoszenia pliku."
-#: js/filelist.js:924
+#: js/filelist.js:1129
msgid "Error moving file"
msgstr "BÅ‚Ä…d prz przenoszeniu pliku"
-#: js/filelist.js:924
+#: js/filelist.js:1129
msgid "Error"
msgstr "BÅ‚Ä…d"
-#: js/filelist.js:988
+#: js/filelist.js:1207
msgid "Could not rename file"
msgstr "Nie można zmienić nazwy pliku"
-#: js/filelist.js:1122
+#: js/filelist.js:1328
msgid "Error deleting file."
msgstr "BÅ‚Ä…d podczas usuwania pliku"
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1431 templates/list.php:62
msgid "Name"
msgstr "Nazwa"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1432 templates/list.php:75
msgid "Size"
msgstr "Rozmiar"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1433 templates/list.php:78
msgid "Modified"
msgstr "Modyfikacja"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1443 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n katalog"
msgstr[1] "%n katalogi"
msgstr[2] "%n katalogów"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1449 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n plik"
msgstr[1] "%n pliki"
msgstr[2] "%n plików"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1573 js/filelist.js:1612
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Wysyłanie %n pliku"
msgstr[1] "Wysyłanie %n plików"
msgstr[2] "Wysyłanie %n plików"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" jest nieprawidłową nazwą pliku."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Twój magazyn jest prawie pełny ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie."
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz. Można zaktualizować hasło klucza prywatnego w ustawieniach osobistych w celu odzyskania dostępu do plików"
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -305,12 +309,12 @@ msgstr "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Prze
msgid "{dirs} and {files}"
msgstr "{dirs} i {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s nie można zmienić nazwy"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Wysyłka (max. %s)"
@@ -347,68 +351,75 @@ msgstr "Maksymalna wielkość pliku wejściowego ZIP "
msgid "Save"
msgstr "Zapisz"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Użyj tego adresu do <a href=\"%s\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Nowy"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Nowy plik tekstowy"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Plik tekstowy"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Nowy folder"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Folder"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Z odnośnika"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Pliki usunięte"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Anuluj wysyłanie"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Nie masz uprawnień do wczytywania lub tworzenia plików w tym miejscu"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Pusto. Wyślij coś!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Pobierz"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Usuń"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Åadowany plik jest za duży"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Skanowanie plików, proszę czekać."
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr "Aktualnie skanowane"
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index 355b5601c15cfc5467775ce2c243a9a3066db4bf..fb8688cfeb0b10994f4d870f4795c282190dc24a 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 07:10+0000\n"
-"Last-Translator: maxxx <maxxxrally@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -79,9 +79,9 @@ msgstr "Nie można odszyfrować tego pliku, prawdopodobnie jest to plik udostęp
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Nieznany błąd proszę sprawdzić ustawienia systemu lub skontaktuj się z administratorem"
+msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "Proszę upewnić się, że PHP 5.3.3 lub nowszy jest zainstalowany i że OpenSSL oraz rozszerzenie PHP jest włączone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostało wyłączone."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:"
@@ -114,91 +114,91 @@ msgstr "Przejdź bezpośrednio do"
msgid "personal settings"
msgstr "Ustawienia osobiste"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Szyfrowanie"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Włączhasło klucza odzyskiwania (pozwala odzyskać pliki użytkowników w przypadku utraty hasła):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Hasło klucza odzyskiwania"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Powtórz hasło klucza odzyskiwania"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "WÅ‚Ä…czone"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Wyłączone"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Zmień hasło klucza odzyskiwania"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Stare hasło klucza odzyskiwania"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Nowe hasło klucza odzyskiwania"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Powtórz nowe hasło klucza odzyskiwania"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Zmień hasło"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Hasło klucza prywatnego nie pasuje do hasła logowania:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Podaj swoje stare prywatne hasło aby ustawić nowe"
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Stare hasło logowania"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Bieżące hasło logowania"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Aktualizacja hasła klucza prywatnego"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Włącz hasło odzyskiwania:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Ustawienia odzyskiwania plików zmienione"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Nie można zmienić pliku odzyskiwania"
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index d24253f606e8683c3a8b7d1200b0223a79a93b41..e29cefde2a7fb00e7886391059a0d763fca973d8 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-04 05:50+0000\n"
-"Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: I Robot\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"
@@ -84,9 +84,9 @@ msgid "App secret"
msgstr "Hasło aplikacji"
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Host"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -167,6 +167,10 @@ msgstr "SMB / CIFS przy użyciu loginu OC"
msgid "Username as share"
msgstr "Użytkownik jako zasób"
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr "Bezpieczny https://"
@@ -199,29 +203,29 @@ msgstr "Wystąpił błąd podczas konfigurowania zasobu Google Drive"
msgid "Saved"
msgstr "Zapisano"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr "<b>Uwaga:</b> "
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr "oraz"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Uwaga:</b> Wsparcie dla cURL w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go."
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Uwaga:</b> Wsparcie dla FTP w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go."
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index e87dd22a17cfb6cc776a18bda5e989cbfc19154c..b197608dced07ae9cd920cca4191deb52107342a 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,34 @@ 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"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Udostępnione przez {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Udział ten jest chroniony hasłem"
@@ -35,6 +59,14 @@ msgstr "To hasło jest niewłaściwe. Spróbuj ponownie."
msgid "Password"
msgstr "Hasło"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Przepraszamy ale wygląda na to, że ten link już nie działa."
@@ -63,11 +95,11 @@ msgstr "Aby uzyskać więcej informacji proszę poprosić osobę, która wysła
msgid "Download"
msgstr "Pobierz"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Pobierz %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Bezpośredni link"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index 894e1002d1265eb9f111951a290f041b7d71807e..2be8c3f58b8df1e26437ab48cf3a20b6e1671b0c 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "Nie można trwale usunąć %s"
msgid "Couldn't restore %s"
msgstr "Nie można przywrócić %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Pliki usunięte"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Przywróć"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "BÅ‚Ä…d"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Usunięte pliki"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "przywrócony"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Nic tu nie ma. Twój kosz jest pusty!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nazwa"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Przywróć"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Usunięte"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Usuń"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index 0ad6b2f07027bddeaf9d8f19df562abaa0169aaf..c9014dcff5e56a5869cf662e846b78c95f9c0777 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -4,14 +4,15 @@
#
# Translators:
# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
+# hoek <hoek@hoek.pl>, 2014
# bobie <maciej.przybecki@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 12:20+0000\n"
-"Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:47+0000\n"
+"Last-Translator: hoek <hoek@hoek.pl>\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"
@@ -19,11 +20,11 @@ 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"
-#: base.php:712
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr "Dostajesz siÄ™ do serwera z niezaufanej domeny."
-#: base.php:713
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -78,23 +79,23 @@ msgstr "Błędne zdjęcie"
msgid "web services under your control"
msgstr "Kontrolowane serwisy"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Pobieranie ZIP jest wyłączone."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Pliki muszą zostać pobrane pojedynczo."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Wróć do plików"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Wybrane pliki są zbyt duże, aby wygenerować plik zip."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -291,116 +292,127 @@ 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>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s Współdzielone »%s« z tobą"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr "Wspóldzielenie %s nie powiodło się. ponieważ plik nie istnieje"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Nie masz uprawnień aby udostępnić %s"
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s jest właścicielem elementu"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s nie istnieje"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s nie jest członkiem żadnej grupy której członkiem jest %s"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "Współdzielenie %s nie powiodło się, ponieważ element jest już współdzielony z %s"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "Współdzielenie %s nie powiodło się, ponieważ grupa %s nie istnieje"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "Współdzielenie %s nie powiodło się, ponieważ %s nie jest członkiem grupy %s"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Musisz zapewnić hasło aby utworzyć link publiczny, dozwolone są tylko linki chronione"
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "Współdzielenie %s nie powiodło się, ponieważ współdzielenie z linkami nie jest dozwolone"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr "Typ udziału %s nie jest właściwy dla %s"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr "Ustawienie uprawnień dla %s nie powiodło się, ponieważ uprawnienia wykraczają poza przydzielone %s"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "Ustawienie uprawnień dla %s nie powiodło się, ponieważ element nie został znaleziony"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr "Zaplecze do współdzielenia %s musi implementować interfejs OCP\\Share_Backend"
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr "Zaplecze %s do współdzielenia nie zostało znalezione"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr "Zaplecze do współdzielenia %s nie zostało znalezione"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s jest udostępniającym"
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr "Współdzielenie %s nie powiodło się, ponieważ uprawnienia przekraczają te udzielone %s"
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr "Współdzielenie %s nie powiodło się, ponieważ ponowne współdzielenie nie jest dozwolone"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr "Współdzielenie %s nie powiodło się, ponieważ zaplecze współdzielenia dla %s nie mogło znaleźć jego źródła"
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr "Współdzielenie %s nie powiodło się, ponieważ plik nie może zostać odnaleziony w buforze plików"
-#: private/tags.php:193
+#: private/tags.php:183
#, 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 3dc0a8605180dfac371cd6be2dbe1d64ea994d57..8c5efba7c3739f31779df00b604bfc4459c9b59c 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -4,15 +4,16 @@
#
# Translators:
# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013-2014
+# hoek <hoek@hoek.pl>, 2014
# bobie <maciej.przybecki@gmail.com>, 2014
# adbrand <pkwiecin@adbrand.pl>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -50,15 +51,15 @@ msgstr "E-mail wysłany"
msgid "You need to set your user email before being able to send test emails."
msgstr "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Tryb wysyłki"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Szyfrowanie"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Metoda autentykacji"
@@ -101,6 +102,16 @@ msgstr "Nie można zdeszyfrować Twoich plików, proszę sprawdzić owncloud.log
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbuj ponownie"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Klucze szyfrujące zostały trwale usunięte"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Nie można trwale usunąć Twoich kluczy szyfrujących, proszę sprawdź owncloud.log lub zapytaj administratora"
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "E-mail zapisany"
@@ -117,6 +128,16 @@ msgstr "Nie można usunąć grupy"
msgid "Unable to delete user"
msgstr "Nie można usunąć użytkownika"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Archiwum zostało prawidłowo przywrócone"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Nie można przywrócić kluczy szyfrujących, proszę sprawdzić owncloud.log lub zapytać administratora"
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Zmieniono język"
@@ -172,7 +193,7 @@ msgstr "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownik
msgid "Unable to change password"
msgstr "Nie można zmienić hasła"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Wysyłam..."
@@ -228,34 +249,42 @@ msgstr "Aktualizuj"
msgid "Updated"
msgstr "Zaktualizowano"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Wybierz zdjęcie profilu"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Bardzo słabe hasło"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Słabe hasło"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Mało skomplikowane hasło"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Dobre hasło"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Mocne hasło"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Usuń trwale klucze szyfrujące."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Przywróć klucze szyfrujące."
+
#: js/users.js:47
msgid "deleted"
msgstr "usunięto"
@@ -268,8 +297,8 @@ msgstr "cofnij"
msgid "Unable to remove user"
msgstr "Nie można usunąć użytkownika"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupy"
@@ -301,7 +330,7 @@ msgstr "Należy podać prawidłowe hasło"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Ostrzeżenie: Katalog domowy dla użytkownika \"{user}\" już istnieje"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "polski"
@@ -369,7 +398,7 @@ msgid ""
"root."
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:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Ostrzeżenia konfiguracji"
@@ -384,53 +413,65 @@ msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożl
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "Proszę sprawdź ponownie <a href=\"%s\">przewodnik instalacji</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Brak moduÅ‚u „fileinfoâ€"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "Brak moduÅ‚u PHP „fileinfoâ€. Zalecamy wÅ‚Ä…czenie tego moduÅ‚u, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Twoja wersja PHP jest za stara"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Twoja wersja PHP jest za stara. Rekomendujemy przynajmniej wersje 5.3.8. Jeśli masz starsza wersję ownCloud może nie działać poprawnie."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Lokalizacja nie działa"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Ustawienia regionalne systemu nie można ustawić na jeden, który obsługuje UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Oznacza to, że mogą być problemy z niektórymi znakami w nazwach plików."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Zalecamy, aby zainstalować wymagane pakiety w systemie, jeden z następujących języków: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Połączenie internetowe nie działa"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -439,198 +480,206 @@ msgid ""
"internet connection for this server if you want to have all features."
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:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "Ostatni cron był uruchomiony %s."
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "Ostatni cron był uruchomiony %s. To jest więcej niż godzinę temu, wygląda na to, że coś jest nie tak."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "Cron nie został jeszcze uruchomiony!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Wykonuj jedno zadanie wraz z każdą wczytaną stroną"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Użyj systemowego cron-a do uruchamiania cron.php raz na 15 minut."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Udostępnianie"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Włącz API udostępniania"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Zezwalaj aplikacjom na korzystanie z API udostępniania"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Zezwalaj na odnośniki"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr "Wymuś zabezpieczenie hasłem"
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Pozwól na publiczne wczytywanie"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Użytkownicy mogą włączyć dla innych wgrywanie do ich publicznych katalogów"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "Ustaw domyślną datę wygaśnięcia"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "WygaÅ› po"
-#: templates/admin.php:235
+#: templates/admin.php:250
+msgid "days"
+msgstr "dniach"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Wymuś datę wygaśnięcia"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Zezwalaj na ponowne udostępnianie"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Zezwalaj użytkownikom na współdzielenie z kimkolwiek"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Pozwól na mailowe powiadomienia"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr "Ustaw domyślną datę wygaśnięcia"
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "WygaÅ› po"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr "Wyklucz grupy z udostępniania"
-#: templates/admin.php:266
-msgid "days"
-msgstr "dniach"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr "Wymuś datę wygaśnięcia"
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Wygaś udziały domyślnie po N dniach"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania."
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Bezpieczeństwo"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "WymuÅ› HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
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:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Serwer pocztowy"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "To jest używane do wysyłania powiadomień"
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Z adresu"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Wymagana autoryzacja"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Adres Serwera"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Port"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Poświadczenia"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "Użytkownik SMTP"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "Hasło SMTP"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Ustawienia testowej wiadomości"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Wyślij email"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Logi"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Poziom logów"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Więcej"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Mniej"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Wersja"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -783,29 +832,33 @@ msgstr "Język"
msgid "Help translate"
msgstr "Pomóż w tłumaczeniu"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Użyj tego adresu do <a href=\"%s\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Hasło logowania"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Odszyfruj wszystkie pliki"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Twoje klucze szyfrujące zostały przeniesione do lokalizacji archialnej. Jeśli coś poszło nie tak, możesz je przywrócić. Usuń je trwale tylko, gdy jesteś pewien(na), że wszystkie pliki zostały prawidłowo zdeszyfrowane."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Przywróć klucze szyfrujące"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Usuń klucze szyfrujące"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Login"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 2f3583fa73bbff6d55d8b949ade6eb133878c3df..61516b753ac627814418b93077cf24ad0b81adf4 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -75,6 +75,10 @@ msgstr "Przejmij ustawienia z ostatnich konfiguracji serwera?"
msgid "Keep settings?"
msgstr "Zachować ustawienia?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Serwer"
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Nie można dodać konfiguracji serwera"
@@ -91,6 +95,18 @@ msgstr "Sukces"
msgid "Error"
msgstr "BÅ‚Ä…d"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Konfiguracja poprawna"
@@ -131,7 +147,7 @@ msgstr "Czy chcesz usunąć bieżącą konfigurację serwera?"
msgid "Confirm Deletion"
msgstr "Potwierdź usunięcie"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -139,7 +155,7 @@ msgstr[0] "%s znaleziona grupa"
msgstr[1] "%s znalezionych grup"
msgstr[2] "%s znalezionych grup"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -147,14 +163,30 @@ msgstr[0] "%s znaleziony użytkownik"
msgstr[1] "%s znalezionych użytkowników"
msgstr[2] "%s znalezionych użytkowników"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Niepoprawny Host"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Nie można znaleźć żądanej funkcji"
+#: settings.php:52
+msgid "Server"
+msgstr "Serwer"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Filtr użytkownika"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Filtr logowania"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Grupa filtrów"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Zapisz"
@@ -227,10 +259,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "Określa jakiego filtru użyć podczas próby zalogowania. %%uid zastępuje nazwę użytkownika w procesie logowania. Przykład: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Serwer"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Serwer:"
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Dodaj konfiguracjÄ™ servera"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Usuń konfigurację"
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Host"
@@ -294,6 +339,14 @@ msgstr "Wróć"
msgid "Continue"
msgstr "Kontynuuj "
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Ekspert"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Zaawansowane"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 66acbaea8a8128ca0e7b9abbf4e4465ea1562150..92516128e24fa6e1526d6fb373247792e1b5e982 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 09:12+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"
@@ -19,11 +19,11 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "A data de vencimento passou."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Não foi possÃvel enviar e-mail para os seguintes usuários: %s"
@@ -40,6 +40,11 @@ msgstr "Desligar o modo de manutenção"
msgid "Updated database"
msgstr "Atualizar o banco de dados"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr "Desabilitar aplicativos incompatÃveis : %s"
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Nenhuma imagem ou arquivo fornecido"
@@ -60,207 +65,207 @@ msgstr "Sem imagem no perfil temporário disponÃvel, tente novamente"
msgid "No crop data provided"
msgstr "Nenhum dado para coleta foi fornecido"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Domingo"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Segunda-feira"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Terça-feira"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Quarta-feira"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Quinta-feira"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Sexta-feira"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sábado"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "janeiro"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "fevereiro"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "março"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "maio"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "junho"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "julho"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "agosto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "setembro"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "outubro"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "novembro"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "dezembro"
-#: js/js.js:483
+#: js/js.js:496
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:583
+#: js/js.js:596
msgid "Saving..."
msgstr "Salvando..."
-#: js/js.js:1240
+#: js/js.js:1220
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:1241
+#: js/js.js:1221
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] " ha %n minuto"
msgstr[1] "ha %n minutos"
-#: js/js.js:1242
+#: js/js.js:1222
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "ha %n hora"
msgstr[1] "ha %n horas"
-#: js/js.js:1243
+#: js/js.js:1223
msgid "today"
msgstr "hoje"
-#: js/js.js:1244
+#: js/js.js:1224
msgid "yesterday"
msgstr "ontem"
-#: js/js.js:1245
+#: js/js.js:1225
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "ha %n dia"
msgstr[1] "ha %n dias"
-#: js/js.js:1246
+#: js/js.js:1226
msgid "last month"
msgstr "último mês"
-#: js/js.js:1247
+#: js/js.js:1227
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "ha %n mês"
msgstr[1] "ha %n meses"
-#: js/js.js:1248
+#: js/js.js:1228
msgid "last year"
msgstr "último ano"
-#: js/js.js:1249
+#: js/js.js:1229
msgid "years ago"
msgstr "anos atrás"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Escolha"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Erro no seletor de carregamento modelo de arquivos: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Sim"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Não"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Escolha"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Erro no seletor de carregamento modelo de arquivos: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Erro no carregamento de modelo de mensagem: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
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:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Conflito em um arquivo"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Novos Arquivos"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Arquivos já existentes"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Qual arquivo você quer manter?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
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:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(todos os selecionados)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} selecionados)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Erro ao carregar arquivo existe modelo"
@@ -284,148 +289,157 @@ msgstr "Boa senha"
msgid "Strong password"
msgstr "Senha forte"
-#: js/share.js:51 js/share.js:66 js/share.js:106
+#: js/share.js:69 js/share.js:84 js/share.js:127
msgid "Shared"
msgstr "Compartilhados"
-#: js/share.js:109
+#: js/share.js:130
msgid "Share"
msgstr "Compartilhar"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:195 js/share.js:208 js/share.js:215 js/share.js:822
#: templates/installation.php:10
msgid "Error"
msgstr "Erro"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:197 js/share.js:885
msgid "Error while sharing"
msgstr "Erro ao compartilhar"
-#: js/share.js:171
+#: js/share.js:208
msgid "Error while unsharing"
msgstr "Erro ao descompartilhar"
-#: js/share.js:178
+#: js/share.js:215
msgid "Error while changing permissions"
msgstr "Erro ao mudar permissões"
-#: js/share.js:188
+#: js/share.js:225
msgid "Shared with you and the group {group} by {owner}"
msgstr "Compartilhado com você e com o grupo {group} por {owner}"
-#: js/share.js:190
+#: js/share.js:227
msgid "Shared with you by {owner}"
msgstr "Compartilhado com você por {owner}"
-#: js/share.js:214
+#: js/share.js:251
msgid "Share with user or group …"
msgstr "Compartilhar com usuário ou grupo ..."
-#: js/share.js:220
+#: js/share.js:257
msgid "Share link"
msgstr "Compartilher link"
-#: js/share.js:223
+#: js/share.js:263
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "O link público irá expirar não antes de {days} depois de ser criado"
+
+#: js/share.js:265
+msgid "By default the public link will expire after {days} days"
+msgstr "Por padrão o link público irá expirar após {days} dias"
+
+#: js/share.js:270
msgid "Password protect"
msgstr "Proteger com senha"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Senha"
+#: js/share.js:272
+msgid "Choose a password for the public link"
+msgstr "Escolha uma senha para o link público"
-#: js/share.js:230
+#: js/share.js:278
msgid "Allow Public Upload"
msgstr "Permitir upload público"
-#: js/share.js:234
+#: js/share.js:282
msgid "Email link to person"
msgstr "Enviar link por e-mail"
-#: js/share.js:235
+#: js/share.js:283
msgid "Send"
msgstr "Enviar"
-#: js/share.js:240
+#: js/share.js:288
msgid "Set expiration date"
msgstr "Definir data de expiração"
-#: js/share.js:241
+#: js/share.js:289
msgid "Expiration date"
msgstr "Data de expiração"
-#: js/share.js:277
+#: js/share.js:326
msgid "Share via email:"
msgstr "Compartilhar via e-mail:"
-#: js/share.js:280
+#: js/share.js:329
msgid "No people found"
msgstr "Nenhuma pessoa encontrada"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:377 js/share.js:438
msgid "group"
msgstr "grupo"
-#: js/share.js:357
+#: js/share.js:410
msgid "Resharing is not allowed"
msgstr "Não é permitido re-compartilhar"
-#: js/share.js:401
+#: js/share.js:454
msgid "Shared in {item} with {user}"
msgstr "Compartilhado em {item} com {user}"
-#: js/share.js:423
+#: js/share.js:476
msgid "Unshare"
msgstr "Descompartilhar"
-#: js/share.js:431
+#: js/share.js:484
msgid "notify by email"
msgstr "notificar por e-mail"
-#: js/share.js:434
+#: js/share.js:487
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:436
+#: js/share.js:489
msgid "access control"
msgstr "controle de acesso"
-#: js/share.js:439
+#: js/share.js:492
msgid "create"
msgstr "criar"
-#: js/share.js:442
+#: js/share.js:495
msgid "update"
msgstr "atualizar"
-#: js/share.js:445
+#: js/share.js:498
msgid "delete"
msgstr "remover"
-#: js/share.js:448
+#: js/share.js:501
msgid "share"
msgstr "compartilhar"
-#: js/share.js:721
+#: js/share.js:803
msgid "Password protected"
msgstr "Protegido com senha"
-#: js/share.js:734
+#: js/share.js:822
msgid "Error unsetting expiration date"
msgstr "Erro ao remover data de expiração"
-#: js/share.js:752
+#: js/share.js:843
msgid "Error setting expiration date"
msgstr "Erro ao definir data de expiração"
-#: js/share.js:777
+#: js/share.js:872
msgid "Sending ..."
msgstr "Enviando ..."
-#: js/share.js:788
+#: js/share.js:883
msgid "Email sent"
msgstr "E-mail enviado"
-#: js/share.js:812
+#: js/share.js:907
msgid "Warning"
msgstr "Aviso"
@@ -457,18 +471,19 @@ msgstr "Erro carregando diálogo de formatação:{error}"
msgid "No tags selected for deletion."
msgstr "Nenhuma etiqueta selecionada para deleção."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr "Atualizando {productName} para a versão {version}, isso pode demorar um pouco."
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Por favor recarregue a página"
-#: 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 "A atualização falhou. Por favor, relate este problema para a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr "A atualização não foi bem sucedida."
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A atualização teve êxito. Você será redirecionado ao ownCloud agora."
@@ -669,6 +684,10 @@ msgstr "Para obter informações sobre como configurar corretamente o seu servid
msgid "Create an <strong>admin account</strong>"
msgstr "Criar uma <strong>conta de administrador</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Senha"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Armazenamento & banco de dados"
@@ -794,8 +813,27 @@ msgstr "Obrigado pela sua paciência."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Atualizando ownCloud para a versão %s, isto pode levar algum tempo."
+msgid "%s will be updated to version %s."
+msgstr "%s será atualizado para a versão %s."
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr "Os seguintes aplicativos serão desativados:"
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr "O tema %s foi desativado."
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr "Por favor, certifique-se de que o banco de dados, a pasta config e a pasta de dados foram copiados antes de prosseguir."
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr "Iniciar atualização"
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index ff16821a7b6282f86c66093bf3a09c247dd1e485..844eecf10c1dfbf041534731bc77e2b37673f5b2 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# André Marcelo Alvarenga <alvarenga@kde.org>, 2014
# bjamalaro <bjamalaro@yahoo.com.br>, 2013
# Flávio Veras <flaviove@gmail.com>, 2013-2014
# tuliouel, 2013
@@ -10,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 13:41+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"
@@ -23,14 +24,14 @@ msgstr ""
#: ajax/move.php:15
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr "ImpossÃvel mover %s - Um arquivo com este nome já existe"
+msgstr "ImpossÃvel mover %s - Já existe um arquivo com esse nome"
#: ajax/move.php:25 ajax/move.php:28
#, php-format
msgid "Could not move %s"
msgstr "ImpossÃvel mover %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "O nome do arquivo não pode estar vazio."
@@ -39,18 +40,18 @@ msgstr "O nome do arquivo não pode estar vazio."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" é um nome de arquivo inválido."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "A pasta de destino foi movida ou excluÃda."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -64,7 +65,7 @@ msgstr "Não é uma fonte válida"
#: ajax/newfile.php:102
msgid ""
"Server is not allowed to open URLs, please check the server configuration"
-msgstr "Não é permitido ao servidor abrir URLs, por favor verificar a configuração do servidor."
+msgstr "O servidor não tem permissão para abrir URLs. Por favor, verifique a configuração do servidor."
#: ajax/newfile.php:118
#, php-format
@@ -126,44 +127,48 @@ msgstr "Pasta temporária não encontrada"
msgid "Failed to write to disk"
msgstr "Falha ao escrever no disco"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Espaço de armazenamento insuficiente"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Falha no envio. Não foi possÃvel encontrar o arquivo enviado"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
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:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Diretório inválido."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Arquivos"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Todos os arquivos"
+
+#: js/file-upload.js:257
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:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr "Tamanho total do arquivo {size1} excede limite de envio {size2}"
+msgstr "O tamanho total do arquivo {size1} excede o limite de envio {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Não há espaço suficiente, você está enviando {size1} mas resta apenas {size2}"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Envio cancelado."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Não foi possÃvel obter o resultado do servidor."
@@ -176,120 +181,120 @@ msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do
msgid "URL cannot be empty"
msgstr "URL não pode estar vazia"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} já existe"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Não foi possÃvel criar o arquivo"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Não foi possÃvel criar a pasta"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Erro ao buscar URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Compartilhar"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Excluir permanentemente"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Renomear"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Pendente"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr "Erro movendo o arquivo."
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Erro movendo o arquivo"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Erro"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Não foi possÃvel renomear o arquivo"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Erro eliminando o arquivo."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Nome"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Tamanho"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Modificado"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n pasta"
msgstr[1] "%n pastas"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n arquivo"
msgstr[1] "%n arquivos"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Enviando %n arquivo"
msgstr[1] "Enviando %n arquivos"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" é um nome de arquivo inválido."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Seu armazenamento está quase cheio ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "App de encriptação está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Chave do App de Encriptação é inválida. Por favor, atualize sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -299,12 +304,12 @@ msgstr "Encriptação foi desabilitada mas seus arquivos continuam encriptados.
msgid "{dirs} and {files}"
msgstr "{dirs} e {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s não pode ser renomeado"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Envio (max. %s)"
@@ -341,68 +346,75 @@ msgstr "Tamanho máximo para arquivo ZIP"
msgid "Save"
msgstr "Guardar"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso aos seus Arquivos via WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Novo"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Novo arquivo texto"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Arquivo texto"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Nova pasta"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Pasta"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Do link"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Arquivos apagados"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Cancelar upload"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Você não tem permissão para carregar ou criar arquivos aqui"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
-msgstr "Nada aqui.Carrege alguma coisa!"
+msgstr "Nada aqui. Carrege alguma coisa!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Baixar"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Excluir"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Upload muito grande"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Arquivos sendo escaneados, por favor aguarde."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Scanning atual"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr "Atualmente escaneando"
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
index 231b3042b9a10f658715710f782449ddbe8c3c0f..9976c9471ac4c5f76acb0e31c7a1b1c4eda4c50e 100644
--- a/l10n/pt_BR/files_encryption.po
+++ b/l10n/pt_BR/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 13:00+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:14+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"
@@ -79,9 +79,9 @@ msgstr "Este arquivo não pode ser decriptado, provavelmente este é um arquivo
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Erro desconhecido, por favor verifique suas configurações ou faça contato com o administrador"
+msgstr "Erro desconhecido. Por favor, verifique as configurações do sistema ou entre em contato com o administrador"
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Seguintes usuários não estão configurados para criptografia:"
@@ -114,91 +114,91 @@ msgstr "Ir diretamente para o seu"
msgid "personal settings"
msgstr "configurações pessoais."
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Criptografia"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Senha da chave de recuperação"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Repita Recuperação de senha da chave"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Habilitado"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Desabilitado"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Mudar a senha da chave de recuperação:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Senha antiga da chave de recuperação"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Nova senha da chave de recuperação"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Repita Nova senha da chave de recuperação"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Trocar Senha"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Sua senha de chave privada não coincide mais com sua senha de login:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Configure sua antiga senha de chave privada para sua atual senha de login."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Senha antiga de login"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Senha de login atual"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Atualizar senha de chave privada"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Habilitar recuperação de senha:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Configurações de recuperação de arquivo atualizado"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Não foi possÃvel atualizar a recuperação de arquivos"
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
index 8ce0c3c1317bc0e464edbb9bf8be004ab4a4090f..547eab2e2d2bb402d76c50ea10f7611dc4f6d9df 100644
--- a/l10n/pt_BR/files_external.po
+++ b/l10n/pt_BR/files_external.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2014-04-30 23:40+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: I Robot\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"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr "Segredo da Aplicação"
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Servidor"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,6 +166,10 @@ msgstr "SMB / CIFS usando OC logon"
msgid "Username as share"
msgstr "Nome de usuário como compartilhado"
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr "https:// segura"
@@ -198,29 +202,29 @@ msgstr "Erro ao configurar armazenamento do Google Drive"
msgid "Saved"
msgstr "Salvo"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr "<b>Nota:</b>"
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr "e"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Nota:</b> O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possÃvel. Por favor, solicite ao seu administrador do sistema para instalá-lo."
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Nota:</b> O suporte FTP no PHP não está habilitado ou instalado. Montagem de %s não é possÃvel. Por favor, solicite ao seu administrador do sistema para instalá-lo."
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index aaca3b457d3422d6e159409680a5dd362071d50c..44925a75c3673a844193a25719abbfec9ab39457 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Compartilhado por {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Este compartilhamento esta protegido por senha"
@@ -34,6 +58,14 @@ msgstr "Senha incorreta. Tente novamente."
msgid "Password"
msgstr "Senha"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Desculpe, este link parece não mais funcionar."
@@ -62,11 +94,11 @@ msgstr "Para mais informações, por favor, pergunte a pessoa que enviou este li
msgid "Download"
msgstr "Baixar"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Baixar %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Link direto"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index b4a8bb1acc718ec8b77638232744bc562df6b443..c1aec688dce0471fef7e64628e96a9a24be387e0 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "Não foi possÃvel excluir %s permanentemente"
msgid "Couldn't restore %s"
msgstr "Não foi possÃvel restaurar %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Arquivos apagados"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Restaurar"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Erro"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Arquivos Apagados"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "restaurado"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Nada aqui. Sua lixeira está vazia!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nome"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Restaurar"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "ExcluÃdo"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Excluir"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index 9dcb10fe57b8f792347fab4e6b4c8ed591329d67..8196a56a9cfad34c8af3ca66313b4a70316d3530 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 11:00+0000\n"
+"POT-Creation-Date: 2014-05-25 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 19:02+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"
@@ -19,11 +19,11 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: base.php:712
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr "Você está acessando o servidor a partir de um domÃnio não confiável."
-#: base.php:713
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -78,23 +78,23 @@ msgstr "Imagem inválida"
msgid "web services under your control"
msgstr "serviços web sob seu controle"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Download ZIP está desligado."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Arquivos precisam ser baixados um de cada vez."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Voltar para Arquivos"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Arquivos selecionados são muito grandes para gerar arquivo zip."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -291,116 +291,127 @@ 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>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s compartilhou »%s« com você"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr "Compartilhamento %s falhou, porque o arquivo não existe"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Você não tem permissão para compartilhar %s"
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "Compartilhamento %s falhou, porque o usuário %s é o proprietário do item"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "Compartilhamento %s falhou, porque o usuário %s não existe"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr "Compartilhamento %s falhou, porque o usuário %s não é membro de nenhum grupo que o usuário %s pertença"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "Compartilhamento %s falhou, porque este Ãtem já está compartilhado com %s"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "Compartilhamento %s falhou, porque o grupo %s não existe"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "Compartilhamento %s falhou, porque %s não é membro do grupo %s"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Você precisa fornecer uma senha para criar um link público, apenas links protegidos são permitidos"
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "Compartilhamento %s falhou, porque compartilhamento com links não é permitido"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr "Tipo de compartilhamento %s não é válido para %s"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "Definir permissões para %s falhou, porque o item não foi encontrado"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr "Compartilhando backend %s deve implementar a interface OCP\\Share_Backend"
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr "Compartilhamento backend %s não encontrado"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr "Compartilhamento backend para %s não encontrado"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr "Compartilhando %s falhou, porque o usuário %s é o compartilhador original"
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr "Compartilhamento %s falhou, porque as permissões excedem as permissões concedidas a %s"
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr "Compartilhamento %s falhou, porque recompartilhamentos não são permitidos"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr "Compartilhamento %s falhou, porque a infra-estrutura de compartilhamento para %s não conseguiu encontrar a sua fonte"
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr "Compartilhamento %s falhou, porque o arquivo não pôde ser encontrado no cache de arquivos"
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "ImpossÃvel localizar categoria \"%s\""
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 7ece5b7d90efdd5f791f519bc455c050cc448254..e51f2678538a34976238b9694cfd92e81a6935f0 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -50,15 +50,15 @@ msgstr "E-mail enviado"
msgid "You need to set your user email before being able to send test emails."
msgstr "Você precisa configurar seu e-mail de usuário antes de ser capaz de enviar e-mails de teste."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Modo enviar"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Criptografia"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Método de autenticação"
@@ -101,6 +101,16 @@ msgstr "Não foi possÃvel descriptografar os arquivos, verifique a sua owncloud
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "Não foi possÃvel descriptografar os arquivos, verifique sua senha e tente novamente"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Chaves de criptografia excluÃdas permanentemente"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Não foi possÃvel excluir permanentemente suas chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador"
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "E-mail salvo"
@@ -117,6 +127,16 @@ msgstr "Não foi possÃvel remover grupo"
msgid "Unable to delete user"
msgstr "Não foi possÃvel remover usuário"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Backup restaurado com sucesso"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Não foi possÃvel salvar as chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador"
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Idioma alterado"
@@ -172,7 +192,7 @@ msgstr "Back-end não suporta alteração de senha, mas a chave de criptografia
msgid "Unable to change password"
msgstr "ImpossÃvel modificar senha"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Enviando..."
@@ -228,34 +248,42 @@ msgstr "Atualizar"
msgid "Updated"
msgstr "Atualizado"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Selecione uma imagem para o perfil"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Senha muito fraca"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Senha fraca"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "So-so senha"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Boa senha"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Senha forte"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Eliminando a chave de criptografia permanentemente."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Restaurar chave de criptografia."
+
#: js/users.js:47
msgid "deleted"
msgstr "excluÃdo"
@@ -268,8 +296,8 @@ msgstr "desfazer"
msgid "Unable to remove user"
msgstr "ImpossÃvel remover usuário"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupos"
@@ -301,7 +329,7 @@ msgstr "Forneça uma senha válida"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Aviso: O diretório home para o usuário \"{user}\" já existe"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Português (Brasil)"
@@ -369,7 +397,7 @@ msgid ""
"root."
msgstr "Seu diretório de dados e seus arquivos são, provavelmente, acessÃveis a partir da internet. O arquivo htaccess. não está funcionando. Nós sugerimos fortemente que você configure o seu servidor web de uma forma que o diretório de dados não esteja mais acessÃvel ou mova o diretório de dados para fora do raiz do servidor."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Aviso de Configuração"
@@ -384,53 +412,65 @@ 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, verifique os <a href='%s'>guias de instalação</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Módulo 'fileinfo' faltando"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mÃdia (mime-type)."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Sua versão de PHP está desatualizada"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "A sua versão do PHP está desatualizada. Recomendamos a atualização para 5.3.8 ou mais recente, pois as versões mais antigas são conhecidas por serem quebradas. É possÃvel que esta instalação não esteja funcionando corretamente."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Localização não funcionando"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Localidade do sistema não pode ser definido como um que suporta UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Isso significa que pode haver problemas com certos caracteres nos nomes de arquivo."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Nós sugerimos para instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Sem conexão com a internet"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -439,198 +479,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Este servidor não tem conexão com a internet. Isso significa que algumas das caracterÃsticas como a montagem de armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de 3ºs terceiros não funcionam. Acessar arquivos remotamente e envio de e-mails de notificação também não podem funcionar. Sugerimos permitir conexão com a internet para esse servidor, se você deseja ter todas as funcionalidades."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "Último cron foi executado em %s."
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "Última cron foi executado em %s. Isso é, mais do que uma hora atrás, algo parece errado."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "Cron não foi executado ainda!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Execute uma tarefa com cada página carregada"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Use o sistema de serviço cron para chamar o arquivo cron.php a cada 15 minutos."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Compartilhamento"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Habilitar API de Compartilhamento"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Permitir que aplicativos usem a API de Compartilhamento"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Permitir links"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permitir que usuários compartilhem itens com o público usando links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr "Reforce a proteção por senha"
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Permitir envio público"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permitir que usuários deem permissão a outros para enviarem arquivios para suas pastas compartilhadas publicamente"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "Configurar a data de expiração"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Expirar depois de"
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "dias"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Fazer cumprir a data de expiração"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Permitir que usuários compartilhem itens com o público usando links"
-#: templates/admin.php:235
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Permitir recompartilhamento"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Permitir que usuários compartilhem novamente itens compartilhados com eles"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Permitir que usuários compartilhem com qualquer um"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Permitir que usuários compartilhem somente com usuários em seus grupos"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Permitir notificação por email"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Permitir aos usuários enviar notificação de email para arquivos compartilhados"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr "Configurar a data de expiração"
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Expirar depois de"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr "Excluir grupos de compartilhamento"
-#: templates/admin.php:266
-msgid "days"
-msgstr "dias"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr "Fazer cumprir a data de expiração"
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Expirar compartilhamentos automaticamente depois de N dias"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Esses grupos ainda serão capazes de receber compartilhamentos, mas não para iniciá-los."
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Segurança"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Forçar HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Obrigar os clientes que se conectem a %s através de uma conexão criptografada."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Por favor, se conectar ao seu %s via HTTPS para forçar ativar ou desativar SSL."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Servidor de Email"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "Isto é usado para o envio de notificações."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Do Endereço"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr "email"
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Autenticação é requerida"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Endereço do servidor"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Porta"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Credenciais"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "Nome do Usuário SMTP"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "Senha SMTP"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Configurações de e-mail de teste"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Enviar email"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Registro"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "NÃvel de registro"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Mais"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versão"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -783,29 +831,33 @@ msgstr "Idioma"
msgid "Help translate"
msgstr "Ajude a traduzir"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso a seus Arquivos via WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "O aplicativo de criptografia não está habilitado, por favor descriptar todos os seus arquivos"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Senha de login"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Decripti todos os Arquivos"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Suas chaves de criptografia forão movidas para o local de backup. Se alguma coisa deu errado, você pode salvar as chaves. Só excluÃ-las permanentemente se você tiver certeza de que todos os arquivos forão descriptografados corretamente."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Restaurar Chaves de Criptografia"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Eliminar Chaves de Criptografia"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Nome de Login"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 0077cf235eed24293fbf7bd26a144ec6fdfbff34..514f24bd61cd2ad082e1e0fe0b09ffa0d3498981 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:14+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"
@@ -72,6 +72,10 @@ msgstr "Tomar parámetros de recente configuração de servidor?"
msgid "Keep settings?"
msgstr "Manter ajustes?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Servidor"
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "ImpossÃvel adicionar a configuração do servidor"
@@ -88,6 +92,18 @@ msgstr "Sucesso"
msgid "Error"
msgstr "Erro"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Por favor, especifique a Base DN"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Não foi possÃvel determinar a Base DN"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Por favor, especifique a porta"
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Configuração OK"
@@ -128,28 +144,44 @@ msgstr "Você quer realmente deletar as atuais Configurações de Servidor?"
msgid "Confirm Deletion"
msgstr "Confirmar Exclusão"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "grupo% s encontrado"
msgstr[1] "grupos% s encontrado"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "usuário %s encontrado"
msgstr[1] "usuários %s encontrados"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Host inválido"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Não foi possÃvel encontrar a função desejada"
+#: settings.php:52
+msgid "Server"
+msgstr "Servidor"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Filtro de Usuário"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Filtro de Login"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtro de Grupo"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Guardar"
@@ -222,10 +254,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "Define o filtro a ser aplicado, o login é feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Servidor"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Servidor:"
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Adicionar Configuração de Servidor"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Excluir Configuração"
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Servidor"
@@ -289,6 +334,14 @@ msgstr "Voltar"
msgid "Continue"
msgstr "Continuar"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Especialista"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avançado"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 492d9e4812f7bd49bde3be8650b2f81056ef2b25..c8aebc609bfec187a7e7cdafbfcde18e7431b112 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -10,12 +10,14 @@
# Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
# Gontxi <goncalo.baiao@gmail.com>, 2013
# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
+# Nelson Rosado <nelsontrosado@gmail.com>, 2014
+# sccosta <sonia.peres.costa@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-02 17:00+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -24,11 +26,11 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
-msgstr ""
+msgstr "A data de expiração é no passado."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Não conseguiu enviar correio aos seguintes utilizadores: %s"
@@ -45,6 +47,11 @@ msgstr "Desactivado o modo de manutenção"
msgid "Updated database"
msgstr "Base de dados actualizada"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Não foi selecionado nenhum ficheiro para importar"
@@ -65,207 +72,207 @@ msgstr "Foto temporária de perfil indisponÃvel, tente novamente"
msgid "No crop data provided"
msgstr "Sem dados de corte fornecidos"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Domingo"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Segunda"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Terça"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Quarta"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Quinta"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Sexta"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sábado"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Janeiro"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Fevereiro"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Março"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Abril"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maio"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Junho"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Julho"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Agosto"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Setembro"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Outubro"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Novembro"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Dezembro"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Configurações"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "A guardar..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "Minutos atrás"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minuto atrás"
msgstr[1] "%n minutos atrás"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n hora atrás"
msgstr[1] "%n horas atrás"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "hoje"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "ontem"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dia atrás"
msgstr[1] "%n dias atrás"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "ultÃmo mês"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n mês atrás"
msgstr[1] "%n meses atrás"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "ano passado"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "anos atrás"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Escolha"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Erro ao carregar o modelo de selecionador de ficheiro: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Sim"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Não"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Escolha"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Erro ao carregar o modelo de selecionador de ficheiro: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Erro ao carregar o template: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflicto de ficheiro"
msgstr[1] "{count} conflitos de ficheiro"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Um conflito no ficheiro"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Ficheiros Novos"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
-msgstr ""
+msgstr "Ficheiro já existente"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Quais os ficheiros que pretende manter?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(todos seleccionados)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Erro ao carregar o modelo de existências do ficheiro"
@@ -297,140 +304,149 @@ msgstr "Partilhado"
msgid "Share"
msgstr "Partilhar"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Erro"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Erro ao partilhar"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Erro ao deixar de partilhar"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Erro ao mudar permissões"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Partilhado consigo e com o grupo {group} por {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Partilhado consigo por {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "Partilhar com utilizador ou grupo..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Partilhar o link"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "O link público expira, o mais tardar {days} dias após sua criação"
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr "Por defeito, o link publico irá expirar depois de {days} dias"
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Proteger com palavra-passe"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr "Defina a palavra-passe para o link público"
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Permitir Envios Públicos"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Enviar o link por e-mail"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Enviar"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Especificar data de expiração"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Data de expiração"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Partilhar via email:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Não foi encontrado ninguém"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "grupo"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Não é permitido partilhar de novo"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Partilhado em {item} com {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Deixar de partilhar"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "Notificar por email"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "Controlo de acesso"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "criar"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "actualizar"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "apagar"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "partilhar"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Protegido com palavra-passe"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Erro ao retirar a data de expiração"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Erro ao aplicar a data de expiração"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "A Enviar..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "E-mail enviado"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Aviso"
@@ -462,18 +478,19 @@ msgstr "Erro ao carregar modelo de diálogo: {error}"
msgid "No tags selected for deletion."
msgstr "Não foram escolhidas etiquetas para apagar."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Por favor recarregue a página."
-#: 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 "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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
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."
@@ -486,7 +503,7 @@ msgstr "%s reposição da password"
msgid ""
"A problem has occurred whilst sending the email, please contact your "
"administrator."
-msgstr ""
+msgstr "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador."
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -549,12 +566,12 @@ msgstr "Repor password"
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
-msgstr ""
+msgstr "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco."
#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
-msgstr ""
+msgstr "Para um melhor resultado, utilize antes o servidor GNU/Linux."
#: strings.php:5
msgid "Personal"
@@ -674,9 +691,13 @@ msgstr "Para obter informações de como configurar correctamente o servidor, ve
msgid "Create an <strong>admin account</strong>"
msgstr "Criar uma <strong>conta administrativa</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Password"
+
#: templates/installation.php:70
msgid "Storage & database"
-msgstr ""
+msgstr "Armazenamento e base de dados"
#: templates/installation.php:77
msgid "Data folder"
@@ -777,7 +798,7 @@ msgstr "Contas de acesso alternativas"
msgid ""
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
"with you.<br><a href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Olá,<br><br>apenas para informar que %s partilhou <strong>%s</strong> consigo.<br><a href=\"%s\">Consulte aqui!</a><br><br>"
#: templates/singleuser.user.php:3
msgid "This ownCloud instance is currently in single user mode."
@@ -799,8 +820,27 @@ msgstr "Obrigado pela sua paciência."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "A actualizar o ownCloud para a versão %s, esta operação pode demorar."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 44781168011ed6c0f7e180f9a771250a5a6c826d..e133d063213dd58c2415a5649d23dd66b2a8d4ea 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -6,14 +6,17 @@
# bmgmatias <bmgmatias@gmail.com>, 2013
# Carlos <crolidge@gmail.com>, 2014
# FernandoMASilva, 2013
-# Helder Meneses <helder.meneses@gmail.com>, 2013
+# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
+# Nelson Rosado <nelsontrosado@gmail.com>, 2014
+# Drew Melim <nokostya.translation@gmail.com>, 2014
+# sccosta <sonia.peres.costa@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 15:18+0000\n"
+"Last-Translator: sccosta <sonia.peres.costa@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"
@@ -31,27 +34,27 @@ msgstr "Não pôde mover o ficheiro %s - Já existe um ficheiro com esse nome"
msgid "Could not move %s"
msgstr "Não foi possÃvel move o ficheiro %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "O nome do ficheiro não pode estar vazio."
#: ajax/newfile.php:63
#, php-format
msgid "\"%s\" is an invalid file name."
-msgstr ""
+msgstr "\"%s\" é um nome de ficheiro inválido."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "A pasta de destino foi movida ou eliminada."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -127,44 +130,48 @@ msgstr "Está a faltar a pasta temporária"
msgid "Failed to write to disk"
msgstr "Falhou a escrita no disco"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Não há espaço suficiente em disco"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Falhou o envio. Não conseguiu encontrar o ficheiro enviado"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "O carregamento falhou. Não foi possÃvel obter a informação do ficheiro."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Directório Inválido"
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Ficheiros"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Todos os ficheiros"
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponÃvel"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Envio cancelado."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Não foi possÃvel obter o resultado do servidor."
@@ -177,120 +184,124 @@ msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página
msgid "URL cannot be empty"
msgstr "URL não pode estar vazio"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1170
msgid "{new_name} already exists"
msgstr "O nome {new_name} já existe"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Não pôde criar ficheiro"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Não pôde criar pasta"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Erro ao obter URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Partilhar"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/fileactions.js:234
+#: js/fileactions.js:183 templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr "Eliminar"
+
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Renomear"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:596 js/filelist.js:1665
msgid "Pending"
msgstr "Pendente"
-#: js/filelist.js:916
+#: js/filelist.js:1121
msgid "Error moving file."
-msgstr ""
+msgstr "Erro a mover o ficheiro."
-#: js/filelist.js:924
+#: js/filelist.js:1129
msgid "Error moving file"
msgstr "Erro ao mover o ficheiro"
-#: js/filelist.js:924
+#: js/filelist.js:1129
msgid "Error"
msgstr "Erro"
-#: js/filelist.js:988
+#: js/filelist.js:1207
msgid "Could not rename file"
msgstr "Não pôde renomear o ficheiro"
-#: js/filelist.js:1122
+#: js/filelist.js:1328
msgid "Error deleting file."
msgstr "Erro ao apagar o ficheiro."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1431 templates/list.php:62
msgid "Name"
msgstr "Nome"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1432 templates/list.php:75
msgid "Size"
msgstr "Tamanho"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1433 templates/list.php:78
msgid "Modified"
msgstr "Modificado"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1443 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n pasta"
msgstr[1] "%n pastas"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1449 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n ficheiro"
msgstr[1] "%n ficheiros"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1573 js/filelist.js:1612
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "A carregar %n ficheiro"
msgstr[1] "A carregar %n ficheiros"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
-msgstr ""
+msgstr "\"{name}\" é um nome de ficheiro inválido."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -300,15 +311,15 @@ msgstr "A encriptação foi desactivada mas os seus ficheiros continuam encripta
msgid "{dirs} and {files}"
msgstr "{dirs} e {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s não pode ser renomeada"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
-msgstr ""
+msgstr "Enviar (max. %s)"
#: templates/admin.php:4
msgid "File handling"
@@ -342,68 +353,71 @@ msgstr "Tamanho máximo para ficheiros ZIP"
msgid "Save"
msgstr "Guardar"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Novo"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Novo ficheiro de texto"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Ficheiro de texto"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Nova Pasta"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Pasta"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Da ligação"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Ficheiros eliminados"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Cancelar envio"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Você não tem permissão para enviar ou criar ficheiros aqui"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Vazio. Envie alguma coisa!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Transferir"
-#: templates/index.php:84 templates/index.php:85
-msgid "Delete"
-msgstr "Eliminar"
-
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Upload muito grande"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Os ficheiros estão a ser analisados, por favor aguarde."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Análise actual"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr "A analisar"
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index 8aab0d9e2820243171d8b7b1875c206ecb33ccb4..39083190b1e0e74daa0a8f67b8bfd2ee99efdbd3 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -7,13 +7,14 @@
# Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
# moura232 <moura232@gmail.com>, 2013
# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
+# Drew Melim <nokostya.translation@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 14:50+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -80,9 +81,9 @@ msgstr "Não foi possÃvel desencriptar este ficheiro, possivelmente é um fiche
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Erro desconhecido. Verifique por favor as definições do sistema ou contacte o seu administrador"
+msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -93,15 +94,15 @@ 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, certifique-se que PHP 5.3.3 ou mais recente está instalado e que OpenSSL juntamente com a extensão PHP está ativada e corretamente configurada. Por agora, a aplicação de encriptação está desactivada."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Os utilizadores seguintes não estão marcados para cifragem:"
#: js/detect-migration.js:21
msgid "Initial encryption started... This can take some time. Please wait."
-msgstr ""
+msgstr "A encriptação inicial começou... Pode demorar algum tempo. Aguarde, por favor."
#: js/detect-migration.js:25
msgid "Initial encryption running... Please try again later."
@@ -130,7 +131,7 @@ msgstr "Chave de recuperação da conta"
#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Repetir a chave de recuperação da conta"
#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
@@ -154,7 +155,7 @@ msgstr "Nova chave de recuperação da conta"
#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Repetir a nova chave de recuperação da conta"
#: templates/settings-admin.php:56
msgid "Change Password"
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index 53766e4d33c339195f5b271f04002877442fa5b7..2fc829a034132660b3ad212243b80dd34eb4ce14 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-02 17:10+0000\n"
-"Last-Translator: Drew Melim <nokostya.translation@gmail.com>\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-23 01:54+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"
@@ -25,155 +25,159 @@ msgstr ""
msgid "Local"
msgstr "Local"
-#: appinfo/app.php:36
+#: appinfo/app.php:37
msgid "Location"
msgstr "Local"
-#: appinfo/app.php:39
+#: appinfo/app.php:40
msgid "Amazon S3"
msgstr "Amazon S3"
-#: appinfo/app.php:41
+#: appinfo/app.php:43
msgid "Key"
msgstr "Chave"
-#: appinfo/app.php:42
+#: appinfo/app.php:44
msgid "Secret"
msgstr "Secreto"
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
msgid "Bucket"
msgstr ""
-#: appinfo/app.php:47
+#: appinfo/app.php:49
msgid "Amazon S3 and compliant"
msgstr ""
-#: appinfo/app.php:49
+#: appinfo/app.php:52
msgid "Access Key"
msgstr "Chave de acesso"
-#: appinfo/app.php:50
+#: appinfo/app.php:53
msgid "Secret Key"
msgstr "Chave Secreta"
-#: appinfo/app.php:52
+#: appinfo/app.php:55
msgid "Hostname (optional)"
msgstr ""
-#: appinfo/app.php:53
+#: appinfo/app.php:56
msgid "Port (optional)"
msgstr "Porta (opcional)"
-#: appinfo/app.php:54
+#: appinfo/app.php:57
msgid "Region (optional)"
msgstr "Região (opcional)"
-#: appinfo/app.php:55
+#: appinfo/app.php:58
msgid "Enable SSL"
msgstr "Activar SSL"
-#: appinfo/app.php:56
+#: appinfo/app.php:59
msgid "Enable Path Style"
msgstr ""
-#: appinfo/app.php:63
+#: appinfo/app.php:67
msgid "App key"
msgstr "Chave da aplicação"
-#: appinfo/app.php:64
+#: appinfo/app.php:68
msgid "App secret"
msgstr "Chave secreta da aplicação"
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
+msgid "Host"
+msgstr "Endereço"
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
msgid "Username"
msgstr "Nome de utilizador"
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
msgid "Password"
msgstr "Palavra-passe"
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
msgid "Root"
msgstr "Raiz"
-#: appinfo/app.php:77
+#: appinfo/app.php:82
msgid "Secure ftps://"
-msgstr ""
+msgstr "ftps:// Seguro"
-#: appinfo/app.php:84
+#: appinfo/app.php:90
msgid "Client ID"
msgstr "ID Cliente"
-#: appinfo/app.php:85
+#: appinfo/app.php:91
msgid "Client secret"
msgstr "Segredo do cliente"
-#: appinfo/app.php:92
+#: appinfo/app.php:98
msgid "OpenStack Object Storage"
msgstr ""
-#: appinfo/app.php:94
+#: appinfo/app.php:101
msgid "Username (required)"
msgstr "Utilizador (requerido)"
-#: appinfo/app.php:95
+#: appinfo/app.php:102
msgid "Bucket (required)"
msgstr ""
-#: appinfo/app.php:96
+#: appinfo/app.php:103
msgid "Region (optional for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:97
+#: appinfo/app.php:104
msgid "API Key (required for Rackspace Cloud Files)"
msgstr ""
-#: appinfo/app.php:98
+#: appinfo/app.php:105
msgid "Tenantname (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:99
+#: appinfo/app.php:106
msgid "Password (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:100
+#: appinfo/app.php:107
msgid "Service Name (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:101
+#: appinfo/app.php:108
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:102
+#: appinfo/app.php:109
msgid "Timeout of HTTP requests in seconds (optional)"
msgstr ""
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
msgid "Share"
msgstr "Partilhar"
-#: appinfo/app.php:119
+#: appinfo/app.php:127
msgid "SMB / CIFS using OC login"
msgstr ""
-#: appinfo/app.php:122
+#: appinfo/app.php:131
msgid "Username as share"
-msgstr ""
+msgstr "Utilizar nome de utilizador como partilha"
+
+#: appinfo/app.php:141 appinfo/app.php:152
+msgid "URL"
+msgstr "URL"
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:145 appinfo/app.php:156
msgid "Secure https://"
-msgstr ""
+msgstr "https:// Seguro"
-#: appinfo/app.php:144
+#: appinfo/app.php:155
msgid "Remote subfolder"
msgstr "Sub-pasta remota "
@@ -201,29 +205,29 @@ msgstr "Erro ao configurar o armazenamento do Google Drive"
msgid "Saved"
msgstr "Guardado"
-#: lib/config.php:598
+#: lib/config.php:674
msgid "<b>Note:</b> "
msgstr "<b>Aviso:</b> "
-#: lib/config.php:608
+#: lib/config.php:684
msgid " and "
msgstr "e"
-#: lib/config.php:630
+#: lib/config.php:706
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possÃvel montar %s. Peça ao seu administrador para instalar."
-#: lib/config.php:632
+#: lib/config.php:708
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possÃvel montar %s. Peça ao seu administrador para instalar."
-#: lib/config.php:634
+#: lib/config.php:710
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 16d45991839f007ce08126a5a200a93ff457b33b..c70215b8441f0496ce7266fb0d085aab69e78d1d 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -21,10 +21,34 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Partilhado por {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Esta partilha está protegida por palavra-chave"
@@ -37,6 +61,14 @@ msgstr "Password errada, por favor tente de novo"
msgid "Password"
msgstr "Palavra-passe"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Desculpe, mas este link parece não estar a funcionar."
@@ -65,11 +97,11 @@ msgstr "Para mais informações, por favor questione a pessoa que lhe enviou est
msgid "Download"
msgstr "Transferir"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Download %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Link direto"
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index 1d201c8a064280674394b11eae8881a4cb797eb8..143d4a9d386f317fc5964b4e79e6de720646f483 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ 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/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Ficheiros eliminados"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Restaurar"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Erro"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Ficheiros Apagados"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "Restaurado"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Não hà ficheiros. O lixo está vazio!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nome"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Restaurar"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Apagado"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Eliminar"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index 57cf04189f657f8bd58d86e649da1da9cae520e6..a235c2729bd842e2551264116c2087fe1fabfa37 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Helder Meneses <helder.meneses@gmail.com>, 2013
+# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
# jmruas <jmruas@gmail.com>, 2014
# Drew Melim <nokostya.translation@gmail.com>, 2014
# PapiMigas Migas <papimigas@gmail.com>, 2013
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
-"PO-Revision-Date: 2014-05-04 15:15+0000\n"
-"Last-Translator: Drew Melim <nokostya.translation@gmail.com>\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -21,11 +21,11 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:713
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -80,23 +80,23 @@ msgstr "Imagem inválida"
msgid "web services under your control"
msgstr "serviços web sob o seu controlo"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Descarregamento em ZIP está desligado."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Os ficheiros precisam de ser descarregados um por um."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Voltar a Ficheiros"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Os ficheiros seleccionados são grandes demais para gerar um ficheiro zip."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -293,116 +293,127 @@ 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>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s partilhado »%s« consigo"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
#, php-format
-msgid "Sharing %s failed, because the user %s is the item owner"
+msgid "You are not allowed to share %s"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:526
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr "A partilha %s falhou, porque o utilizador %s é o proprietário"
+
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
-msgstr ""
+msgstr "A partilha %s falhou, porque o utilizador %s nao existe"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Não foi encontrado a categoria \"%s\""
@@ -459,7 +470,7 @@ msgstr "anos atrás"
msgid ""
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
"\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "Apenas os seguintes caracteres são permitidos no nome de utilizador: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\""
#: private/user/manager.php:237
msgid "A valid username must be provided"
@@ -471,4 +482,4 @@ msgstr "Uma password válida deve ser fornecida"
#: private/user/manager.php:246
msgid "The username is already being used"
-msgstr ""
+msgstr "O nome de utilizador já está a ser usado"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index f757d3a424d7e397e1a1bd4c2357f3c83cb12495..12b6e9606b3617a55fc8870fd706fa288a4488e0 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -8,15 +8,17 @@
# Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
# jmruas <jmruas@gmail.com>, 2014
-# Nelson Rosado <nelsontrosado@gmail.com>, 2013
+# Nelson Rosado <nelsontrosado@gmail.com>, 2013-2014
+# Drew Melim <nokostya.translation@gmail.com>, 2014
# PapiMigas Migas <papimigas@gmail.com>, 2013
+# sccosta <sonia.peres.costa@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-02 17:00+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -27,7 +29,7 @@ msgstr ""
#: admin/controller.php:66
#, php-format
msgid "Invalid value supplied for %s"
-msgstr ""
+msgstr "Valor dado a %s éinválido"
#: admin/controller.php:73
msgid "Saved"
@@ -39,7 +41,7 @@ msgstr "testar configurações de email"
#: admin/controller.php:91
msgid "If you received this email, the settings seem to be correct."
-msgstr ""
+msgstr "Se você recebeu este e-mail as configurações parecem estar correctas"
#: admin/controller.php:94
msgid ""
@@ -52,17 +54,17 @@ msgstr "E-mail enviado"
#: admin/controller.php:101
msgid "You need to set your user email before being able to send test emails."
-msgstr ""
+msgstr "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste"
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Modo de envio"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Encriptação"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Método de autenticação"
@@ -99,11 +101,21 @@ msgstr "Ficheiros desencriptados com sucesso"
msgid ""
"Couldn't decrypt your files, please check your owncloud.log or ask your "
"administrator"
-msgstr ""
+msgstr "Não foi possÃvel desencriptar os seus arquivos. Verifique a sua owncloud.log ou pergunte ao seu administrador"
#: ajax/decryptall.php:36
msgid "Couldn't decrypt your files, check your password and try again"
-msgstr ""
+msgstr "Não foi possÃvel desencriptar os seus arquivos. Verifique a sua senha e tente novamente"
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "A chave de encriptação foi eliminada permanentemente"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Não foi possÃvel excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador"
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -121,6 +133,16 @@ msgstr "ImpossÃvel apagar grupo"
msgid "Unable to delete user"
msgstr "ImpossÃvel apagar utilizador"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Cópias de segurança foram restauradas com sucesso"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Nao foi possivel restaurar as suas chaves de encriptacao. Verifique a sua owncloud.log ou pergunte ao seu administrador"
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Idioma alterado"
@@ -176,7 +198,7 @@ msgstr "Não foi possÃvel alterar a sua palavra-passe, mas a chave de encripta
msgid "Unable to change password"
msgstr "Não foi possÃvel alterar a sua password"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "A enviar..."
@@ -232,34 +254,42 @@ msgstr "Actualizar"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Seleccione uma fotografia de perfil"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Password muito fraca"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Password fraca"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Password aceitável"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Password Forte"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Password muito forte"
-#: js/personal.js:313
+#: js/personal.js:310
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:324
+msgid "Delete encryption keys permanently."
+msgstr "Excluir as chaves encriptadas de forma permanente."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Restaurar chaves encriptadas."
+
#: js/users.js:47
msgid "deleted"
msgstr "apagado"
@@ -272,8 +302,8 @@ msgstr "desfazer"
msgid "Unable to remove user"
msgstr "Não foi possÃvel remover o utilizador"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupos"
@@ -305,7 +335,7 @@ msgstr "Uma password válida deve ser fornecida"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Atenção: a pasta pessoal do utilizador \"{user}\" já existe"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__language_name__"
@@ -343,7 +373,7 @@ msgstr "Plano"
#: templates/admin.php:19
msgid "NT LAN Manager"
-msgstr ""
+msgstr "Gestor de NT LAN"
#: templates/admin.php:24
msgid "SSL"
@@ -373,7 +403,7 @@ msgid ""
"root."
msgstr "A sua pasta com os dados e os seus ficheiros estão provavelmente acessÃveis a partir das internet. O seu ficheiro .htaccess não está a funcionar corretamente. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessÃvel, ou mova a pasta com os dados para fora da raiz de documentos do servidor web."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Aviso de setup"
@@ -388,53 +418,65 @@ 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 o<a href='%s'>Guia de instalação</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Falta o módulo 'fileinfo'"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "O Módulo PHP 'fileinfo' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "A sua versão do PHP está ultrapassada"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "A sua versão do PHP está ultrapassada. Recomendamos que actualize para a versão 5.3.8 ou mais recente, devido à s versões anteriores conterem problemas. É também possÃvel que esta instalação não esteja a funcionar correctamente."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Internacionalização não está a funcionar"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Não é possÃvel pôr as definições de sistema compatÃveis com UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Isto significa que podem haver problemas com alguns caracteres nos nomes dos ficheiros."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "A ligação à internet não está a funcionar"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -443,198 +485,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Este servidor ownCloud não tem uma ligação de internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretender obter todas as funcionalidades do ownCloud."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
-msgstr ""
+msgstr "O ultimo cron foi executado em %s."
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
-msgstr ""
+msgstr "O ultima cron foi executado em %s a mais duma hora. Algo não está certo."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
-msgstr ""
+msgstr "Cron ainda não foi executado!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Executar uma tarefa com cada página carregada"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Use o serviço cron do sistema para chamar o ficheiro cron.php a cada 15 minutos."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Partilha"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Activar a API de partilha"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Permitir que os utilizadores usem a API de partilha"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Permitir links"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permitir que os utilizadores partilhem itens com o público utilizando um link."
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr "Forçar protecção da palavra passe"
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Permitir Envios Públicos"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permitir aos utilizadores que possam definir outros utilizadores para carregar ficheiros para as suas pastas publicas"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "Especificar a data padrão de expiração"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Expira após"
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "dias"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Forçar a data de expiração"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Permitir que os utilizadores partilhem itens com o público utilizando um link."
-#: templates/admin.php:235
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Permitir repartilha"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Permitir que os utilizadores partilhem itens partilhados com eles"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Permitir que os utilizadores partilhem com todos"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Permitir notificação por email"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Expira após"
+msgstr "Permita que o utilizador envie notificações por correio electrónico para ficheiros partilhados"
-#: templates/admin.php:266
-msgid "days"
-msgstr "dias"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr "Excluir grupos das partilhas"
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr ""
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Estes grupos poderão receber partilhas, mas não poderão iniciá-las."
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Segurança"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Forçar HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Forçar os clientes a ligar a %s através de uma ligação encriptada"
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL"
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Servidor de email"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "Isto é utilizado para enviar notificações"
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Do endereço"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr "Correio"
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Autenticação necessária"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Endereço do servidor"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Porto"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Credenciais"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "Nome de utilizador SMTP"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "Password SMTP"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Testar configurações de email"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Enviar email"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Registo"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "NÃvel do registo"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Mais"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versão"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -745,7 +795,7 @@ msgstr "O seu endereço de email"
msgid ""
"Fill in an email address to enable password recovery and receive "
"notifications"
-msgstr ""
+msgstr "Preencha com um endereço e-mail para permitir a recuperação de senha e receber notificações"
#: templates/personal.php:89
msgid "Profile picture"
@@ -787,29 +837,33 @@ msgstr "Idioma"
msgid "Help translate"
msgstr "Ajude a traduzir"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Password de entrada"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Desencriptar todos os ficheiros"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "As suas chaves de encriptação foram movidas para um local de segurança. Em caso de algo correr mal você pode restaurar as chaves. Só deve eliminar as chaves permanentemente se tiver certeza absoluta que os ficheiros são decrepitados correctamente."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Restaurar as chaves de encriptação"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Apagar as chaves de encriptação"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Nome de utilizador"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index bea50b483e04113ddbcf426d808b628a006f7158..6fc15b31ebe7fbbd570decf802d94fc293ee7ea3 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgstr "A configuração está correcta, mas não foi possÃvel estabelecer o \"
msgid ""
"The configuration is invalid. Please have a look at the logs for further "
"details."
-msgstr ""
+msgstr "A configuração é inválida. Por favor, veja o log do ownCloud para mais detalhes."
#: ajax/wizard.php:32
msgid "No action specified"
@@ -74,6 +74,10 @@ msgstr "Assumir as configurações da configuração do servidor mais recente?"
msgid "Keep settings?"
msgstr "Manter as definições?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Não foi possÃvel adicionar as configurações do servidor."
@@ -90,6 +94,18 @@ msgstr "Sucesso"
msgid "Error"
msgstr "Erro"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Configuração OK"
@@ -130,28 +146,44 @@ msgstr "Deseja realmente apagar as configurações de servidor actuais?"
msgid "Confirm Deletion"
msgstr "Confirmar a operação de apagar"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s grupo encontrado"
msgstr[1] "%s grupos encontrados"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s utilizador encontrado"
msgstr[1] "%s utilizadores encontrados"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Hospedeiro Inválido"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Não se encontrou a função desejada"
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtrar por grupo"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Guardar"
@@ -224,10 +256,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "Define o filtro a aplicar, quando se tenta uma sessão. %%uid substitui o nome de utilizador na ação de inÃcio de sessão. Exemplo: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Adicionar configurações do servidor"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Anfitrião"
@@ -271,7 +316,7 @@ msgstr "Pode especificar o ND Base para utilizadores e grupos no separador Avan
#: templates/part.wizard-userfilter.php:4
#, php-format
msgid "Limit %s access to users meeting these criteria:"
-msgstr ""
+msgstr "Limitar o acesso a %s de utilizadores com estes critérios:"
#: templates/part.wizard-userfilter.php:31
#, php-format
@@ -291,6 +336,14 @@ msgstr "Voltar"
msgid "Continue"
msgstr "Continuar"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avançado"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
@@ -501,7 +554,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 defeito, o ownCloud detecta automaticamente o atributo UUID. Este atributo é usado para identificar inequivocamente grupos e utilizadores LDAP. Igualmente, o nome de utilizador interno é criado com base no UUID, se o contrário não for especificado. Pode sobrepor esta definição colocando um atributo à sua escolha. Tenha em atenção que esse atributo deve ser válido tanto para grupos como para utilizadores, e que é único. Deixe em branco para optar pelo comportamento por defeito. Estas alteração apenas terão efeito em novos utilizadores e grupos mapeados (adicionados)."
#: templates/settings.php:58
msgid "UUID Attribute for Users:"
@@ -527,7 +580,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 "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestÃgios em todo o lado. A limpeza dos mapeamentos não é sensÃvel à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa fase de testes ou experimental."
#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index be89b0d9e38cc8727d30b407bba0bfaa1eccfdeb..2ae1bfcafa6148e51cc268327173838ab6d364e1 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -42,6 +42,11 @@ msgstr ""
msgid "Updated database"
msgstr "Bază de date actualizată"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -62,212 +67,212 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Duminică"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Luni"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Marți"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Miercuri"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Joi"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Vineri"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sâmbătă"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Ianuarie"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februarie"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Martie"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Aprilie"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mai"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Iunie"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Iulie"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Septembrie"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Octombrie"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Noiembrie"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Decembrie"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Setări"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Se salvează..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "secunde în urmă"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "acum %n minut"
msgstr[1] "acum %n minute"
msgstr[2] "acum %n minute"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "acum %n oră"
msgstr[1] "acum %n ore"
msgstr[2] "acum %n ore"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "astăzi"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "ieri"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "acum %n zi"
msgstr[1] "acum %n zile"
msgstr[2] "acum %n zile"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "ultima lună"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "ultimul an"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "ani în urmă"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Alege"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nu"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Alege"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Un conflict de fișier"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Ce fișiere vrei să păstrezi?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
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:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Anulare"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Continuă"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -299,140 +304,149 @@ msgstr "Partajat"
msgid "Share"
msgstr "Partajează"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Eroare"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Eroare la partajare"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Eroare la anularea partajării"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Eroare la modificarea permisiunilor"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Distribuie cu tine si grupul {group} de {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Distribuie cu tine de {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Protejare cu parolă"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Parolă"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Permiteţi încărcarea publică."
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Expediază legătura prin poșta electronică"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Expediază"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Specifică data expirării"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Data expirării"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Distribuie prin email:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Nici o persoană găsită"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "grup"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Repartajarea nu este permisă"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Distribuie in {item} si {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Anulare partajare"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "poate edita"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "control acces"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "creare"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "actualizare"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "ștergere"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "partajare"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Protejare cu parolă"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Eroare la anularea datei de expirare"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Eroare la specificarea datei de expirare"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Se expediază..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Mesajul a fost expediat"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Atenție"
@@ -464,18 +478,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "Actualizarea a eșuat! Raportați problema către <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunitatea ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Actualizare reușită. Ești redirecționat către ownCloud."
@@ -676,6 +691,10 @@ msgstr "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%
msgid "Create an <strong>admin account</strong>"
msgstr "Crează un <strong>cont de administrator</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Parolă"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -801,8 +820,27 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Actualizăm ownCloud la versiunea %s, aceasta poate dura câteva momente."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 4098cc55aaf19906218905b697058929007eb71f..2cd621bbb84c4c2e9beb706387264b9839889251 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 15:29+0000\n"
-"Last-Translator: lauraberindei <lauraagavriloae@yahoo.com>\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -36,7 +36,7 @@ msgstr "%s nu se poate muta - Fișierul cu acest nume există deja "
msgid "Could not move %s"
msgstr "Nu se poate muta %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Numele fișierului nu poate rămâne gol."
@@ -45,18 +45,18 @@ msgstr "Numele fișierului nu poate rămâne gol."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" este un nume de fișier nevalid"
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nume nevalide, '\\', '/', '<', '>', ':', '\"', '|', '?' și '*' nu sunt permise."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "Dosarul țintă a fost mutat sau șters."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -132,44 +132,48 @@ msgstr "Lipsește un dosar temporar"
msgid "Failed to write to disk"
msgstr "Eroare la scrierea pe disc"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Nu este disponibil suficient spațiu"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
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:179
+#: ajax/upload.php:181
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:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Dosar nevalid."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Fișiere"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
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:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "Mărimea fișierului este {size1} ce depășește limita de incarcare de {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Spațiu liber insuficient, încărcați {size1} însă doar {size2} disponibil rămas"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Încărcare anulată."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Nu se poate obține rezultatul de la server."
@@ -182,123 +186,123 @@ msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerup
msgid "URL cannot be empty"
msgstr "URL nu poate fi gol"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} există deja"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Nu s-a putut crea fisierul"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Nu s-a putut crea folderul"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Eroare încarcare URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Partajează"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Șterge permanent"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Redenumește"
-#: js/filelist.js:221
+#: js/filelist.js:299
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 dura ceva timp dacă fișierele sunt mari."
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "În așteptare"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr "Eroare la mutarea fișierului."
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Eroare la mutarea fișierului"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Eroare"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Nu s-a putut redenumi fisierul"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Eroare la ștergerea fisierului."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Nume"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Mărime"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Modificat"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n director"
msgstr[1] "%n directoare"
msgstr[2] "%n directoare"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
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:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Se încarcă %n fișier."
msgstr[1] "Se încarcă %n fișiere."
msgstr[2] "Se încarcă %n fișiere."
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" este un nume de fișier nevalid."
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Spațiul de stocare este plin, fișierele nu mai pot fi actualizate sau sincronizate!"
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Spațiul de stocare este aproape plin ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Aplicatia de criptare este activata dar tastatura nu este initializata , va rugam deconectati-va si reconectati-va"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Cheie privată nevalidă pentru aplicația Încriptare. Te rog, actualizează-ți parola cheii private folosind setările personale pentru a reaccesa fișierele tale încriptate."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -308,12 +312,12 @@ msgstr "criptarea a fost disactivata dar fisierele sant inca criptate.va rog int
msgid "{dirs} and {files}"
msgstr "{dirs} și {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s nu a putut fi redenumit"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Încarcă (max. %s)"
@@ -350,68 +354,75 @@ msgstr "Dimensiunea maximă de intrare pentru fișierele ZIP"
msgid "Save"
msgstr "Salvează"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Folosește această adresă <a href=\"%s\" target=\"_blank\">pentru acces la fișierele tale folosind WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Nou"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Un nou fișier text"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Fișier text"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Un nou dosar"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Dosar"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "De la adresa"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Fișiere șterse"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Anulează încărcarea"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Nu aveti permisiunea de a incarca sau crea fisiere aici"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Nimic aici. Încarcă ceva!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Descarcă"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Șterge"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Fișierul încărcat este prea mare"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Fișierele pe care încerci să le încarci depășesc limita de încărcare maximă admisă pe acest server."
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Fișierele sunt scanate, te rog așteaptă."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "ÃŽn curs de scanare"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
index 69ab25327569a5d62fcefcce8b3ccd81abeaf272..10021696c97615d61ff3bdab531ac2efdbfe2ab3 100644
--- a/l10n/ro/files_encryption.po
+++ b/l10n/ro/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -92,7 +92,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -112,91 +112,91 @@ msgstr ""
msgid "personal settings"
msgstr "setari personale"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "ÃŽncriptare"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Activat"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Dezactivat"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Schimbă parola"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Parola cheii private nu se mai potriveste cu parola ta de logare:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Setarile pentru recuperarea fisierelor au fost actualizate"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Nu am putut actualiza recuperarea de fisiere"
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index ba3cd1c39882308ec892bba86bc7be842c262815..18f2e0739acf4ccac3f4c0796c294707935000e9 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Gazdă"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,6 +166,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -198,29 +202,29 @@ msgstr "Eroare la configurarea mediului de stocare Google Drive"
msgid "Saved"
msgstr "Salvat"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index 3f48febdbc939220a7d211f48ae2eb2315484704..0faa286ab74fec8c6db57508efa1003f5d874ad0 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -34,6 +58,14 @@ msgstr "Parola este incorectă. Încercaţi din nou."
msgid "Password"
msgstr "Parolă"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -62,11 +94,11 @@ msgstr ""
msgid "Download"
msgstr "Descarcă"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index dbec3636ed41e9ce6ed4b94ffd72b8d46bb08b2a..e0cabb38bf024e0ac33d5f94c96c767021722c2a 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Sterge fisierele"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Eroare"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Nume"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Șterge"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 2dd01b2d4318f5f19362d72eb90cff8d0d7b9db4..f0b01f825a305713dcd8b659fe475e47ff9b2575 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -77,23 +77,23 @@ msgstr "Imagine invalidă"
msgid "web services under your control"
msgstr "servicii web controlate de tine"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Descărcarea ZIP este dezactivată."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Fișierele trebuie descărcate unul câte unul."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Înapoi la fișiere"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Fișierele selectate sunt prea mari pentru a genera un fișier zip."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -279,127 +279,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
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>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s Partajat »%s« cu tine de"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Cloud nu a gasit categoria \"%s\""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 1b527b4d333333822dd95bfe40c7c4d43510546e..b0642757a9056075f7f3f2b42aac4dc1d9343664 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -50,15 +50,15 @@ msgstr "Mesajul a fost expediat"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Modul de expediere"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "ÃŽncriptare"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Modul de autentificare"
@@ -101,6 +101,16 @@ msgstr "Nu s-a puput decripta fișierele tale, verifică owncloud.log sau între
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "Nu s-a puput decripta fișierele tale, verifică parola și încearcă din nou"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "E-mail salvat"
@@ -117,6 +127,16 @@ msgstr "Nu s-a putut șterge grupul"
msgid "Unable to delete user"
msgstr "Nu s-a putut șterge utilizatorul"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Limba a fost schimbată"
@@ -172,7 +192,7 @@ msgstr ""
msgid "Unable to change password"
msgstr "Imposibil de schimbat parola"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Se expediază..."
@@ -228,34 +248,42 @@ msgstr "Actualizare"
msgid "Updated"
msgstr "Actualizat"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Selectează o imagine de profil"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Parolă foarte slabă"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Parolă slabă"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Decriptare fișiere... Te rog așteaptă, poate dura ceva timp."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "șters"
@@ -268,8 +296,8 @@ msgstr "Anulează ultima acțiune"
msgid "Unable to remove user"
msgstr "Imposibil de eliminat utilizatorul"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupuri"
@@ -301,7 +329,7 @@ msgstr "Trebuie să furnizaţi o parolă validă"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Avertizare: Dosarul Acasă pentru utilizatorul \"{user}\" deja există"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "_language_name_"
@@ -369,7 +397,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Atenţie la implementare"
@@ -384,53 +412,65 @@ 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>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Modulul \"Fileinfo\" lipsește"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "Modulul PHP \"Fileinfo\" lipsește. Va recomandam sa activaţi acest modul pentru a obține cele mai bune rezultate cu detectarea mime-type."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Versiunea PHP folosită este învechită"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Localizarea nu funcționează"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Conexiunea la internet nu funcționează"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -439,198 +479,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Execută o sarcină la fiecare pagină încărcată"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Partajare"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Activare API partajare"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Permite aplicațiilor să folosească API-ul de partajare"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Pemite legături"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Permite utilizatorilor să partajeze fișiere în mod public prin legături"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Permite încărcări publice"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Permite utilizatorilor sa activeze opțiunea de încărcare a fișierelor în dosarele lor publice de către alte persoane"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Permite utilizatorilor să partajeze fișiere în mod public prin legături"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Permite repartajarea"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Permite utilizatorilor să repartajeze fișiere partajate cu ei"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Permite utilizatorilor să partajeze cu oricine"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Permite utilizatorilor să partajeze doar cu utilizatori din același grup"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Permite notificări prin e-mail"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Securitate"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Forțează clienții să se conecteze la %s folosind o conexiune sigură"
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Adresa server-ului"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Portul"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "Nume utilizator SMTP"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "Parolă SMTP"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Verifică setările de e-mail"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Expediază mesajul"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Jurnal de activitate"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Nivel jurnal"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Mai mult"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Mai puțin"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versiunea"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -783,29 +831,33 @@ msgstr "Limba"
msgid "Help translate"
msgstr "Ajută la traducere"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Folosește această adresă <a href=\"%s\" target=\"_blank\">pentru acces la fișierele tale folosind WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Parolă"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Decriptează toate fișierele"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Autentificare"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 23c097fe0622c0cbadfeebae847371c9e1ec76ea..586eb357ea27fddd36cb71cba5e06ad68971a565 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 18:15+0000\n"
-"Last-Translator: lauraberindei <lauraagavriloae@yahoo.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -71,6 +71,10 @@ msgstr ""
msgid "Keep settings?"
msgstr "Păstraţi setările ?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Nu se poate adăuga configuraţia serverului "
@@ -87,6 +91,18 @@ msgstr "Succes"
msgid "Error"
msgstr "Eroare"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Configuraţie valida"
@@ -127,7 +143,7 @@ msgstr "Sunteţi sigur ca vreţi sa ştergeţi configuraţia actuala a serverulu
msgid "Confirm Deletion"
msgstr "Confirmaţi Ştergerea "
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -135,7 +151,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -143,14 +159,30 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Fitrare Grup"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Salvează"
@@ -223,10 +255,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Adăugaţi Configuraţia Serverului"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Gazdă"
@@ -290,6 +335,14 @@ msgstr "ÃŽnapoi"
msgid "Continue"
msgstr "Continuă"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avansat"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ro/user_webdavauth.po b/l10n/ro/user_webdavauth.po
index 076a42730a3424c29f4b11d1901f5f247ecc54f1..5ef7dcd74f1672261dc7487b5d1740f1919bc850 100644
--- a/l10n/ro/user_webdavauth.po
+++ b/l10n/ro/user_webdavauth.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 17:34+0000\n"
+"POT-Creation-Date: 2014-05-07 01:55-0400\n"
+"PO-Revision-Date: 2014-05-05 14:49+0000\n"
"Last-Translator: lauraberindei <lauraagavriloae@yahoo.com>\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 bf156dce36ac9bb69f580c51e84a5f76676698a1..1cc1917dc2375b97a1a213668f9dc4f24f29122c 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -8,8 +8,10 @@
# lord93 <lordakryl@gmail.com>, 2013
# foool <andrglad@mail.ru>, 2013
# Evgeniy Spitsyn <evgeniy@spitsyn.net>, 2013
+# Gennady <mxiru@mail.ru>, 2014
# jekader <jekader@gmail.com>, 2013
# Mescalinich <insider.junk@gmail.com>, 2013
+# ppzabortsev <ppz2001@mail.ru>, 2014
# stushev, 2013
# eurekafag <rkfg@rkfg.me>, 2013
# sk.avenger <sk.avenger@adygnet.ru>, 2013
@@ -24,9 +26,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 14:42+0000\n"
+"Last-Translator: ppzabortsev <ppz2001@mail.ru>\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"
@@ -34,11 +36,11 @@ msgstr ""
"Language: ru\n"
"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);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "Дата иÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ Ñрока дейÑÑ‚Ð²Ð¸Ñ Ð² прошлом."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Ðевозможно отправить пиÑьмо Ñледующим пользователÑм: %s"
@@ -55,6 +57,11 @@ msgstr "Режим отладки отключён"
msgid "Updated database"
msgstr "База данных обновлена"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Ðе указано изображение или файл"
@@ -75,212 +82,212 @@ msgstr "Ð’Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð¸Ð½ÐºÐ° Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð½ÐµÐ´Ð¾Ñтупна,
msgid "No crop data provided"
msgstr "Ðе указана Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ кадрировании"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "ВоÑкреÑенье"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Понедельник"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Вторник"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Среда"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Четверг"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "ПÑтница"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Суббота"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Январь"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Февраль"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Март"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Ðпрель"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Май"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Июнь"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Июль"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "ÐвгуÑÑ‚"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "СентÑбрь"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "ОктÑбрь"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "ÐоÑбрь"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Декабрь"
-#: js/js.js:483
+#: js/js.js:496
msgid "Settings"
msgstr "КонфигурациÑ"
-#: js/js.js:583
+#: js/js.js:596
msgid "Saving..."
msgstr "Сохранение..."
-#: js/js.js:1240
+#: js/js.js:1220
msgid "seconds ago"
msgstr "неÑколько Ñекунд назад"
-#: js/js.js:1241
+#: js/js.js:1221
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n минуту назад"
msgstr[1] "%n минуты назад"
msgstr[2] "%n минут назад"
-#: js/js.js:1242
+#: js/js.js:1222
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´"
msgstr[1] "%n чаÑа назад"
msgstr[2] "%n чаÑов назад"
-#: js/js.js:1243
+#: js/js.js:1223
msgid "today"
msgstr "ÑегоднÑ"
-#: js/js.js:1244
+#: js/js.js:1224
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:1245
+#: js/js.js:1225
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n день назад"
msgstr[1] "%n Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´"
msgstr[2] "%n дней назад"
-#: js/js.js:1246
+#: js/js.js:1226
msgid "last month"
msgstr "в прошлом меÑÑце"
-#: js/js.js:1247
+#: js/js.js:1227
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n меÑÑц назад"
msgstr[1] "%n меÑÑца назад"
msgstr[2] "%n меÑÑцев назад"
-#: js/js.js:1248
+#: js/js.js:1228
msgid "last year"
msgstr "в прошлом году"
-#: js/js.js:1249
+#: js/js.js:1229
msgid "years ago"
msgstr "неÑколько лет назад"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Выбрать"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Ошибка при загрузке шаблона выбора файлов: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ðет"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Выбрать"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Ошибка при загрузке шаблона выбора файлов: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ок"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Ошибка загрузки шаблона Ñообщений: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} конфликт в файлах"
msgstr[1] "{count} конфликта в файлах"
msgstr[2] "{count} конфликтов в файлах"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Один конфликт в файлах"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Ðовые файлы"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
-msgstr ""
+msgstr "СущеÑтвующие файлы"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Какие файлы вы хотите Ñохранить?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "При выборе обоих верÑий, к названию копируемого файла будет добавлена цифра"
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Отменить"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Продолжить"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(выбраны вÑе)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} выбрано)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Ошибка при загрузке шаблона ÑущеÑтвующего файла"
@@ -304,148 +311,157 @@ msgstr "Хороший пароль"
msgid "Strong password"
msgstr "УÑтойчивый к взлому пароль"
-#: js/share.js:51 js/share.js:66 js/share.js:106
+#: js/share.js:69 js/share.js:84 js/share.js:127
msgid "Shared"
msgstr "Общие"
-#: js/share.js:109
+#: js/share.js:130
msgid "Share"
msgstr "Открыть доÑтуп"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:195 js/share.js:208 js/share.js:215 js/share.js:822
#: templates/installation.php:10
msgid "Error"
msgstr "Ошибка"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:197 js/share.js:885
msgid "Error while sharing"
msgstr "Ошибка при открытии доÑтупа"
-#: js/share.js:171
+#: js/share.js:208
msgid "Error while unsharing"
msgstr "Ошибка при закрытии доÑтупа"
-#: js/share.js:178
+#: js/share.js:215
msgid "Error while changing permissions"
msgstr "Ошибка при Ñмене разрешений"
-#: js/share.js:188
+#: js/share.js:225
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} открыл доÑтуп Ð´Ð»Ñ Ð’Ð°Ñ Ð¸ группы {group} "
-#: js/share.js:190
+#: js/share.js:227
msgid "Shared with you by {owner}"
msgstr "{owner} открыл доÑтуп Ð´Ð»Ñ Ð’Ð°Ñ"
-#: js/share.js:214
+#: js/share.js:251
msgid "Share with user or group …"
msgstr "ПоделитьÑÑ Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¼ или группой..."
-#: js/share.js:220
+#: js/share.js:257
msgid "Share link"
msgstr "ПоделитьÑÑ ÑÑылкой"
-#: js/share.js:223
+#: js/share.js:263
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Срок дейÑÑ‚Ð²Ð¸Ñ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¾Ð¹ ÑÑылки иÑтекает не позже чем через {days} дней, поÑле её ÑозданиÑ"
+
+#: js/share.js:265
+msgid "By default the public link will expire after {days} days"
+msgstr "По умолчанию Ñрок дейÑÑ‚Ð²Ð¸Ñ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¾Ð¹ ÑÑылки иÑтекает через {days} дней"
+
+#: js/share.js:270
msgid "Password protect"
msgstr "Защитить паролем"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Пароль"
+#: js/share.js:272
+msgid "Choose a password for the public link"
+msgstr "Выберите пароль Ð´Ð»Ñ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¾Ð¹ ÑÑылки"
-#: js/share.js:230
+#: js/share.js:278
msgid "Allow Public Upload"
-msgstr "Разрешить открытую загрузку"
+msgstr "Разрешить загрузку"
-#: js/share.js:234
+#: js/share.js:282
msgid "Email link to person"
msgstr "ÐŸÐ¾Ñ‡Ñ‚Ð¾Ð²Ð°Ñ ÑÑылка на перÑону"
-#: js/share.js:235
+#: js/share.js:283
msgid "Send"
msgstr "Отправить"
-#: js/share.js:240
+#: js/share.js:288
msgid "Set expiration date"
msgstr "УÑтановить Ñрок доÑтупа"
-#: js/share.js:241
+#: js/share.js:289
msgid "Expiration date"
msgstr "Дата окончаниÑ"
-#: js/share.js:277
+#: js/share.js:326
msgid "Share via email:"
msgstr "ПоделитÑÑ Ñ‡ÐµÑ€ÐµÐ· Ñлектронную почту:"
-#: js/share.js:280
+#: js/share.js:329
msgid "No people found"
msgstr "Ðи один человек не найден"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:377 js/share.js:438
msgid "group"
msgstr "группа"
-#: js/share.js:357
+#: js/share.js:410
msgid "Resharing is not allowed"
msgstr "Общий доÑтуп не разрешен"
-#: js/share.js:401
+#: js/share.js:454
msgid "Shared in {item} with {user}"
msgstr "Общий доÑтуп к {item} Ñ {user}"
-#: js/share.js:423
+#: js/share.js:476
msgid "Unshare"
msgstr "Закрыть общий доÑтуп"
-#: js/share.js:431
+#: js/share.js:484
msgid "notify by email"
msgstr "уведомить по почте"
-#: js/share.js:434
+#: js/share.js:487
msgid "can edit"
msgstr "может редактировать"
-#: js/share.js:436
+#: js/share.js:489
msgid "access control"
msgstr "контроль доÑтупа"
-#: js/share.js:439
+#: js/share.js:492
msgid "create"
msgstr "Ñоздать"
-#: js/share.js:442
+#: js/share.js:495
msgid "update"
msgstr "обновить"
-#: js/share.js:445
+#: js/share.js:498
msgid "delete"
msgstr "удалить"
-#: js/share.js:448
+#: js/share.js:501
msgid "share"
msgstr "открыть доÑтуп"
-#: js/share.js:721
+#: js/share.js:803
msgid "Password protected"
msgstr "Защищено паролем"
-#: js/share.js:734
+#: js/share.js:822
msgid "Error unsetting expiration date"
msgstr "Ошибка при отмене Ñрока доÑтупа"
-#: js/share.js:752
+#: js/share.js:843
msgid "Error setting expiration date"
msgstr "Ошибка при уÑтановке Ñрока доÑтупа"
-#: js/share.js:777
+#: js/share.js:872
msgid "Sending ..."
msgstr "ОтправлÑетÑÑ ..."
-#: js/share.js:788
+#: js/share.js:883
msgid "Email sent"
msgstr "ПиÑьмо отправлено"
-#: js/share.js:812
+#: js/share.js:907
msgid "Warning"
msgstr "Предупреждение"
@@ -477,18 +493,19 @@ msgstr "Ошибка загрузки шаблона диалога: {error}"
msgid "No tags selected for deletion."
msgstr "Ðе выбраны меток Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "При обновлении произошла ошибка. ПожалуйÑта Ñообщите об Ñтом в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud ÑообщеÑтво</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Обновление прошло уÑпешно. ПеренаправлÑемÑÑ Ð² Ваш ownCloud..."
@@ -635,7 +652,7 @@ msgid ""
"just letting you know that %s shared %s with you.\n"
"View it: %s\n"
"\n"
-msgstr "ЗдравÑтвуйте,\n\nпроÑто даём вам знать, что %s раÑшарил %s Ð´Ð»Ñ Ð²Ð°Ñ.\nПоÑмотреть: %s\n\n"
+msgstr "ЗдравÑтвуйте,\n\n%s предоÑтавил Вам доÑтуп к %s.\nПоÑмотреть: %s\n\n"
#: templates/altmail.php:4 templates/mail.php:17
#, php-format
@@ -644,7 +661,7 @@ msgstr "ДоÑтуп пропадет в %s"
#: templates/altmail.php:7 templates/mail.php:20
msgid "Cheers!"
-msgstr "ПриветÑтвуем!"
+msgstr "Удачи!"
#: templates/installation.php:25 templates/installation.php:32
#: templates/installation.php:39
@@ -689,6 +706,10 @@ msgstr "Ð”Ð»Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸, как правильно наÑтроит
msgid "Create an <strong>admin account</strong>"
msgstr "Создать <strong>учётную запиÑÑŒ админиÑтратора</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Пароль"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "СиÑтема Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… & база данных"
@@ -792,7 +813,7 @@ msgstr "Ðльтернативные имена пользователÑ"
msgid ""
"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
"with you.<br><a href=\"%s\">View it!</a><br><br>"
-msgstr "ЗдравÑтвуйте,<br><br>проÑто даём вам знать, что %s открыл доÑтуп к %s Ð´Ð»Ñ Ð²Ð°Ñ.<br><a href=\"%s\">ПоÑмотреть!</a><br><br>"
+msgstr "ЗдравÑтвуйте,<br><br>%s предоÑтавил Вам доÑтуп к <strong>%s</strong>.<br><a href=\"%s\">ПоÑмотреть</a><br><br>"
#: templates/singleuser.user.php:3
msgid "This ownCloud instance is currently in single user mode."
@@ -814,8 +835,27 @@ msgstr "СпаÑибо за терпение."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Идёт обновление ownCloud до верÑии %s. Ðто может занÑÑ‚ÑŒ некоторое времÑ."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 1910b7f559832aa20651b8f9576d2fad9757065a..3e68e146f15203120980ae55a7dadd0b9a50cdef 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -4,8 +4,10 @@
#
# Translators:
# lord93 <lordakryl@gmail.com>, 2013
+# BuxarNET <buxarnet@gmail.com>, 2014
# Denis Plastinin <denispal@gmail.com>, 2014
# Evgeniy Spitsyn <evgeniy@spitsyn.net>, 2013
+# Gennady <mxiru@mail.ru>, 2014
# jekader <jekader@gmail.com>, 2013
# mogarych <mogarych@mail.ru>, 2014
# eurekafag <rkfg@rkfg.me>, 2013
@@ -20,9 +22,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 08:11+0000\n"
+"Last-Translator: Gennady <mxiru@mail.ru>\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"
@@ -40,7 +42,7 @@ msgstr "Ðевозможно перемеÑтить %s - файл Ñ Ñ‚Ð°ÐºÐ¸Ð¼
msgid "Could not move %s"
msgstr "Ðевозможно перемеÑтить %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° не может быть пуÑтым."
@@ -49,18 +51,18 @@ msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° не может быть пуÑтым."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" Ñто не правильное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ðеправильное имÑ: Ñимволы '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопуÑтимы."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "Целевой каталог был перемещен или удален."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -136,44 +138,48 @@ msgstr "ОтÑутÑтвует временный каталог"
msgid "Failed to write to disk"
msgstr "Ошибка запиÑи на диÑк"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "ÐедоÑтаточно доÑтупного меÑта в хранилище"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Загрузка не удалаÑÑŒ. Ðевозможно найти загружаемый файл"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Загрузка не удалаÑÑŒ. Ðевозможно получить информацию о файле"
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Ðеверный каталог."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Файлы"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Ð’Ñе файлы"
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "Ðевозможно загрузить {filename}, так как Ñто либо каталог, либо файл нулевого размера"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "Полный размер файла {size1} превышает лимит по загрузке {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Ðе доÑтаточно Ñвободного меÑта, Ð’Ñ‹ загружаете {size1} но оÑталоÑÑŒ только {size2}"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Загрузка отменена."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Ðе удалоÑÑŒ получить ответ от Ñервера."
@@ -186,123 +192,127 @@ msgstr "Идёт загрузка файла. Покинув Ñтраницу,
msgid "URL cannot be empty"
msgstr "СÑылка не может быть пуÑтой."
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1170
msgid "{new_name} already exists"
msgstr "{new_name} уже ÑущеÑтвует"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Ðе удалоÑÑŒ Ñоздать файл"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Ðе удалоÑÑŒ Ñоздать каталог"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Ошибка Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Открыть доÑтуп"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Удалить окончательно"
-#: js/fileactions.js:234
+#: js/fileactions.js:183 templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr "Удалить"
+
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Переименовать"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Идёт подготовка к Ñкачиванию. Ðто может занÑÑ‚ÑŒ некоторое времÑ, еÑли файлы большого размера."
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:596 js/filelist.js:1665
msgid "Pending"
msgstr "Ожидание"
-#: js/filelist.js:916
+#: js/filelist.js:1121
msgid "Error moving file."
-msgstr ""
+msgstr "Ошибка Ð¿ÐµÑ€ÐµÐ¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð°."
-#: js/filelist.js:924
+#: js/filelist.js:1129
msgid "Error moving file"
msgstr "Ошибка при перемещении файла"
-#: js/filelist.js:924
+#: js/filelist.js:1129
msgid "Error"
msgstr "Ошибка"
-#: js/filelist.js:988
+#: js/filelist.js:1207
msgid "Could not rename file"
msgstr "Ðе удалоÑÑŒ переименовать файл"
-#: js/filelist.js:1122
+#: js/filelist.js:1328
msgid "Error deleting file."
msgstr "Ошибка при удалении файла."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1431 templates/list.php:62
msgid "Name"
msgstr "ИмÑ"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1432 templates/list.php:75
msgid "Size"
msgstr "Размер"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1433 templates/list.php:78
msgid "Modified"
msgstr "Дата изменениÑ"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1443 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n каталог"
msgstr[1] "%n каталога"
msgstr[2] "%n каталогов"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1449 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n файл"
msgstr[1] "%n файла"
msgstr[2] "%n файлов"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1573 js/filelist.js:1612
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Закачка %n файла"
msgstr[1] "Закачка %n файлов"
msgstr[2] "Закачка %n файлов"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" Ñто не правильное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°."
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Ваше хранилище заполнено, произведите очиÑтку перед загрузкой новых файлов."
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ваше хранилище почти заполнено ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Приложение Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾, но ваши ключи не инициализированы, пожалуйÑта, перелогиньтеÑÑŒ"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Закрытый ключ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½ÐµÐ´ÐµÐ¹Ñтвителен. Обновите закрытый ключ в личных наÑтройках, чтобы воÑÑтановить доÑтуп к зашифрованным файлам."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -312,12 +322,12 @@ msgstr "Шифрование было отключено, но ваши файл
msgid "{dirs} and {files}"
msgstr "{dirs} и {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s не может быть переименован"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Загружено (max. %s)"
@@ -354,68 +364,71 @@ msgstr "МакÑимальный иÑходный размер Ð´Ð»Ñ ZIP фай
msgid "Save"
msgstr "Сохранить"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "ИÑпользуйте Ñтот адреÑÑ Ð´Ð»Ñ <a href=\"%s\" target=\"_blank\">доÑтупа к вашим файлам через WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Ðовый"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Ðовый текÑтовый файл"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "ТекÑтовый файл"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Ðовый каталог"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Каталог"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Объект по ÑÑылке"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Удалённые файлы"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Отменить загрузку"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "У Ð²Ð°Ñ Ð½ÐµÑ‚ прав Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ или ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² здеÑÑŒ."
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "ЗдеÑÑŒ ничего нет. Загрузите что-нибудь!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Скачать"
-#: templates/index.php:84 templates/index.php:85
-msgid "Delete"
-msgstr "Удалить"
-
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Файл Ñлишком велик"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Файлы, которые вы пытаетеÑÑŒ загрузить, превышают лимит макÑимального размера на Ñтом Ñервере."
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Подождите, файлы ÑканируютÑÑ."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Текущее Ñканирование"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr "Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ ÑканируетÑÑ"
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index d0f028c8df8e63dfc2a2accd90adc7e8500986a6..7ec4b28810b772dfbe0de18d1c1c8a401d9871a0 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -6,6 +6,7 @@
# Ðнт По <du6egub@gmail.com>, 2013
# alfsoft <alfsoft@gmail.com>, 2013
# lord93 <lordakryl@gmail.com>, 2013
+# Gennady <mxiru@mail.ru>, 2014
# jekader <jekader@gmail.com>, 2013
# eurekafag <rkfg@rkfg.me>, 2013
# Swab <swab@i.ua>, 2014
@@ -15,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-28 01:55-0400\n"
-"PO-Revision-Date: 2014-03-27 14:31+0000\n"
-"Last-Translator: Swab <swab@i.ua>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 08:11+0000\n"
+"Last-Translator: Gennady <mxiru@mail.ru>\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"
@@ -84,9 +85,9 @@ msgstr "Ðе могу раÑшифровать файл, возможно Ñто
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°, пожалуйÑта, проверьте ÑиÑтемные наÑтройки или ÑвÑжитеÑÑŒ Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором"
+msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°. ПожалуйÑта, проверьте ÑиÑтемные наÑтройки или ÑвÑжитеÑÑŒ Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором"
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -99,7 +100,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "ПожалуйÑта, убедитеÑÑŒ, что верÑÐ¸Ñ PHP 5.3.3 или новее, а также, что OpenSSL и ÑоответÑтвующее раÑширение PHP включены и правильно наÑтроены. Ðа данный момент приложение ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Ð”Ð»Ñ Ñледующих пользователей шифрование не наÑтроено:"
@@ -119,91 +120,91 @@ msgstr "Перейти прÑмо в"
msgid "personal settings"
msgstr "перÑональные наÑтройки"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Шифрование"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Включить ключ воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ (позволÑет пользователÑм воÑÑтановить файлы при потере паролÑ):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Пароль Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° воÑÑтановлениÑ"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Повторите пароль воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÐºÐ»ÑŽÑ‡Ð°"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Включено"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Отключено"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Сменить пароль Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° воÑÑтановлениÑ:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Старый пароль Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° воÑÑтановлениÑ"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Ðовый пароль Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° воÑÑтановлениÑ"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Повторите новый пароль воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÐºÐ»ÑŽÑ‡Ð°"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Изменить пароль"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Пароль от Ñекретного ключа больше не ÑоответÑтвует паролю входа:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Замените Ñтарый пароль от Ñекретного ключа на новый пароль входа."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "ЕÑли вы не помните Ñвой Ñтарый пароль, вы можете попроÑить Ñвоего админиÑтратора воÑÑтановить ваши файлы"
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Старый пароль Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð°"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Текущйи пароль Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð°"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Обновить пароль от Ñекретного ключа"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Включить воÑÑтановление паролÑ:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Включение Ñтой опции позволит вам получить доÑтуп к Ñвоим зашифрованным файлам в Ñлучае утери паролÑ"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "ÐаÑтройки файла воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Ðевозможно обновить файл воÑÑтановлениÑ"
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index 4fe3bf83865381dd07a5a85f8b17a996bbd39856..09ba8aec7fa1534adc77fddb9c0a0ac40b0ec40e 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -3,14 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# BuxarNET <buxarnet@gmail.com>, 2014
+# anshibanov <shibanovan@yandex.ru>, 2014
# Swab <swab@i.ua>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-23 21:22+0000\n"
+"Last-Translator: BuxarNET <buxarnet@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"
@@ -20,157 +22,161 @@ msgstr ""
#: appinfo/app.php:34
msgid "Local"
-msgstr ""
+msgstr "Локально"
-#: appinfo/app.php:36
+#: appinfo/app.php:37
msgid "Location"
msgstr "МеÑтоположение"
-#: appinfo/app.php:39
+#: appinfo/app.php:40
msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
-#: appinfo/app.php:41
+#: appinfo/app.php:43
msgid "Key"
msgstr ""
-#: appinfo/app.php:42
+#: appinfo/app.php:44
msgid "Secret"
msgstr ""
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
msgid "Bucket"
msgstr ""
-#: appinfo/app.php:47
+#: appinfo/app.php:49
msgid "Amazon S3 and compliant"
msgstr ""
-#: appinfo/app.php:49
+#: appinfo/app.php:52
msgid "Access Key"
msgstr ""
-#: appinfo/app.php:50
+#: appinfo/app.php:53
msgid "Secret Key"
msgstr ""
-#: appinfo/app.php:52
+#: appinfo/app.php:55
msgid "Hostname (optional)"
-msgstr ""
+msgstr "ХоÑÑ‚ (опц.)"
-#: appinfo/app.php:53
+#: appinfo/app.php:56
msgid "Port (optional)"
-msgstr ""
+msgstr "Порт (опц.)"
-#: appinfo/app.php:54
+#: appinfo/app.php:57
msgid "Region (optional)"
-msgstr ""
+msgstr "Регион (опционально)"
-#: appinfo/app.php:55
+#: appinfo/app.php:58
msgid "Enable SSL"
-msgstr ""
+msgstr "Включить SSL"
-#: appinfo/app.php:56
+#: appinfo/app.php:59
msgid "Enable Path Style"
msgstr ""
-#: appinfo/app.php:63
+#: appinfo/app.php:67
msgid "App key"
msgstr ""
-#: appinfo/app.php:64
+#: appinfo/app.php:68
msgid "App secret"
msgstr ""
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "СÑылка"
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
+msgid "Host"
+msgstr "Сервер"
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
msgid "Username"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
msgid "Password"
msgstr "Пароль"
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
msgid "Root"
msgstr ""
-#: appinfo/app.php:77
+#: appinfo/app.php:82
msgid "Secure ftps://"
-msgstr ""
+msgstr "БезопаÑный ftps://"
-#: appinfo/app.php:84
+#: appinfo/app.php:90
msgid "Client ID"
msgstr ""
-#: appinfo/app.php:85
+#: appinfo/app.php:91
msgid "Client secret"
msgstr ""
-#: appinfo/app.php:92
+#: appinfo/app.php:98
msgid "OpenStack Object Storage"
msgstr ""
-#: appinfo/app.php:94
+#: appinfo/app.php:101
msgid "Username (required)"
-msgstr ""
+msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ (обÑз.)"
-#: appinfo/app.php:95
+#: appinfo/app.php:102
msgid "Bucket (required)"
msgstr ""
-#: appinfo/app.php:96
+#: appinfo/app.php:103
msgid "Region (optional for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:97
+#: appinfo/app.php:104
msgid "API Key (required for Rackspace Cloud Files)"
msgstr ""
-#: appinfo/app.php:98
+#: appinfo/app.php:105
msgid "Tenantname (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:99
+#: appinfo/app.php:106
msgid "Password (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:100
+#: appinfo/app.php:107
msgid "Service Name (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:101
+#: appinfo/app.php:108
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:102
+#: appinfo/app.php:109
msgid "Timeout of HTTP requests in seconds (optional)"
msgstr ""
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
msgid "Share"
msgstr "Открыть доÑтуп"
-#: appinfo/app.php:119
+#: appinfo/app.php:127
msgid "SMB / CIFS using OC login"
msgstr ""
-#: appinfo/app.php:122
+#: appinfo/app.php:131
msgid "Username as share"
msgstr ""
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:141 appinfo/app.php:152
+msgid "URL"
+msgstr "СÑылка"
+
+#: appinfo/app.php:145 appinfo/app.php:156
msgid "Secure https://"
-msgstr ""
+msgstr "БезопаÑный https://"
-#: appinfo/app.php:144
+#: appinfo/app.php:155
msgid "Remote subfolder"
msgstr ""
@@ -198,29 +204,29 @@ msgstr "Ошибка при наÑтройке хранилища Google Drive"
msgid "Saved"
msgstr "Сохранено"
-#: lib/config.php:598
+#: lib/config.php:674
msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>Примечание:</b> "
-#: lib/config.php:608
+#: lib/config.php:684
msgid " and "
-msgstr ""
+msgstr "и"
-#: lib/config.php:630
+#: lib/config.php:706
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Примечание:</b> Поддержка cURL в PHP не включена или не уÑтановлен модуль. Подключение %s невозможно. ОбратитеÑÑŒ к вашему ÑиÑтемному админиÑтратору."
-#: lib/config.php:632
+#: lib/config.php:708
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:710
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -249,7 +255,7 @@ msgstr "Опции"
#: templates/settings.php:12
msgid "Available for"
-msgstr ""
+msgstr "ДоÑтупно длÑ"
#: templates/settings.php:32
msgid "Add storage"
@@ -257,7 +263,7 @@ msgstr "Добавить ноÑитель данных"
#: templates/settings.php:92
msgid "No user or group"
-msgstr ""
+msgstr "Ðет Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ группы"
#: templates/settings.php:95
msgid "All Users"
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index ee2be041f34857ca020e2490e495aac50459aa40..8d1f89b336ccc82a085ef39051955e7b452e9e4d 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -3,7 +3,9 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# jekader <jekader@gmail.com>, 2014
# mogarych <mogarych@mail.ru>, 2014
+# ppzabortsev <ppz2001@mail.ru>, 2014
# Victor Bravo <>, 2013
# not_your_conscience <hex.void@gmail.com>, 2013
# Den4md <denstarr@mail.md>, 2013
@@ -11,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -21,13 +23,37 @@ msgstr ""
"Language: ru\n"
"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);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "ДоÑтуп открыл {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
-msgstr "Общий реÑÑƒÑ€Ñ Ð·Ð°Ñ‰Ð¸Ñ‰Ñ‘Ð½ паролем"
+msgstr "Ð”Ð»Ñ Ð´Ð¾Ñтупа к информации необходимо ввеÑти пароль"
#: templates/authenticate.php:7
msgid "The password is wrong. Try again."
@@ -37,9 +63,17 @@ msgstr "Ðеверный пароль. Попробуйте еще раз."
msgid "Password"
msgstr "Пароль"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+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:"
@@ -51,25 +85,25 @@ 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:21
msgid "Download"
msgstr "Скачать"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
-msgstr ""
+msgstr "Скачать %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "ПрÑÐ¼Ð°Ñ ÑÑылка"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index 39a39c11b03b4b3c417f8623cf1dae03d52b4aa4..fd7945571abb18730855d74463b98f3508dffb84 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -29,38 +29,34 @@ msgstr "%s не может быть удалён навÑегда"
msgid "Couldn't restore %s"
msgstr "%s не может быть воÑÑтановлен"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Удалённые файлы"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "ВоÑÑтановить"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Ошибка"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Удаленные файлы"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "воÑÑтановлен"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "ЗдеÑÑŒ ничего нет. Ваша корзина пуÑта!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "ИмÑ"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "ВоÑÑтановить"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Удалён"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Удалить"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 935533a1a5ff70aa9b51bfd2ed136198d2b23467..50f905461f13d442a8564058c9b90fe993f1d186 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -5,6 +5,7 @@
# Translators:
# Alexander Shashkevych <alex@stunpix.com>, 2013
# jekader <jekader@gmail.com>, 2013
+# tukos, 2014
# eurekafag <rkfg@rkfg.me>, 2013
# sk.avenger <sk.avenger@adygnet.ru>, 2013
# unixoid <victor.ashirov@gmail.com>, 2013
@@ -14,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -24,11 +25,11 @@ msgstr ""
"Language: ru\n"
"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);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -83,23 +84,23 @@ msgstr "Изображение повреждено"
msgid "web services under your control"
msgstr "веб-ÑервиÑÑ‹ под вашим управлением"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP-Ñкачивание отключено."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Файлы должны быть загружены по одному."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Ðазад к файлам"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Выбранные файлы Ñлишком велики, чтобы Ñоздать zip файл."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -175,7 +176,7 @@ msgstr "Токен проÑрочен. Перезагрузите Ñтраниц
#: private/json.php:74
msgid "Unknown user"
-msgstr ""
+msgstr "ÐеизвеÑтный пользователь"
#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
@@ -217,7 +218,7 @@ msgstr "Ð’Ñ‹ должны войти или в ÑущеÑтвующий акка
#: private/setup/mysql.php:12
msgid "MySQL/MariaDB username and/or password not valid"
-msgstr ""
+msgstr " Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль MySQL/MariaDB не дейÑтвительны."
#: private/setup/mysql.php:67 private/setup/oci.php:54
#: private/setup/oci.php:121 private/setup/oci.php:144
@@ -245,20 +246,20 @@ msgstr "Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° была: \"%s\""
#: private/setup/mysql.php:85
#, php-format
msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "Пользователь MySQL '%s'@'localhost' уже ÑущеÑтвует."
#: private/setup/mysql.php:86
msgid "Drop this user from MySQL/MariaDB"
-msgstr ""
+msgstr "Удалить данного учаÑтника из MySQL/MariaDB"
#: private/setup/mysql.php:91
#, php-format
msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "Пользователь MySQL '%s'@'%%' уже ÑущеÑтвует."
#: private/setup/mysql.php:92
msgid "Drop this user from MySQL/MariaDB."
-msgstr ""
+msgstr "Удалить данного учаÑтника из MySQL/MariaDB."
#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
@@ -285,127 +286,138 @@ msgstr "УÑтановить Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ admin."
msgid "Set an admin password."
msgstr "Ñтановит пароль Ð´Ð»Ñ admin."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ваш веб Ñервер до Ñих пор не наÑтроен правильно Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñти Ñинхронизации файлов, похоже что проблема в неиÑправноÑти интерфейÑа WebDAV."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "ПожалуйÑта, дважды проÑмотрите <a href='%s'>инÑтрукции по уÑтановке</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s поделилÑÑ Â»%s« Ñ Ð²Ð°Ð¼Ð¸"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
#, php-format
-msgid "Sharing %s failed, because the user %s is the item owner"
+msgid "You are not allowed to share %s"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:526
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, пользователь %s уже ÑвлÑетÑÑ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†ÐµÐ¼"
+
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
-msgstr ""
+msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, пользователь %s не ÑущеÑтвует."
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
-msgstr ""
+msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s ,в виду того что, объект уже находитьÑÑ Ð² общем доÑтупе Ñ %s"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
-msgstr ""
+msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, группа %s не ÑущеÑтвует."
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, %s не ÑвлÑетÑÑ Ñ‡Ð»ÐµÐ½Ð¾Ð¼ группы %s"
+
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
-msgstr ""
+msgstr "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, потому что обмен Ñо ÑÑылками не допуÑкаетÑÑ"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
-msgstr ""
+msgstr "Такой втд общего доÑтупа как %s не допуÑтим Ð´Ð»Ñ %s"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
-msgstr ""
+msgstr "ÐаÑтройка прав доÑтупа Ð´Ð»Ñ %s невозможна, поÑкольку права доÑтупа превышают предоÑтавленные права доÑтупа %s"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
-msgstr ""
+msgstr "Ðе удалоÑÑŒ произвеÑти наÑтройку прав доÑтупа Ð´Ð»Ñ %s , Ñлемент не был найден."
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ \"%s\" не найдена"
@@ -466,7 +478,7 @@ msgstr "неÑколько лет назад"
msgid ""
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
"\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "Только Ñледующие Ñимволы допуÑкаютÑÑ Ð² имени пользователÑ: \"a-z\", \"A-Z\", \"0-9\", и \"_.@-\""
#: private/user/manager.php:237
msgid "A valid username must be provided"
@@ -478,4 +490,4 @@ msgstr "Укажите валидный пароль"
#: private/user/manager.php:246
msgid "The username is already being used"
-msgstr ""
+msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐ¶Ðµ иÑпользуетÑÑ"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index e87df00e1fc9a58aad71426436b01e853e6bdc01..377c02501e8b253b675d20bc498515c1d6e5c109 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -12,6 +12,7 @@
# Evgeniy Spitsyn <evgeniy@spitsyn.net>, 2013
# jekader <jekader@gmail.com>, 2013
# eurekafag <rkfg@rkfg.me>, 2013
+# anshibanov <shibanovan@yandex.ru>, 2014
# stushev, 2014
# unixoid <victor.ashirov@gmail.com>, 2013
# vsapronov <vladimir.sapronov@gmail.com>, 2013
@@ -24,9 +25,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: Denis Plastinin <denispal@gmail.com>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -64,15 +65,15 @@ msgstr "ПиÑьмо отправлено"
msgid "You need to set your user email before being able to send test emails."
msgstr "Ð’Ñ‹ должны наÑтроить Ñвой e-mail Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€ÐµÐ¶Ð´Ðµ чем отправлÑÑ‚ÑŒ теÑтовые ÑообщениÑ."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Отправить Ñообщение"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Шифрование"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Метод проверки подлинноÑти"
@@ -103,16 +104,26 @@ msgstr "Ðевозможно добавить группу"
#: ajax/decryptall.php:31
msgid "Files decrypted successfully"
-msgstr ""
+msgstr "Дешифрование файлов прошло уÑпешно"
#: ajax/decryptall.php:33
msgid ""
"Couldn't decrypt your files, please check your owncloud.log or ask your "
"administrator"
-msgstr ""
+msgstr "Ошибка при дешифровании файлов. ОбратитеÑÑŒ к вашему ÑиÑтемному админиÑтратору. Доп Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð² owncloud.log"
#: ajax/decryptall.php:36
msgid "Couldn't decrypt your files, check your password and try again"
+msgstr "Ошибка при дешифровании файлов. Проверьте Ваш пароль и повторите попытку"
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
msgstr ""
#: ajax/lostpassword.php:12
@@ -131,6 +142,16 @@ msgstr "Ðевозможно удалить группу"
msgid "Unable to delete user"
msgstr "Ðевозможно удалить пользователÑ"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ ÑƒÑпешно воÑÑтановлена"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Язык изменён"
@@ -186,7 +207,7 @@ msgstr "ИÑпользуемый механизм не поддерживает
msgid "Unable to change password"
msgstr "Ðевозможно изменить пароль"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "ОтправлÑетÑÑ ..."
@@ -242,34 +263,42 @@ msgstr "Обновить"
msgid "Updated"
msgstr "Обновлено"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Выберите картинку профилÑ"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Очень Ñлабый пароль"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Слабый пароль"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Так Ñебе пароль"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Хороший пароль"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "УÑтойчивый к взлому пароль"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "РаÑшифровка файлов... ПожалуйÑта, подождите, Ñто может занÑÑ‚ÑŒ некоторое времÑ."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "удален"
@@ -282,8 +311,8 @@ msgstr "отмена"
msgid "Unable to remove user"
msgstr "Ðевозможно удалить пользователÑ"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Группы"
@@ -315,7 +344,7 @@ msgstr "Укажите валидный пароль"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Предупреждение: домашнÑÑ Ð¿Ð°Ð¿ÐºÐ° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ \"{user}\" уже ÑущеÑтвует"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "РуÑÑкий "
@@ -383,7 +412,7 @@ msgid ""
"root."
msgstr "Похоже, что папка Ñ Ð’Ð°ÑˆÐ¸Ð¼Ð¸ данными и Ваши файлы доÑтупны из интернета. Файл .htaccess не работает. Мы наÑтойчиво предлагаем Вам Ñконфигурировать вебÑервер таким образом, чтобы папка Ñ Ð’Ð°ÑˆÐ¸Ð¼Ð¸ данными более не была доÑтупна или перемеÑтите папку Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸ куда-нибудь в другое меÑто вне оÑновной папки документов вебÑервера."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Предупреждение уÑтановки"
@@ -398,53 +427,65 @@ msgstr "Веб-Ñервер до Ñих пор не наÑтроен Ð´Ð»Ñ Ð²Ð¾
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "ПожалуйÑта, дважды проÑмотрите <a href='%s'>инÑтрукции по уÑтановке</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Модуль 'fileinfo' отÑутÑтвует"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "PHP-модуль 'fileinfo' отÑутÑтвует. Мы наÑтоÑтельно рекомендуем включить Ñтот модуль Ð´Ð»Ñ ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ñ‚Ð¸Ð¿Ð¾Ð² (mime-type) файлов."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Ваша верÑÐ¸Ñ PHP уÑтарела"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Ваша верÑÐ¸Ñ PHP уÑтарела. Мы наÑтоÑтельно рекомендуем обновитьÑÑ Ð´Ð¾ 5.3.8 или новее, так как Ñтарые верÑии работают не корректно. Вполне возможно, что Ñта уÑтановка не работает должным образом."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Ð›Ð¾ÐºÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ðµ работает"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Ðевозможно уÑтановить ÑиÑтемную локаль, поддерживающую UTF-8"
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Ðто значит, что могут быть проблемы Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ Ñимволами в именах файлов."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Мы наÑтоÑтельно рекомендуем уÑтановить требуемые пакеты в ÑиÑтему, Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ одной из Ñледующих локалей: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Интернет-Ñоединение не работает"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -453,198 +494,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Ðтот Ñервер не имеет Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº Ñети интернет. Ðто значит, что некоторые возможноÑти, такие как подключение внешних диÑков, ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾Ð± обновлениÑÑ… или уÑтановка Ñторонних приложений – не работают. Удалённый доÑтуп к файлам и отправка уведомлений по Ñлектронной почте вероÑтнее вÑего тоже не будут работать. Предлагаем включить Ñоединение Ñ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ð¾Ð¼ Ð´Ð»Ñ Ñтого Ñервера, еÑли Ð’Ñ‹ хотите иметь вÑе возможноÑти."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Планировщик задач по раÑпиÑанию"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "ВыполнÑÑ‚ÑŒ одно задание Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ загруженной Ñтраницей"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php зарегеÑтрирован в webcron и будет вызыватьÑÑ ÐºÐ°Ð¶Ð´Ñ‹Ðµ 15 минут по http."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "ИÑпользовать ÑиÑтемный cron Ð´Ð»Ñ Ð²Ñ‹Ð·Ð¾Ð²Ð° cron.php каждые 15 минут."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Общий доÑтуп"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Включить API общего доÑтупа"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Позволить приложениÑм иÑпользовать API общего доÑтупа"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Разрешить ÑÑылки"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Разрешить пользователÑм открывать в общий доÑтуп Ñлементы Ñ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¾Ð¹ ÑÑылкой"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Разрешить открытые загрузки"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Разрешить пользователÑм позволÑÑ‚ÑŒ другим загружать в их открытые папки"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Разрешить пользователÑм открывать в общий доÑтуп Ñлементы Ñ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¾Ð¹ ÑÑылкой"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Разрешить переоткрытие общего доÑтупа"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Позволить пользователÑм открывать общий доÑтуп к Ñллементам уже открытым в общий доÑтуп"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Разрешить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´ÐµÐ»Ð°Ñ‚ÑŒ общий доÑтуп любому"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Разрешить пользователÑм делать общий доÑтуп только Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ их групп"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Разрешить уведомление по почте"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
-msgstr ""
+msgstr "Разрешить пользователю оповещать почтой о раÑшаренных файлах"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "БезопаÑноÑÑ‚ÑŒ"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Принудить к HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Принудить клиентов подключатьÑÑ Ðº %s через шифрованное Ñоединение."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "ПожалуйÑта, подключитеÑÑŒ к %s иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ HTTPS чтобы включить или отключить принудительное SSL."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Сервер почты"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "ИÑпользуетÑÑ Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ уведомлений."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "ÐÐ´Ñ€ÐµÑ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÐµÐ»Ñ"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "ТребуетÑÑ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ "
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "ÐÐ´Ñ€ÐµÑ Ñервера"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Порт"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "ПолномочиÑ"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "Пароль"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "ТеÑÑ‚ наÑтроек"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Отправить Ñообщение"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Журнал"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Уровень детализации журнала"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Больше"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Меньше"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "ВерÑиÑ"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -797,29 +846,33 @@ msgstr "Язык"
msgid "Help translate"
msgstr "Помочь Ñ Ð¿ÐµÑ€ÐµÐ²Ð¾Ð´Ð¾Ð¼"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "ИÑпользуйте Ñтот адреÑÑ Ð´Ð»Ñ <a href=\"%s\" target=\"_blank\">доÑтупа к вашим файлам через WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "Приложение Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾, пожалуйÑта, раÑшифруйте ваши файлы"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Пароль входа"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "СнÑÑ‚ÑŒ шифрование Ñо вÑех файлов"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index 1985f56bda587f677c992cb2fbac07db0a29b2aa..9762a06ac1cb9f94a99305e4e566819460de4f89 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -7,9 +7,10 @@
# Fenuks <fenuksuh@ya.ru>, 2013
# alfsoft <alfsoft@gmail.com>, 2013
# Denis Plastinin <denispal@gmail.com>, 2014
-# jekader <jekader@gmail.com>, 2013
+# jekader <jekader@gmail.com>, 2013-2014
# Евгений БелоуÑов <kvantor12@gmail.com>, 2013
# mogarych <mogarych@mail.ru>, 2014
+# ppzabortsev <ppz2001@mail.ru>, 2014
# unixoid <victor.ashirov@gmail.com>, 2013
# vsapronov <vladimir.sapronov@gmail.com>, 2013
# not_your_conscience <hex.void@gmail.com>, 2013
@@ -18,9 +19,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: Denis Plastinin <denispal@gmail.com>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 12:11+0000\n"
+"Last-Translator: ppzabortsev <ppz2001@mail.ru>\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"
@@ -81,6 +82,10 @@ msgstr "ПринÑÑ‚ÑŒ наÑтройки из поÑледней конфигу
msgid "Keep settings?"
msgstr "Сохранить наÑтройки?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Сервер"
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Ðе получилоÑÑŒ добавить конфигурацию Ñервера"
@@ -97,6 +102,18 @@ msgstr "УÑпешно"
msgid "Error"
msgstr "Ошибка"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Ðеобходимо указать Base DN"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Ðевозможно определить Base DN"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Укажите порт"
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð² порÑдке"
@@ -137,7 +154,7 @@ msgstr "Ð’Ñ‹ дейÑтвительно хотите удалить ÑущеÑÑ‚
msgid "Confirm Deletion"
msgstr "Подтверждение удалениÑ"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -145,7 +162,7 @@ msgstr[0] "%s группа найдена"
msgstr[1] "%s группы найдены"
msgstr[2] "%s групп найдено"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -153,14 +170,30 @@ msgstr[0] "%s пользователь найден"
msgstr[1] "%s Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾"
msgstr[2] "%s пользователей найдено"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Ðеверный Ñервер"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Ðе могу найти требуемой функциональноÑти"
+#: settings.php:52
+msgid "Server"
+msgstr "Сервер"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Пользователи"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Логин"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Фильтр группы"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Сохранить"
@@ -176,7 +209,7 @@ msgstr "Помощь"
#: templates/part.wizard-groupfilter.php:4
#, php-format
msgid "Groups meeting these criteria are available in %s:"
-msgstr ""
+msgstr "Группы, отвечающие Ñтим критериÑм доÑтупны в %s:"
#: templates/part.wizard-groupfilter.php:8
#: templates/part.wizard-userfilter.php:8
@@ -212,7 +245,7 @@ msgstr "групп найдено"
#: templates/part.wizard-loginfilter.php:4
msgid "Users login with this attribute:"
-msgstr ""
+msgstr "Пользователи пользуютÑÑ Ñтим атрибутом Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð°:"
#: templates/part.wizard-loginfilter.php:8
msgid "LDAP Username:"
@@ -233,10 +266,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "ОпределÑет фильтр Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ попытке входа. %%uid заменÑет Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ входе в ÑиÑтему. Ðапример: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Сервер"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Сервер:"
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Добавить конфигурацию Ñервера"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Удалить конфигурацию"
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Сервер"
@@ -300,6 +346,14 @@ msgstr "Ðазад"
msgid "Continue"
msgstr "Продолжить"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "ÐкÑперт"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Дополнительно"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
@@ -424,24 +478,24 @@ msgstr "ÐÑÑÐ¾Ñ†Ð¸Ð°Ñ†Ð¸Ñ Ð“Ñ€ÑƒÐ¿Ð¿Ð°-УчаÑтник"
#: templates/settings.php:39
msgid "Nested Groups"
-msgstr ""
+msgstr "Вложенные группы"
#: templates/settings.php:39
msgid ""
"When switched on, groups that contain groups are supported. (Only works if "
"the group member attribute contains DNs.)"
-msgstr ""
+msgstr "При включении, активируетÑÑ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ° групп, Ñодержащих другие группы. (Работает только еÑли атрибут член группы Ñодержит DN.)"
#: templates/settings.php:40
msgid "Paging chunksize"
-msgstr ""
+msgstr "ПоÑтраничный chunksize"
#: templates/settings.php:40
msgid ""
"Chunksize used for paged LDAP searches that may return bulky results like "
"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
"those situations.)"
-msgstr ""
+msgstr "ChunkSize иÑпользуетÑÑ Ð² Ñтраничных поиÑках LDAP которые могут возвращать громоздкие результаты, как например ÑпиÑки пользователей или групп. (ÐаÑтройка его в \"0\" отключает Ñтраничный поиÑк LDAP Ð´Ð»Ñ Ñ‚Ð°ÐºÐ¸Ñ… Ñитуаций.)"
#: templates/settings.php:42
msgid "Special Attributes"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 17ca0d4e7758378ebbcb017446ba525c3ca79a3c..a0d043e763742cfc235dc5b189e8cbf7e7369090 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "ඉරිදà·"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "සඳුදà·"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "අඟහරුවà·à¶¯à·"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "බදà·à¶¯à·"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "බ්â€à¶»à·„ස්පà¶à·’න්දà·"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "සිකුරà·à¶¯à·"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "සෙනසුරà·à¶¯à·"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "ජනවà·à¶»à·’"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "පෙබරවà·à¶»à·’"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "මà·à¶»à·Šà¶à·”"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "අප්â€à¶»à·šà¶½à·Š"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "මà·à¶ºà·’"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "ජූනි"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "ජූලි"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "අගà·à·ƒà·Šà¶à·”"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "à·ƒà·à¶´à·Šà¶à·à¶¸à·Šà¶¶à¶»à·Š"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "ඔක්à¶à·à¶¶à¶»"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "නොවà·à¶¸à·Šà¶¶à¶»à·Š"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "දෙසà·à¶¸à·Šà¶¶à¶»à·Š"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "සිටුවම්"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "සුරà·à¶šà·™à¶¸à·’න් පවà¶à·“..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "à¶à¶à·Šà¶´à¶»à¶ºà¶±à·Šà¶§ පෙර"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "අද"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "ඊයේ"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "පෙර මà·à·ƒà¶ºà·š"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "පෙර අවුරුද්දේ"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "අවුරුදු කීපයකට පෙර"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "à¶à·à¶»à¶±à·Šà¶±"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "ඔව්"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "එපà·"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "à¶à·à¶»à¶±à·Šà¶±"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "හරි"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "එපà·"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr "බෙද෠හද෠ගන්න"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "දà·à·‚යක්"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "මුර පදයකින් ආරක්à·à·à¶šà¶»à¶±à·Šà¶±"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "මුර පදය"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "කල් ඉකුà¶à·Š විමේ දිනය දමන්න"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "කල් ඉකුà¶à·Š විමේ දිනය"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "විද්â€à¶ºà·”à¶à·Š à¶à·à¶´à·‘ල මඟින් බෙදà·à¶œà¶±à·Šà¶±: "
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "කණ්ඩà·à¶ºà¶¸"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "නොබෙදු"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "සංස්කරණය කළ à·„à·à¶š"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "ප්â€à¶»à·€à·šà· පà·à¶½à¶±à¶º"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "සදන්න"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "යà·à·€à¶à·Šà¶šà·à¶½à·“න කරන්න"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "මකන්න"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "බෙදà·à·„දà·à¶œà¶±à·Šà¶±"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "මුර පදයකින් ආරක්à·à·à¶šà¶» ඇà¶"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "කල් ඉකුà¶à·Š දිනය ඉවà¶à·Š කිරීමේ දà·à·‚යක්"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "කල් ඉකුà¶à·Š දිනය ස්ථà·à¶´à¶±à¶º කිරීමේ දà·à·‚යක්"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "අවවà·à¶¯à¶º"
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "මුර පදය"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index d729db2879871ed528eed22a9d4c73655b2aebc7..f81a527686423f5826fcd7115d4bc4cf38960e85 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr "à¶à·à·€à¶šà·à¶½à·’ක ෆොල්ඩරයක් අà¶à·”රුද
msgid "Failed to write to disk"
msgstr "à¶à·à¶§à·’ගචකිරීම අසà·à¶»à·Šà¶®à¶šà¶ºà·’"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "ගොනු"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "උඩුගචකිරීම අà¶à·Š හරින්න ලදී"
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr "උඩුගà¶à¶šà·’රීමක් සිදුවේ. පිටුව
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "බෙද෠හද෠ගන්න"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "නà·à·€à¶ නම් කරන්න"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "දà·à·‚යක්"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "නම"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "ප්â€à¶»à¶¸à·à¶«à¶º"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "වෙනස් කළ"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr "ZIP ගොනු සඳහ෠දà·à¶¸à·’ය à·„à·à¶šà·’ උපරි
msgid "Save"
msgstr "සුරකින්න"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "නව"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "පෙළ ගොනුව"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "à·†à·à¶½à·Šà¶©à¶»à¶º"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "යොමුවෙන්"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "උඩුගචකිරීම අà¶à·Š හරින්න"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "මෙහි කිසිවක් නොමà·à¶. යමක් උඩුගචකරන්න"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "බà·à¶±à·Šà¶±"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "මක෠දමන්න"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "උඩුගචකිරීම විà·à·à¶½ à·€à·à¶©à·’ය"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "ඔබ උඩුගචකිරීමට à¶à·à¶à·Š කරන ගොනු මෙම සේවà·à¶¯à·à¶ºà¶šà¶ºà· උඩුගචකිරීමට ඉඩදී ඇà¶à·’ උපරිම ගොනු විà·à·à¶½à¶à·Šà·€à¶ºà¶§ වඩ෠වà·à¶©à·’ය"
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "ගොනු පරික්ෂ෠කෙරේ. මඳක් රà·à¶³à·“ සිටින්න"
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "වර්à¶à¶¸à·à¶± පරික්ෂà·à·€"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po
index bd5b1eb2e317db03ea1dec65a74716e23f97af14..2911fb32a1064c8755f66ba748230eafa995b09f 100644
--- a/l10n/si_LK/files_encryption.po
+++ b/l10n/si_LK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "ගුප්චකේà¶à¶±à¶º"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index 92f51a59eb8a09b0370003c91413e73984201717..8394a3d2ec0fa3aa9b0f5b71fe9d11ad15dbee6d 100644
--- a/l10n/si_LK/files_external.po
+++ b/l10n/si_LK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "à·ƒà¶à·Šà¶šà·à¶»à¶šà¶º"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr "Google Drive ගබඩà·à·€ වින්â€à¶ºà·à·ƒ කිරීමේ
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index d6fd9a257666cec21e3b172dff2a2c165f7e555b..b67848d646a780054a30780a0fd6a93dc8586e69 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "මුර පදය"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "බà·à¶±à·Šà¶±"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index c8ef3d0172cbc1efa250aff34a32ac25ad6fb4a7..bf06153c1013a5a5d8b0060dcc5e55a4bf4b0ad3 100644
--- a/l10n/si_LK/files_trashbin.po
+++ b/l10n/si_LK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "දà·à·‚යක්"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "නම"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "මක෠දමන්න"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index f97e6268f91fb9b4253843124a27e33943775162..dd9362adedb6801285df3da6e61c70027dc0e67a 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr "ඔබට පà·à¶½à¶±à¶º කළ à·„à·à¶šà·’ වෙබ් සේවà·à·€à¶±à·Š"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP භà·à¶œà¶ කිරීම් අක්â€à¶»à·’යයි"
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "ගොනු එකින් එක භà·à¶œà¶ යුà¶à·”යි"
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "ගොනු වෙà¶à¶§ නà·à·€à¶ යන්න"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "à¶à·à¶»à·à¶œà¶à·Š ගොනු ZIP ගොනුවක් à¶à·à¶±à·“මට විà·à·à¶½ à·€à·à¶©à·’ය."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 9dfb9732ce12846d4b147ae5e8afbeaafb759dd2..8d12ef5893fd8acf3f31ebaa6aaceff6d3e64e3c 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "ගුප්චකේà¶à¶±à¶º"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "වි-à¶à·à¶´à·‘ල සුරකින ලදී"
@@ -114,6 +124,16 @@ msgstr "කණ්ඩà·à¶ºà¶¸ මà·à¶šà·“මට නොහà·à¶š"
msgid "Unable to delete user"
msgstr "පරිà·à·“ලකය෠මà·à¶šà·“මට නොහà·à¶š"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "භà·à·‚à·à·€ à·à·€à¶±à·ƒà·Š කිරීම"
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr "යà·à·€à¶à·Šà¶šà·à¶½ කිරීම"
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr "නිෂ්ප්â€à¶»à¶· කරන්න"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "කණ්ඩà·à¶ºà¶¸à·Š"
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "හුවමà·à¶»à·” කිරීම"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "යොමු සලසන්න"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "යළි යළිà¶à·Š හුවමà·à¶»à·”වට අවසර දෙමි"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "හුවමà·à¶»à·” කළ හුවමà·à¶»à·”වට අවසර දෙමි"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "ඕනෑම අයෙකු හ෠හුවමà·à¶»à·”වට අවසර දෙමි"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "à¶à¶¸ කණ්ඩà·à¶ºà¶¸à·š අයෙකු හ෠පමණක් හුවමà·à¶»à·”වට අවසර දෙමි"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "සේවà·à¶¯à·à¶ºà¶šà¶ºà·š ලිපිනය"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "à¶à·œà¶§"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "ලà¶à·”à·€"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "à·€à·à¶©à·’"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "අඩු"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr "භà·à·‚à·à·€"
msgid "Help translate"
msgstr "පරිවර්ථන සහය"
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index d52baea5c3f2d5fda95b9a2dc2e32aadd9d3647c..cf42c000c918c314a94dfa20e2bfff80fb189644 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr "à·ƒà·à¶»à·Šà¶®à¶šà¶ºà·’"
msgid "Error"
msgstr "දà·à·‚යක්"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "කණ්ඩà·à¶ºà¶¸à·Š පෙරහන"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "සුරකින්න"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "à·ƒà¶à·Šà¶šà·à¶»à¶šà¶º"
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "දියුණු/උසස්"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index 8a257ae33006abadbac65e3b9846d5db5aa1d255..3bbf79861983635ff6f42c9c6fe215b9b61aea97 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,212 +63,212 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Nedeľa"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Pondelok"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Utorok"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Streda"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Å tvrtok"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Piatok"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sobota"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Január"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Február"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marec"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "AprÃl"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Máj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Jún"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Júl"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Október"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "December"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Nastavenia"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Zrušiť"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -295,140 +300,149 @@ msgstr ""
msgid "Share"
msgstr "Zdieľať"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "skupina"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -460,18 +474,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -672,6 +687,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -797,7 +816,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index 37e8ebb0c60595920e8370b272b8a9089dc9b6ea..79788d5c0d3c30aca2823f72bd5f32a39e8f02db 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,123 +177,123 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Zdieľať"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -299,12 +303,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -341,68 +345,75 @@ msgstr ""
msgid "Save"
msgstr "Uložiť"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Stiahnuť"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Odstrániť"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/sk/files_encryption.po b/l10n/sk/files_encryption.po
index 876401e6a774be63e11207e1360f38eaabead5af..2af59c39656c946f065fa781604df456a38293e7 100644
--- a/l10n/sk/files_encryption.po
+++ b/l10n/sk/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/sk/files_external.po b/l10n/sk/files_external.po
index cbaacdf67076b58989859643b005cafbd42f9f12..1352a7127d55b291d48a0df6deb922bc5523261e 100644
--- a/l10n/sk/files_external.po
+++ b/l10n/sk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/sk/files_sharing.po b/l10n/sk/files_sharing.po
index 0cad146d764575d32f48b2b5420b306ac52fc01f..91a9be3e9e26511a4840d16a2187fe195f1470ae 100644
--- a/l10n/sk/files_sharing.po
+++ b/l10n/sk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "Stiahnuť"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/sk/files_trashbin.po b/l10n/sk/files_trashbin.po
index 11f7b773eaa25cc050ec91a883629bfc16bc9895..c0ddba014a1ba5f41da254e20ff623b117caf2cd 100644
--- a/l10n/sk/files_trashbin.po
+++ b/l10n/sk/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Odstrániť"
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index 47acc400937b8773528d4bfbdf0851b28b8af514..ffd68f79bc80e35ef151e5ad13cba68ac806eda2 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index b9f2f2eb06c01f3f052eaab2f2d896c7f563506b..66aeeeec14b7b78a04c6ec00eb8965954b960016 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index bc1a911c86865d276a69b9aceca1721c5dbdae06..ad9797796f84e84dc9c81de4b683945b6e466e12 100644
--- a/l10n/sk/user_ldap.po
+++ b/l10n/sk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,47 +90,59 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -134,7 +150,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -142,14 +158,30 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Uložiť"
@@ -222,10 +254,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -289,6 +334,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "PokroÄilé"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index ad37637a507609488960d92862ec603ee97c634c..efa14c4a2ce8da5d26a6afd429af08934c304b41 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-02 09:36+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -19,11 +19,11 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr " \t\nDátum expirácie spadá do minulosti."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Nebolo možné odoslaÅ¥ email týmto použÃvateľom: %s "
@@ -40,6 +40,11 @@ msgstr "Mód údržby e vypnutý"
msgid "Updated database"
msgstr "Databáza je aktualizovaná"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Obrázok alebo súbor nebol zadaný"
@@ -60,212 +65,212 @@ msgstr "DoÄasný profilový obrázok nie je k dispozÃcii, skúste to znovu"
msgid "No crop data provided"
msgstr "Dáta pre orezanie neboli zadané"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Nedeľa"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Pondelok"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Utorok"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Streda"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Å tvrtok"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Piatok"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Sobota"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Január"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Február"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Marec"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "AprÃl"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Máj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Jún"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Júl"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "August"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Október"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "December"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Nastavenia"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Ukladám..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "pred sekundami"
-#: js/js.js:1241
+#: js/js.js:1212
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:1242
+#: js/js.js:1213
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:1243
+#: js/js.js:1214
msgid "today"
msgstr "dnes"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "vÄera"
-#: js/js.js:1245
+#: js/js.js:1216
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:1246
+#: js/js.js:1217
msgid "last month"
msgstr "minulý mesiac"
-#: js/js.js:1247
+#: js/js.js:1218
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:1248
+#: js/js.js:1219
msgid "last year"
msgstr "minulý rok"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "pred rokmi"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Vybrať"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Chyba pri nahrávanà šablóny výberu súborov: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ãno"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nie"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Vybrať"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Chyba pri nahrávanà šablóny výberu súborov: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Chyba pri nahrávanà šablóny správy: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} konflikt súboru"
msgstr[1] "{count} konflikty súboru"
msgstr[2] "{count} konfliktov súboru"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Jeden konflikt súboru"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nové súbory"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Už existujúce súbory"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Ktoré súbory chcete ponechať?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Ak zvolÃte obe verzie, názov nakopÃrovaného súboru bude doplnený o ÄÃslo."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Zrušiť"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "PokraÄovaÅ¥"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(všetko vybrané)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} vybraných)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Chyba pri nahrávanà šablóny existencie súboru"
@@ -297,140 +302,149 @@ msgstr "Zdieľané"
msgid "Share"
msgstr "Zdieľať"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Chyba"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Chyba poÄas zdieľania"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Chyba poÄas ukonÄenia zdieľania"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Chyba poÄas zmeny oprávnenÃ"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Zdieľané s vami a so skupinou {group} použÃvateľom {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Zdieľané s vami použÃvateľom {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "ZdieľaÅ¥ s použÃvateľom alebo skupinou ..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Zdieľať linku"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Chrániť heslom"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Heslo"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Povoliť verejné nahrávanie"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Odoslať odkaz emailom"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Odoslať"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Nastaviť dátum expirácie"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Dátum expirácie"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Zdieľať cez email:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "PoužÃvateľ nenájdený"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "skupina"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Zdieľanie už zdieľanej položky nie je povolené"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Zdieľané v {item} s {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Zrušiť zdieľanie"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "informovať emailom"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "môže upraviť"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "prÃstupové práva"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "vytvoriť"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "aktualizovať"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "vymazať"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "zdieľať"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Chránené heslom"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Chyba pri odstraňovanà dátumu expirácie"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Chyba pri nastavenà dátumu expirácie"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Odosielam ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Email odoslaný"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Varovanie"
@@ -462,18 +476,19 @@ msgstr "Chyba pri naÄÃtanà šablóny dialógu: {error}"
msgid "No tags selected for deletion."
msgstr "Nie sú vybraté Å¡tÃtky na zmazanie."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Obnovte prosÃm stránku."
-#: 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 "Aktualizácia nebola úspešná. Problém nahláste <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud comunite</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku."
@@ -674,6 +689,10 @@ msgstr "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a h
msgid "Create an <strong>admin account</strong>"
msgstr "VytvoriÅ¥ <strong>administrátorský úÄet</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Heslo"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Úložislo & databáza"
@@ -799,8 +818,27 @@ msgstr "Ďakujeme za Vašu trpezlivosť."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Aktualizujem ownCloud na verziu %s, môže to chvÃľu trvaÅ¥."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index dc294f53960ffe76843188341f2f068995481db9..811704669c76e2ff8e692011650a0c3a4a99b663 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr "Nie je možné presunúť %s - súbor s týmto menom už existuje"
msgid "Could not move %s"
msgstr "Nie je možné presunúť %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Meno súboru nemôže byť prázdne"
@@ -37,18 +37,18 @@ msgstr "Meno súboru nemôže byť prázdne"
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" je neplatné meno súboru."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "Cieľový prieÄinok bol premiestnený alebo odstránený."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -124,44 +124,48 @@ msgstr "Chýba doÄasný prieÄinok"
msgid "Failed to write to disk"
msgstr "Zápis na disk sa nepodaril"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Nedostatok dostupného úložného priestoru"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Nahrávanie zlyhalo. Nepodarilo sa nájsť nahrávaný súbor"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Nahrávanie zlyhalo. Nepodarilo sa zÃskaÅ¥ informácie o súbore."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Neplatný prieÄinok."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Súbory"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "Nemožno nahraÅ¥ súbor {filename}, pretože je to prieÄinok, alebo má 0 bitov"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "Celková veľkosÅ¥ súboru {size1} prekraÄuje upload limit {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Nie je dostatok voľného miesta, chcete nahraÅ¥ {size1} ale k dispozÃciji je len {size2}"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Odosielanie zrušené."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Nepodarilo sa dostať výsledky zo servera."
@@ -174,123 +178,123 @@ msgstr "Opustenie stránky zrušà práve prebiehajúce odosielanie súboru."
msgid "URL cannot be empty"
msgstr "URL nemôže byť prázdna"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} už existuje"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Nemožno vytvoriť súbor"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Nemožno vytvoriÅ¥ prieÄinok"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Chyba pri naÄÃtavanà URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Zdieľať"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Zmazať trvalo"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Premenovať"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Prebieha"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Chyba pri presúvanà súboru"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Chyba"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Nemožno premenovať súbor"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Chyba pri mazanà súboru."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Názov"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Veľkosť"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Upravené"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
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:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
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:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
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/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" je neplatné meno súboru."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Vaše úložisko je takmer plné ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Aplikácia na Å¡ifrovanie je zapnutá, ale vaÅ¡e kľúÄe nie sú inicializované. Odhláste sa a znovu sa prihláste."
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Chybný súkromný kÄ¾ÃºÄ na Å¡ifrovanie aplikáciÃ. Zaktualizujte si heslo súkromného kľúÄa v svojom osobnom nastavenÃ, aby ste znovu zÃskali prÃstup k svojim zaÅ¡ifrovaným súborom."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -300,12 +304,12 @@ msgstr "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované.
msgid "{dirs} and {files}"
msgstr "{dirs} a {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s nemohol byť premenovaný"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Nahrať (max. %s)"
@@ -342,68 +346,75 @@ msgstr "NajväÄÅ¡ia veľkosÅ¥ ZIP súborov"
msgid "Save"
msgstr "Uložiť"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prÃstup k vaÅ¡im súborom cez WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Nový"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Nový textový súbor"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Textový súbor"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Nový prieÄinok"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "PrieÄinok"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Z odkazu"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Zmazané súbory"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Zrušiť odosielanie"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Nemáte oprávnenie sem nahrávať alebo vytvoriť súbory"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Žiadny súbor. Nahrajte nieÄo!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "SÅ¥ahovanie"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Zmazať"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Nahrávanie je prÃliÅ¡ veľké"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Čakajte, súbory sú prehľadávané."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Práve prezerané"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index 6ce0145b55e13db674a86d42d0f62f8f65cf8bb2..188aebdb56ff85d3e55f1a0e3cd25f079589fe03 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 07:20+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -78,9 +78,9 @@ msgstr "Tento súbor sa nepodarilo dešifrovať, pravdepodobne je zdieľaný. Po
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Neznáma chyba, skontrolujte si vaše systémové nastavenia alebo kontaktujte administrátora"
+msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -93,7 +93,7 @@ msgid ""
" the encryption app has been disabled."
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:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Nasledujúci použÃvatelia nie sú nastavenà pre Å¡ifrovanie:"
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
index 196571e630e73e19319c6b0f6c760325c3a9c1c9..8340c7737ea1b17f0e6e6162080a27b265273d92 100644
--- a/l10n/sk_SK/files_external.po
+++ b/l10n/sk_SK/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Hostiteľ"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,6 +166,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -198,29 +202,29 @@ msgstr "Chyba pri konfigurácii úložiska Google drive"
msgid "Saved"
msgstr "Uložené"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr "<b>Poznámka:</b> "
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr "a"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval."
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Poznámka:</b> FTP podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval."
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index e7583031b5c9e38ad67cfecaf559129bc89c1881..6c518756536e9bcc95a40d830132e8cfba6ae268 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Zdieľa {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Toto zdieľanie je chránené heslom"
@@ -34,6 +58,14 @@ msgstr "Heslo je chybné. Skúste to znova."
msgid "Password"
msgstr "Heslo"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "To je neprÃjemné, ale tento odkaz už nie je funkÄný."
@@ -62,11 +94,11 @@ msgstr "Pre viac informácià kontaktujte osobu, ktorá vám poslala tento odkaz
msgid "Download"
msgstr "SÅ¥ahovanie"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Stiahnuť %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Priama linka"
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index e6224e89fce2748ee045b6f325797901ae97d87e..bc4748a34b35c87ac916d16f4703f445641499cf 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "Nemožno zmazať %s navždy"
msgid "Couldn't restore %s"
msgstr "Nemožno obnoviť %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Zmazané súbory"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Obnoviť"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Chyba"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Zmazané súbory"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "obnovené"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Žiadny obsah. Kôš je prázdny!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Názov"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Obnoviť"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Zmazané"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Zmazať"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index 81f55fae73cfaa699ce8d55e83aaa4445c7fabf4..e7ecfd2154d623046d2f9335b857dc20c5257f6e 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -78,23 +78,23 @@ msgstr "Chybný obrázok"
msgid "web services under your control"
msgstr "webové služby pod Vašou kontrolou"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Sťahovanie súborov ZIP je vypnuté."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Súbory musia byť nahrávané jeden za druhým."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Späť na súbory"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Zvolené súbory sú prÃliÅ¡ veľké na vygenerovanie zip súboru."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -280,127 +280,138 @@ msgstr "Zadajte použÃvateľské meno administrátora."
msgid "Set an admin password."
msgstr "Zadajte heslo administrátora."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
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>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s s vami zdieľa »%s«"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr "Zdieľanie %s zlyhalo, pretože súbor neexistuje"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "Zdieľanie %s zlyhalo, pretože použÃvateľ %s je vlastnÃkom položky"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "Zdieľanie %s zlyhalo, pretože použÃvateľ %s neexistuje"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "Zdieľanie %s zlyhalo, pretože táto položka už je zdieľaná s %s"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "Zdieľanie %s zlyhalo, pretože skupina %s neexistuje"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "Zdieľanie %s zlyhalo, pretože %s nie je Älenom skupiny %s"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "Zdieľanie %s zlyhalo, pretože zdieľanie odkazom nie je povolené"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr "Typ zdieľania %s nie je platný pre %s"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr "Nastavenie povolenà pre %s zlyhalo, pretože povolenia prekraÄujú povolenia udelené %s"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "Nastavenie povolenà pre %s zlyhalo, pretože položka sa nenašla"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Nemožno nájsť danú kategóriu \"%s\""
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 0f278975758b42e4857d90ad0e120d83dfa11bb2..6cdee5356d4be074931bd7192af3cb2f8ae49417 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -49,15 +49,15 @@ msgstr "Email odoslaný"
msgid "You need to set your user email before being able to send test emails."
msgstr "MusÃte nastaviÅ¥ svoj po​​užÃvateľský email, než budete môcÅ¥ odoslaÅ¥ testovacà email."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Mód odosielania"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Å ifrovanie"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "AutentifikaÄná metóda"
@@ -100,6 +100,16 @@ msgstr "Nemožno dešifrovať vaše súbory, skontrolujte svoj owncloud.log aleb
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "Nemožno dešifrovať vaše súbory, skontrolujte svoje heslo a skúste to znova"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Email uložený"
@@ -116,6 +126,16 @@ msgstr "Nie je možné odstrániť skupinu"
msgid "Unable to delete user"
msgstr "Nie je možné odstrániÅ¥ použÃvateľa"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Jazyk zmenený"
@@ -171,7 +191,7 @@ msgstr "Úložisko nepodporuje zmenu hesla, ale Å¡ifrovacà kÄ¾ÃºÄ použÃvate
msgid "Unable to change password"
msgstr "Zmena hesla sa nepodarila"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Odosielam..."
@@ -227,34 +247,42 @@ msgstr "Aktualizovať"
msgid "Updated"
msgstr "Aktualizované"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Vybrať avatara"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Veľmi slabé heslo"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Slabé heslo"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Priemerné heslo"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Dobré heslo"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Silné heslo"
-#: js/personal.js:313
+#: js/personal.js:310
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:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "zmazané"
@@ -267,8 +295,8 @@ msgstr "vrátiť"
msgid "Unable to remove user"
msgstr "Nemožno odobraÅ¥ použÃvateľa"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Skupiny"
@@ -300,7 +328,7 @@ msgstr "MusÃte zadaÅ¥ platné heslo"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Upozornenie: Domovský prieÄinok použÃvateľa \"{user}\" už existuje"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Slovensky"
@@ -368,7 +396,7 @@ msgid ""
"root."
msgstr "Váš prieÄinok s dátami aj vaÅ¡e súbory sú pravdepodobne prÃstupné z internetu. Súbor .htaccess nefunguje. OdporúÄame nakonfigurovaÅ¥ webový server tak, aby prieÄinok s dátami nebol naÄalej prÃstupný, alebo presunúť prieÄinok s dátami mimo priestor sprÃstupňovaný webovým serverom."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Nastavenia oznámenÃ"
@@ -383,53 +411,65 @@ 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 "Skontrolujte prosÃm znovu <a href=\"%s\">inÅ¡talaÄnú prÃruÄku</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Chýba modul 'fileinfo'"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "Chýba modul 'fileinfo'. Dôrazne doporuÄujeme ho povoliÅ¥ pre dosiahnutie najlepÅ¡Ãch výsledkov zisÅ¥ovania mime-typu."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Vaša PHP verzia je zastaraná"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Táto verzia PHP je zastaraná. Dôrazne vám odporúÄame aktualizovaÅ¥ na verziu 5.3.8 alebo novÅ¡iu, lebo starÅ¡ie verzie sú chybné. Je možné, že táto inÅ¡talácia nebude fungovaÅ¥ správne."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Lokalizácia nefunguje"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Nie je možné nastaviť znakovú sadu, ktorá podporuje UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "To znamená, že sa môžu vyskytnúť problémy s niektorými znakmi v názvoch súborov."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Dôrazne doporuÄujeme nainÅ¡talovaÅ¥ na váš systém požadované balÃÄky podporujúce jednu z nasledovných znakových sád: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Pripojenie na internet nefunguje"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -438,198 +478,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Server nemá funkÄné pripojenie k internetu. Niektoré moduly ako napr. externé úložisko, oznámenie o dostupných aktualizáciách alebo inÅ¡talácia aplikácià tretÃch strán nebudú fungovaÅ¥. PrÃstup k súborom z iných miest a odosielanie oznamovacÃch emailov tiež nemusà fungovaÅ¥. Ak chcete využÃvaÅ¥ vÅ¡etky vlastnosti ownCloudu, odporúÄame povoliÅ¥ pripojenie k internetu tomuto serveru."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "Cron sa ešte nespustil!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "VykonaÅ¥ jednu úlohu s každým naÄÃtanà stránky"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php je zaregistrovaná v službe WebCron a zavolá cron.php každých 15 minút cez http."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Použite systémovú službu cron, ktorá zavolá súbor cron.php každých 15 minút."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Zdieľanie"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Povoliť API zdieľania"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "PovoliÅ¥ aplikáciám použÃvaÅ¥ API na zdieľanie"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Povoliť odkazy"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "PovoliÅ¥ použÃvateľom zdieľaÅ¥ položky pre verejnosÅ¥ cez odkazy"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Povoliť verejné nahrávanie súborov"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "PovoliÅ¥ použÃvateľom umožniÅ¥ iným použÃvateľom nahrávaÅ¥ do ich zdieľaného prieÄinka"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Platnosť"
-#: templates/admin.php:235
+#: templates/admin.php:250
+msgid "days"
+msgstr "dni"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "PovoliÅ¥ použÃvateľom zdieľaÅ¥ položky pre verejnosÅ¥ cez odkazy"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "PovoliÅ¥ zdieľanie Äalej"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "PovoliÅ¥ použÃvateľom Äalej zdieľaÅ¥ zdieľané položky"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "PovoliÅ¥ použÃvateľom zdieľaÅ¥ s kýmkoľvek"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "PovoliÅ¥ použÃvateľom zdieľaÅ¥ len s použÃvateľmi v ich skupinách"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Povoliť odosielať upozornenia emailom"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "PovoliÅ¥ použÃvateľom zasielaÅ¥ emailom oznámenie o zdieľanà súborov"
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Platnosť"
-
-#: templates/admin.php:266
-msgid "days"
-msgstr "dni"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "ZabezpeÄenie"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Vynútiť HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Vynúti pripájanie klientov k %s Å¡ifrovaným pripojenÃm."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Email server"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "PoužÃva sa na odosielanie upozornenÃ."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Z adresy"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Vyžaduje sa overenie"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Adresa servera"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Port"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Prihlasovanie údaje"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "SMTP použÃvateľské meno"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "SMTP heslo"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Nastavenia testovacieho emailu"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Odoslať email"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Záznam"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Úroveň záznamu"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Viac"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Menej"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Verzia"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -782,29 +830,33 @@ msgstr "Jazyk"
msgid "Help translate"
msgstr "Pomôcť s prekladom"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prÃstup k vaÅ¡im súborom cez WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "Šifrovacia aplikácia už nie je spustená, dešifrujte všetky svoje súbory."
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Prihlasovacie heslo"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Dešifrovať všetky súbory"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Prihlasovacie meno"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index b1e19e7bbd43c4e1965a78a418ab8cc7ac553d68..2b56fa975f1c1003c2b12e488330293c9dad0fb9 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-02 14:14+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -72,6 +72,10 @@ msgstr "Prebrať nastavenia z nedávneho nastavenia servera?"
msgid "Keep settings?"
msgstr "Ponechať nastavenia?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Nemožno pridať nastavenie servera"
@@ -88,6 +92,18 @@ msgstr "Úspešné"
msgid "Error"
msgstr "Chyba"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Konfigurácia je v poriadku"
@@ -128,7 +144,7 @@ msgstr "Naozaj chcete zmazaÅ¥ súÄasné nastavenie servera?"
msgid "Confirm Deletion"
msgstr "Potvrdiť vymazanie"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -136,7 +152,7 @@ msgstr[0] "%s nájdená skupina"
msgstr[1] "%s nájdené skupiny"
msgstr[2] "%s nájdených skupÃn"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -144,14 +160,30 @@ msgstr[0] "%s nájdený použÃvateľ"
msgstr[1] "%s nájdenà použÃvatelia"
msgstr[2] "%s nájdených použÃvateľov"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Neplatný hostiteľ"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Nemožno nájsť požadovanú funkciu"
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filter skupiny"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Uložiť"
@@ -224,10 +256,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "UrÄuje použitý filter, pri pokuse o prihlásenie. %%uid nahrádza použÃvateľské meno v Äinnosti prihlásenia. NaprÃklad: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Pridať nastavenia servera."
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Hostiteľ"
@@ -291,6 +336,14 @@ msgstr "Späť"
msgid "Continue"
msgstr "PokraÄovaÅ¥"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "RozÅ¡Ãrené"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 818fe0b423ab3258f87617240a5ae1b7d0c66a7e..96553e47d56a1afc6dc0a51256d6a738ba963eaf 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "Datum preteka je v preteklosti."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Ni mogoÄe poslati sporoÄila za: %s"
@@ -40,6 +40,11 @@ msgstr "Vzdrževalni naÄin je onemogoÄen"
msgid "Updated database"
msgstr "Posodobljena podatkovna zbirka"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Ni podane datoteke ali slike"
@@ -60,95 +65,95 @@ msgstr "Na voljo ni nobene zaÄasne slike za profil. Poskusite znova."
msgid "No crop data provided"
msgstr "Ni podanih podatkov obreza"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "nedelja"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "ponedeljek"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "torek"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "sreda"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Äetrtek"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "petek"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "sobota"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "marec"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "april"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "maj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "junij"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "julij"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "avgust"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "september"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "november"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "december"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Nastavitve"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Poteka shranjevanje ..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "pred nekaj sekundami"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "pred %n minuto"
@@ -156,7 +161,7 @@ msgstr[1] "pred %n minutama"
msgstr[2] "pred %n minutami"
msgstr[3] "pred %n minutami"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "pred %n uro"
@@ -164,15 +169,15 @@ msgstr[1] "pred %n urama"
msgstr[2] "pred %n urami"
msgstr[3] "pred %n urami"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "danes"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "vÄeraj"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "pred %n dnevom"
@@ -180,11 +185,11 @@ msgstr[1] "pred %n dnevoma"
msgstr[2] "pred %n dnevi"
msgstr[3] "pred %n dnevi"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "zadnji mesec"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "pred %n mesecem"
@@ -192,39 +197,39 @@ msgstr[1] "pred %n mesecema"
msgstr[2] "pred %n meseci"
msgstr[3] "pred %n meseci"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "lansko leto"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "let nazaj"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Izbor"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Napaka nalaganja predloge izbirnika datotek: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Izbor"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Napaka nalaganja predloge izbirnika datotek: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "V redu"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Napaka nalaganja predloge sporoÄil: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} spor datotek"
@@ -232,45 +237,45 @@ msgstr[1] "{count} spora datotek"
msgstr[2] "{count} spori datotek"
msgstr[3] "{count} sporov datotek"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "En spor datotek"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nove datoteke"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "ObstojeÄe datoteke"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Katare datoteke želite ohraniti?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "ÄŒe izberete obe razliÄici, bo kopirani datoteki k imenu dodana Å¡tevilka."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "PrekliÄi"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Nadaljuj"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(vse izbrano)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} izbranih)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Napaka nalaganja predloge obstojeÄih datotek"
@@ -302,140 +307,149 @@ msgstr "V souporabi"
msgid "Share"
msgstr "Souporaba"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Napaka"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Napaka med souporabo"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Napaka med odstranjevanjem souporabe"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Napaka med spreminjanjem dovoljenj"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "V souporabi z vami in skupino {group}. Lastnik je {owner}."
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "V souporabi z vami. Lastnik je {owner}."
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "Souporaba z uporabnikom ali skupino ..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Povezava za prejem"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "ZaÅ¡Äiti z geslom"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Geslo"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Dovoli javno pošiljanje na strežnik"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Posreduj povezavo po elektronski pošti"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Pošlji"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Nastavi datum preteka"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Datum preteka"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Pošlji povezavo do dokumenta preko elektronske pošte:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Ni najdenih uporabnikov"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "skupina"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Nadaljnja souporaba ni dovoljena"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "V souporabi v {item} z uporabnikom {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "PrekliÄi souporabo"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "obvesti po elektronski pošti"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "lahko ureja"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "nadzor dostopa"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "ustvari"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "posodobi"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "izbriše"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "doloÄi souporabo"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "ZaÅ¡Äiteno z geslom"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Napaka brisanja datuma preteka"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Napaka nastavljanja datuma preteka"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Pošiljanje ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Elektronska pošta je poslana"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Opozorilo"
@@ -467,18 +481,19 @@ msgstr "Napaka nalaganja predloge pogovornega okna: {error}"
msgid "No tags selected for deletion."
msgstr "Ni izbranih oznak za izbris."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Stran je treba ponovno naložiti"
-#: 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 "Posodobitev ni uspela. PoÅ¡ljite poroÄilo o napaki na sistemu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Posodobitev je uspeÅ¡no konÄana. Stran bo preusmerjena na oblak ownCloud."
@@ -679,6 +694,10 @@ msgstr "Za veÄ informacij o pravilnem nastavljanju strežnika, kliknite na pove
msgid "Create an <strong>admin account</strong>"
msgstr "Ustvari <strong>skrbniÅ¡ki raÄun</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Geslo"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Shramba in podatkovna zbirka"
@@ -804,8 +823,27 @@ msgstr "Hvala za potrpežljivost!"
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Posodabljanje sistema ownCloud na razliÄico %s je lahko dolgotrajno."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index f4d73ef46366cb4494646d1f57542e334cea446f..8e0369d2acd3faf6da94fd79bd2ae6de8970a788 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
-"PO-Revision-Date: 2014-05-04 18:39+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +29,7 @@ msgstr "Datoteke %s ni mogoÄe premakniti - datoteka s tem imenom že obstaja."
msgid "Could not move %s"
msgstr "Datoteke %s ni mogoÄe premakniti"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Ime datoteke ne sme biti prazno polje."
@@ -38,18 +38,18 @@ msgstr "Ime datoteke ne sme biti prazno polje."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" je neveljavno ime datoteke."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Neveljavno ime; znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "Ciljna mapa je premaknjena ali izbrisana."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -125,44 +125,48 @@ msgstr "Manjka zaÄasna mapa"
msgid "Failed to write to disk"
msgstr "Pisanje na disk je spodletelo"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Na voljo ni dovolj prostora"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "PoÅ¡iljanje je spodletelo. Ni mogoÄe najti poslane datoteke."
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "PoÅ¡iljanje je spodletelo. Ni mogoÄe pridobiti podrobnosti datoteke."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Neveljavna mapa."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Datoteke"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "Ni mogoÄe poslati datoteke {filename}, saj je to ali mapa ali pa je velikost datoteke 0 bajtov."
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "Skupna velikost {size1} presega omejitev velikosti {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Na voljo ni dovolj prostora. Velikost poslane datoteke je {size1}, na voljo pa je je {size2}."
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Pošiljanje je preklicano."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Ni mogoÄe pridobiti podatkov s strežnika."
@@ -175,77 +179,77 @@ msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošilja
msgid "URL cannot be empty"
msgstr "Polje naslova URL ne sme biti prazno"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} že obstaja"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Ni mogoÄe ustvariti datoteke"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Ni mogoÄe ustvariti mape"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Napaka pridobivanja naslova URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Souporaba"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "IzbriÅ¡i dokonÄno"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Preimenuj"
-#: js/filelist.js:221
+#: js/filelist.js:299
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, kadar je datoteka zelo velika."
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "V Äakanju ..."
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr "Napaka premikanja datoteke."
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Napaka premikanja datoteke"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Napaka"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Ni mogoÄe preimenovati datoteke"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Napaka brisanja datoteke."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Ime"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Velikost"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Spremenjeno"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n mapa"
@@ -253,7 +257,7 @@ msgstr[1] "%n mapi"
msgstr[2] "%n mape"
msgstr[3] "%n map"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n datoteka"
@@ -261,7 +265,7 @@ msgstr[1] "%n datoteki"
msgstr[2] "%n datoteke"
msgstr[3] "%n datotek"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Posodabljanje %n datoteke"
@@ -269,32 +273,32 @@ msgstr[1] "Posodabljanje %n datotek"
msgstr[2] "Posodabljanje %n datotek"
msgstr[3] "Posodabljanje %n datotek"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" je neveljavno ime datoteke."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Prostor za shranjevanje je skoraj do konca zaseden ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Program za Å¡ifriranje je omogoÄen, vendar ni zaÄet. Odjavite se in nato ponovno prijavite."
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Ni ustreznega osebnega kljuÄa za program za Å¡ifriranje. Posodobite osebni kljuÄ za dostop do Å¡ifriranih datotek med nastavitvami."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -304,12 +308,12 @@ msgstr "Å ifriranje je onemogoÄeno, datoteke pa so Å¡e vedno Å¡ifrirane. OdÅ¡if
msgid "{dirs} and {files}"
msgstr "{dirs} in {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s ni mogoÄe preimenovati"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Pošiljanje (omejitev %s)"
@@ -346,68 +350,75 @@ msgstr "NajveÄja vhodna velikost za datoteke ZIP"
msgid "Save"
msgstr "Shrani"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek rpeko sistema WebDAV</a>."
+
+#: templates/list.php:5
msgid "New"
msgstr "Novo"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Nova besedilna datoteka"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Besedilna datoteka"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Nova mapa"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Mapa"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Iz povezave"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Izbrisane datoteke"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "PrekliÄi poÅ¡iljanje"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Ni ustreznih dovoljenj za pošiljanje ali ustvarjanje datotek na tem mestu."
-#: templates/index.php:56
+#: templates/list.php:53
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/list.php:68
msgid "Download"
msgstr "Prejmi"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Izbriši"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "PrekoraÄenje omejitve velikosti"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Poteka preuÄevanje datotek, poÄakajte ..."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Trenutno poteka preuÄevanje"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index dc3211d8a71ddc234c76037cffafcb014b4ffa5a..3acc39312b362ca2e36bf68e6de96a42b23a162f 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 19:21+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -78,9 +78,9 @@ msgstr "Te datoteke ni mogoÄe Å¡ifrirati, ker je to najverjetneje datoteka v so
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Prišlo je do neznane napake. Preverite nastavitve sistema ali pa stopite v stik s skrbnikom sistema."
+msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -93,7 +93,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "Preverite, ali je na strežniku nameÅ¡Äen paket PHP 5.3.3 ali novejÅ¡i, da je omogoÄen in pravilno nastavljen PHP OpenSSL. Z obstojeÄimi možnostmi Å¡ifriranje ni mogoÄe."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Navedeni uporabniki Å¡e nimajo nastavljenega Å¡ifriranja:"
@@ -113,91 +113,91 @@ msgstr "SkoÄite neposredno na"
msgid "personal settings"
msgstr "osebne nastavitve"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Å ifriranje"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "OmogoÄi kljuÄ za obnovitev datotek (v primeru izgube gesla):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "KljuÄ za obnovitev gesla"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr "Ponovi kljuÄ za obnovitev gesla"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "OmogoÄeno"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "OnemogoÄeno"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Spremeni kljuÄ za obnovitev gesla:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "Stari kljuÄ za obnovitev gesla"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "Novi kljuÄ za obnovitev gesla"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr "Ponovi novi kljuÄ za obnovitev gesla"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Spremeni geslo"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "VaÅ¡ zasebni kljuÄ za geslo se ne ujema z geslom, vnesenim ob prijavi:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Nastavite svoj star zasebni kljuÄ v geslo, vneseno ob prijavi."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Če ste pozabili svoje geslo, lahko vaše datoteke obnovi le skrbnik sistema."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Staro geslo"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Trenutno geslo"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Posodobi zasebni kljuÄ"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "OmogoÄi obnovitev gesla:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Nastavitev te možnosti omogoÄa ponovno pridobitev dostopa do Å¡ifriranih datotek, v primeru, da boste geslo pozabili."
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Nastavitve obnavljanja dokumentov so posodobljene"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Nastavitev za obnavljanje dokumentov ni mogoÄe posodobiti"
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index 77eef9bd7506d2b45f06ffdbd2639c27d3924a1d..cb4cf2ea5112a422a6ff2260db35538f703ff026 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
-"PO-Revision-Date: 2014-05-04 18:40+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +36,7 @@ msgstr "KljuÄ"
#: appinfo/app.php:42
msgid "Secret"
-msgstr ""
+msgstr "Skrivni kljuÄ"
#: appinfo/app.php:43 appinfo/app.php:51
msgid "Bucket"
@@ -44,48 +44,48 @@ msgstr ""
#: appinfo/app.php:47
msgid "Amazon S3 and compliant"
-msgstr ""
+msgstr "Amazon S3 in podobno"
#: appinfo/app.php:49
msgid "Access Key"
-msgstr ""
+msgstr "KljuÄ za dostop"
#: appinfo/app.php:50
msgid "Secret Key"
-msgstr ""
+msgstr "Skrivni kljuÄ"
#: appinfo/app.php:52
msgid "Hostname (optional)"
-msgstr ""
+msgstr "Ime gostitelja (izbirno)"
#: appinfo/app.php:53
msgid "Port (optional)"
-msgstr ""
+msgstr "Vrata (izbirno)"
#: appinfo/app.php:54
msgid "Region (optional)"
-msgstr ""
+msgstr "ObmoÄje (izbirno)"
#: appinfo/app.php:55
msgid "Enable SSL"
-msgstr ""
+msgstr "OmogoÄi SSL"
#: appinfo/app.php:56
msgid "Enable Path Style"
-msgstr ""
+msgstr "OmogoÄi slog poti"
#: appinfo/app.php:63
msgid "App key"
-msgstr ""
+msgstr "Programski kljuÄ"
#: appinfo/app.php:64
msgid "App secret"
-msgstr ""
+msgstr "Skrivni programski kljuÄ"
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "Naslov URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Gostitelj"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -100,19 +100,19 @@ msgstr "Geslo"
#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
#: appinfo/app.php:134 appinfo/app.php:154
msgid "Root"
-msgstr ""
+msgstr "Koren"
#: appinfo/app.php:77
msgid "Secure ftps://"
-msgstr ""
+msgstr "Varni naÄin ftps://"
#: appinfo/app.php:84
msgid "Client ID"
-msgstr ""
+msgstr "ID odjemalca"
#: appinfo/app.php:85
msgid "Client secret"
-msgstr ""
+msgstr "Skrivni kljuÄ odjemalca"
#: appinfo/app.php:92
msgid "OpenStack Object Storage"
@@ -120,7 +120,7 @@ msgstr ""
#: appinfo/app.php:94
msgid "Username (required)"
-msgstr ""
+msgstr "Uporabniško ime (zahtevano)"
#: appinfo/app.php:95
msgid "Bucket (required)"
@@ -160,19 +160,23 @@ msgstr "Souporaba"
#: appinfo/app.php:119
msgid "SMB / CIFS using OC login"
-msgstr ""
+msgstr "SMB / CIFS z uporabo prijave OC"
#: appinfo/app.php:122
msgid "Username as share"
-msgstr ""
+msgstr "Uporabniško ime za souporabo"
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "Naslov URL"
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
-msgstr ""
+msgstr "Varni naÄin https://"
#: appinfo/app.php:144
msgid "Remote subfolder"
-msgstr ""
+msgstr "Oddaljena podrejena mapa"
#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
msgid "Access granted"
@@ -198,29 +202,29 @@ msgstr "Napaka nastavljanja shrambe Google Drive"
msgid "Saved"
msgstr "Shranjeno"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr "<b>Opomba:</b> "
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr "in"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogoÄena, ali pa ni ustrezno nameÅ¡Äenih programov. Priklapljanje %s ni mogoÄe. Za pomoÄ pri namestitvi se obrnite na sistemskega skrbnika."
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogoÄena, ali pa ni ustrezno nameÅ¡Äenih programov. Priklapljanje %s ni mogoÄe. Za pomoÄ pri namestitvi se obrnite na sistemskega skrbnika."
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index c0361a477516a9d3d2bf43659939d3a0a615f628..84c4782dd0f4ae1dcd8e36dec5dc99b6400ceec4 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Souporabo omogoÄa {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "To mesto je zaÅ¡Äiteno z geslom."
@@ -34,6 +58,14 @@ msgstr "Geslo je napaÄno. Poskusite znova."
msgid "Password"
msgstr "Geslo"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Povezava oÄitno ni veÄ v uporabi."
@@ -62,11 +94,11 @@ msgstr "Za veÄ podrobnosti stopite v stik s poÅ¡iljateljem te povezave."
msgid "Download"
msgstr "Prejmi"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Prejmi %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Neposredna povezava"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index a6351f684f743f85348d4f46e284ca814dbbfe7b..fc302d6b75f070cfd09c3f7608027d0d3e961936 100644
--- a/l10n/sl/files_trashbin.po
+++ b/l10n/sl/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,38 +28,34 @@ msgstr "Datoteke %s ni mogoÄe trajno izbrisati."
msgid "Couldn't restore %s"
msgstr "Ni mogoÄe obnoviti %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Izbrisane datoteke"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Obnovi"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Napaka"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Izbrisane datoteke"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "obnovljeno"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Mapa smeti je prazna."
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Ime"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Obnovi"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Izbrisano"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Izbriši"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index a62eabb7d85fe8fc1ab181c3995c3d620d31dc84..d1a7f2a929c2b22637bd522a3e9305f49175fa99 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -78,23 +78,23 @@ msgstr "Neveljavna slika"
msgid "web services under your control"
msgstr "spletne storitve pod vašim nadzorom"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Prejemanje datotek v paketu ZIP je onemogoÄeno."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Datoteke je mogoÄe prejeti le posamiÄno."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Nazaj na datoteke"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -280,127 +280,138 @@ msgstr "Nastavi uporabniško ime skrbnika."
msgid "Set an admin password."
msgstr "Nastavi geslo skrbnika."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Spletni stražnik Å¡e ni ustrezno nastavljen in ne omogoÄa usklajevanja, saj je nastavitev WebDAV okvarjena."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Preverite <a href='%s'>navodila namestitve</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s je omogoÄil souporabo »%s«"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
+msgstr "Souporaba %s je spodletela, ker ta datoteka ne obstaja"
+
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "Nastavljanje souporabe %s je spodletelo, ker je uporabnik %s lastnik predmeta."
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ne obstaja."
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni Älan nobene skupine, v kateri je tudi uporabnik %s."
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "Nastavljanje souporabe %s je spodletela, ker je ima uporabnik %s predmet že v souporabi."
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "Nastavljanje souporabe %s je spodletelo, ker je skupina %s ne obstaja."
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni Älan skupine %s."
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "Nastavljanje souporabe %s je spodletelo, ker souporaba preko povezave ni dovoljena."
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr "Vrsta souporabe %s za %s ni veljavna."
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr "Ozadnjega programa %s za souporabo ni mogoÄe najti"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr "Ozadnjega programa za souporabo za %s ni mogoÄe najti"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Kategorije \"%s\" ni mogoÄe najti."
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 0882d0d7e96dad4a780c751ab40e2f79da835e04..861dd41fd3ba261f8dfca5726abeac8a194bdd1c 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -49,15 +49,15 @@ msgstr "Elektronska pošta je poslana"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "NaÄin poÅ¡iljanja"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Å ifriranje"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "NaÄin overitve"
@@ -100,6 +100,16 @@ msgstr "Datotek ni mogoÄe odÅ¡ifrirati. Preverite dnevnik owncloud.log ali pa s
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "Datotek ni mogoÄe odÅ¡ifrirati. Preverite geslo in poskusite znova."
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Elektronski naslov je shranjen"
@@ -116,6 +126,16 @@ msgstr "Skupine ni mogoÄe izbrisati"
msgid "Unable to delete user"
msgstr "Uporabnika ni mogoÄe izbrisati"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Jezik je spremenjen"
@@ -171,7 +191,7 @@ msgstr "HrbtiÅ¡Äe programa ne podpira spreminjanja gesla, je pa uspeÅ¡no posodo
msgid "Unable to change password"
msgstr "Ni mogoÄe spremeniti gesla"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Poteka pošiljanje ..."
@@ -227,34 +247,42 @@ msgstr "Posodobi"
msgid "Updated"
msgstr "Posodobljeno"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Izbor slike profila"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Zelo Å¡ibko geslo"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Å ibko geslo"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Slabo geslo"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Dobro geslo"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "OdliÄno geslo"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno."
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "izbrisano"
@@ -267,8 +295,8 @@ msgstr "razveljavi"
msgid "Unable to remove user"
msgstr "Uporabnika ni mogoÄe odstraniti"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Skupine"
@@ -300,7 +328,7 @@ msgstr "Navedeno mora biti veljavno geslo"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Opozorilo: osebna mapa uporabnika \"{user}\" že obstaja"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "SlovenÅ¡Äina"
@@ -368,7 +396,7 @@ msgid ""
"root."
msgstr "VaÅ¡a podatkovna mapa in datoteke so najverjetneje dosegljive preko interneta. Datoteka .htaccess ni ustrezno nastavljena. PriporoÄljivo je nastaviti spletni strežnik tako, da podatkovna mapa ni prosto dostopna. To je mogoÄe zagotoviti tudi tako, da je mapa premaknjena iz neustrezne korenske v podrejeno mapo ."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Opozorilo nastavitve"
@@ -383,53 +411,65 @@ 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\">vodnike namestitve</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Manjka modul 'fileinfo'."
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "Manjka modul PHP 'fileinfo'. PriporoÄljivo je omogoÄiti ta modul za popolno zaznavanje vrst MIME."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "NameÅ¡Äena razliÄica PHP je zastarela"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "NameÅ¡Äena razliÄica PHP je zastarela. PriporoÄljivo je posodobiti namestitev na razliÄico 5.3.8 ali novejÅ¡e, saj starejÅ¡e razliÄice ne podpirajo vseh zmožnosti. MogoÄe je, da namestitev ne deluje pravilno."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Jezikovne prilagoditve ne delujejo."
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Sistemskih jezikovnih nastavitev ni mogoÄe nastaviti na možnost, ki podpira nabor UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "PriporoÄljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s"
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Internetna povezava ne deluje."
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -438,198 +478,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Na voljo ni delujoÄe internetne povezave. To pomeni, da nekaterih možnosti, kot so priklapljanje zunanje shrambe, obveÅ¡Äanja o posodobitvah in nameÅ¡Äanje programov tretje roke ni podprto. Dostop do datotek z oddaljenih mest in poÅ¡iljanje obvestil preko elektronske poÅ¡te je verjetno Å¡e vedno mogoÄe. Za omogoÄanje vseh zmožnosti mora biti vzpostavljena tudi ustrezna internetna povezava."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "PeriodiÄno opravilo"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "Zadnje opravilo cron je bilo izvedeno ob %s."
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "Zadnje opravilo cron je bilo izvedeno ob %s. To je veÄ kot uro nazaj. Nekaj je oÄitno narobe."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "Opravilo Cron Å¡e ni zagnano!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Izvedi eno nalogo z vsako naloženo stranjo."
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "Datoteka cron.php je vpisana v storitvi webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Uporabi storitev periodiÄnih opravil za klic datoteke cron.php vsakih 15 minut."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Souporaba"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "OmogoÄi API souporabe"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Dovoli programom uporabo vmesnika API souporabe"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Dovoli povezave"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Uporabnikom dovoli souporabo predmetov z javnimi povezavami"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Dovoli javno pošiljanje datotek v oblak"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Dovoli uporabnikom, da omogoÄijo drugim uporabnikom, poÅ¡iljati datoteke v javno mapo."
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Uporabnikom dovoli souporabo predmetov z javnimi povezavami"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Dovoli nadaljnjo souporabo"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Uporabnikom dovoli nadaljnjo souporabo predmetov"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Uporabnikom dovoli souporabo s komerkoli"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Uporabnikom dovoli souporabo z ostalimi uporabniki njihove skupine"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Dovoli obvestila preko elektronske pošte"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti."
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Varnost"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Zahtevaj uporabo HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Vsili povezavo odjemalca z %s preko Å¡ifrirane povezave."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Za nastavljanje Å¡ifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "Poštni strežnik"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Zahtevana je overitev"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Naslov strežnika"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Vrata"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Poverila"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "Uporabniško ime SMTP"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "Geslo SMTP"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Preizkus nastavitev elektronske pošte"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "PoÅ¡lji elektronsko sporoÄilo"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Dnevnik"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Raven beleženja"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "VeÄ"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Manj"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "RazliÄica"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -782,29 +830,33 @@ msgstr "Jezik"
msgid "Help translate"
msgstr "Sodelujte pri prevajanju"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek rpeko sistema WebDAV</a>."
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "Program za Å¡ifriranje ni veÄ omogoÄen. OdÅ¡ifrirati je treba vse datoteke."
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Prijavno geslo"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Odšifriraj vse datoteke"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Prijavno ime"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 710490b5d03bfd79fc1a471e7afb6a1bccd94fe1..4feb2c0700e08c2499e251a07b02cdd6128d5efc 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -72,6 +72,10 @@ msgstr "Ali naj bodo prevzete nedavne nastavitve strežnika?"
msgid "Keep settings?"
msgstr "Ali naj se nastavitve ohranijo?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Ni mogoÄe dodati nastavitev strežnika"
@@ -88,6 +92,18 @@ msgstr "UspeÅ¡no konÄano."
msgid "Error"
msgstr "Napaka"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Nastavitev je ustrezna"
@@ -128,7 +144,7 @@ msgstr "Ali res želite izbrisati trenutne nastavitve strežnika?"
msgid "Confirm Deletion"
msgstr "Potrdi brisanje"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -137,7 +153,7 @@ msgstr[1] "%s najdeni skupini"
msgstr[2] "%s najdene skupine"
msgstr[3] "%s najdenih skupin"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -146,14 +162,30 @@ msgstr[1] "%s najdena uporabnika"
msgstr[2] "%s najdeni uporabniki"
msgstr[3] "%s najdenih uporabnikov"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Neveljaven gostitelj"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Želene zmožnosti ni mogoÄe najti"
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filter skupin"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Shrani"
@@ -226,10 +258,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "DoloÄi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniÅ¡ko ime pri prijavi, na primer: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Dodaj nastavitve strežnika"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Gostitelj"
@@ -293,6 +338,14 @@ msgstr "Nazaj"
msgid "Continue"
msgstr "Nadaljuj"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Napredne možnosti"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 91349d9cd165bb2c3dfce5cb8e122f7066154685..65f0a7d91a65e712ead2eb74a6d5f3316e2849ed 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -40,6 +40,11 @@ msgstr "Mënyra e mirëmbajtjes u çaktivizua"
msgid "Updated database"
msgstr "Database-i u azhurnua"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -60,207 +65,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "E djelë"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "E hënë"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "E martë"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "E mërkurë"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "E enjte"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "E premte"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "E shtunë"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Janar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Shkurt"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mars"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Prill"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Qershor"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Korrik"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Gusht"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Shtator"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Tetor"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Nëntor"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Dhjetor"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Parametra"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Duke ruajtur..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "sekonda më parë"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut më parë"
msgstr[1] "%n minuta më parë"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n orë më parë"
msgstr[1] "%n orë më parë"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "sot"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "dje"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n ditë më parë"
msgstr[1] "%n ditë më parë"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "muajin e shkuar"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n muaj më parë"
msgstr[1] "%n muaj më parë"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "vitin e shkuar"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "vite më parë"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Zgjidh"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Po"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Jo"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Zgjidh"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Në rregull"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Anulo"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -292,140 +297,149 @@ msgstr "Ndarë"
msgid "Share"
msgstr "Nda"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Veprim i gabuar"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Veprim i gabuar gjatë ndarjes"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Veprim i gabuar gjatë heqjes së ndarjes"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Veprim i gabuar gjatë ndryshimit të lejeve"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Ndarë me ju dhe me grupin {group} nga {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Ndarë me ju nga {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Mbro me kod"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Kodi"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Lejo Ngarkimin Publik"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Dërgo email me lidhjen"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Dërgo"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Cakto datën e përfundimit"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Data e përfundimit"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Nda me email:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Nuk u gjet asnjë person"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "grupi"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Rindarja nuk lejohet"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Ndarë në {item} me {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Hiq ndarjen"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "mund të ndryshosh"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "kontrollimi i hyrjeve"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "krijo"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "azhurno"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "elimino"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "nda"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Mbrojtur me kod"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Veprim i gabuar gjatë heqjes së datës së përfundimit"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Veprim i gabuar gjatë caktimit të datës së përfundimit"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Duke dërguar..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Email-i u dërgua"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -457,18 +471,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitetin ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i."
@@ -669,6 +684,10 @@ msgstr "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj,
msgid "Create an <strong>admin account</strong>"
msgstr "Krijo një <strong>llogari administruesi</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Kodi"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -794,8 +813,27 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Po azhurnoj ownCloud-in me versionin %s. Mund të zgjasi pak."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 59378d7a1bd327b3ebcd2d782c635b8a9af0e00b..7e5690afdb498a961e4f917e9764f358d660019a 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr "E pa mundur zhvendosja e %s - ekziston nje skedar me te njetin emer"
msgid "Could not move %s"
msgstr "Nuk mund të zhvendoset %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Emri i skedarit nuk mund të jetë bosh."
@@ -38,18 +38,18 @@ msgstr "Emri i skedarit nuk mund të jetë bosh."
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Emër jo i vlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -125,44 +125,48 @@ msgstr "Mungon dosja e përkohshme"
msgid "Failed to write to disk"
msgstr "Dështoi shkrimi në disk"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Hapsira e arkivimit e pamjaftueshme"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Dosje e pavlefshme"
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Skedarë"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Ngarkimi u anullua"
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -175,120 +179,120 @@ msgstr "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin"
msgid "URL cannot be empty"
msgstr "URL-i nuk mund të jetë bosh"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} është ekzistues "
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "I pamundur krijimi i kartelës"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Ndaj"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Fshi përfundimisht"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Riemëro"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Shkarkimi juaj është duke u përgatitur. Kjo mund të kërkojë kohë nëse skedarët janë të mëdhenj."
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Në vijim"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Gabim lëvizjen dokumentave"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Gabim"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Emri"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Madhësia"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Ndryshuar"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n dosje"
msgstr[1] "%n dosje"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n skedar"
msgstr[1] "%n skedarë"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Po ngarkoj %n skedar"
msgstr[1] "Po ngarkoj %n skedarë"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Hapsira juaj e arkivimit është plot, skedarët nuk mund të përditësohen ose sinkronizohen!"
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Hapsira juaj e arkivimit është pothuajse në fund ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -298,12 +302,12 @@ msgstr "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kod
msgid "{dirs} and {files}"
msgstr "{dirs} dhe {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "Nuk është i mundur riemërtimi i %s"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -340,68 +344,75 @@ msgstr "Maksimumi hyrës i skedarëve ZIP"
msgid "Save"
msgstr "Ruaj"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "E re"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Skedar tekst"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Dosje e're"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Dosje"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Nga lidhja"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Skedarë të fshirë "
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Anullo ngarkimin"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Këtu nuk ka asgje. Ngarko dicka"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Shkarko"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Fshi"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Ngarkimi shumë i madh"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Skedarët që po mundoheni të ngarkoni e tejkalojnë madhësinë maksimale të lejuar nga serveri."
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Skanerizimi i skedarit në proces. Ju lutem prisni."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Skanimi aktual"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/sq/files_encryption.po b/l10n/sq/files_encryption.po
index fe70cc4dd2d25fad4b30e6557c1d8d5510771c29..cd312b9382542cd6be567530f7cd5844f3107642 100644
--- a/l10n/sq/files_encryption.po
+++ b/l10n/sq/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po
index 3f6fcc5ba8f30557a44741beed0fd6089af8dd1a..10b43f23f7b1b307cf69639ebab4fcf3addefd37 100644
--- a/l10n/sq/files_external.po
+++ b/l10n/sq/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL-i"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Pritësi"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL-i"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index c929692b7148af2a059311821af462cf2fb25127..6fd97e0616801f1b709f12a920186d2cfc80352a 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,34 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Kjo pjesë është e mbrojtur me fjalëkalim"
@@ -35,6 +59,14 @@ msgstr "Kodi është i gabuar. Provojeni përsëri."
msgid "Password"
msgstr "Kodi"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Ju kërkojmë ndjesë, kjo lidhje duket sikur nuk punon më."
@@ -63,11 +95,11 @@ msgstr "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi k
msgid "Download"
msgstr "Shkarko"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Lidhje direkte"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index 7ec3e575dc80cbd1ed89fe2cc40b8f3bdea27190..71696ba0adefb2f3605b57bdc7b2f8cb743bd390 100644
--- a/l10n/sq/files_trashbin.po
+++ b/l10n/sq/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "Nuk munda ta eliminoj përfundimisht %s"
msgid "Couldn't restore %s"
msgstr "Nuk munda ta rivendos %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Skedarë të fshirë "
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Rivendos"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Veprim i gabuar"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Skedarë të eliminuar"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "rivendosur"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Këtu nuk ka asgjë. Koshi juaj është bosh!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Emri"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Rivendos"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Eliminuar"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Elimino"
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index c14aadf7f672567086a5e896fa725618dd7c976c..da4e8563d2e95b4b9cc6625c6386532d948f6247 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr "shërbime web nën kontrollin tënd"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Shkarimi i skedarëve ZIP është i çaktivizuar."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Skedarët duhet të shkarkohen një nga një."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Kthehu tek skedarët"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Skedarët e selektuar janë shumë të mëdhenj për të krijuar një skedar ZIP."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr "Cakto emrin e administratorit."
msgid "Set an admin password."
msgstr "Cakto kodin e administratorit."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "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."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s ndau »%s« me ju"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Kategoria \"%s\" nuk u gjet"
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 740d66c817b4a21a18032647c937e859bf0a3b42..0fb835b35e9a4dde44e0d19ed9ce20e5a1a539de 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "Email-i u dërgua"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Email u ruajt"
@@ -114,6 +124,16 @@ msgstr "E pamundur të fshihet grupi"
msgid "Unable to delete user"
msgstr "E pamundur të fshihet përdoruesi"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Gjuha u ndryshua"
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr "Përditësim"
msgid "Updated"
msgstr "I përditësuar"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "fshirë"
@@ -265,8 +293,8 @@ msgstr "anullo veprimin"
msgid "Unable to remove user"
msgstr "E pamundur të fshiet përdoruesi"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupet"
@@ -298,7 +326,7 @@ msgstr "Duhet të jepni një fjalëkalim te vlefshëm"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Shqip"
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Lajmërim konfigurimi"
@@ -381,53 +409,65 @@ msgstr "Web Serveri juaj nuk është konfigurar sic duhet në mënyre që të le
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Mungon moduli 'fileinfo'"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "Moduli PHP 'fileinfo' mungon. Ju këshillojmë me këmbngulje të aktivizoni këtë modul për të arritur rezultate më të mirame identifikimin e tipeve te ndryshme MIME."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Locale nuk është funksional"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Lidhja me internetin nuk është funksionale"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Kryeni vetëm një veprim me secilën prej faqeve të ngarkuara"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Ndarje"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Aktivizo API për ndarjet"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Lejoni aplikacionet të përdorin share API"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Lejo lidhjet"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Lejoni përdoruesit të ndajnë elementët publikisht nëpermjet lidhjeve"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Lejo ngarkimin publik"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Lejo përdoruesit të mundësojnë të tjerët që të ngarkojnë materiale në dosjen e tyre publike"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Lejoni përdoruesit të ndajnë elementët publikisht nëpermjet lidhjeve"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Lejo ri-ndarjen"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Lejoni përdoruesit të ndjanë dhe ata elementë të ndarë më parë ngë të tjerë"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Lejo përdoruesit të ndajnë me cilindo"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Lejoni përdoruesit të ndajnë vetëm me përdorues të të njëjtit grup"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Siguria"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Detyro HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Porta"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Historik aktiviteti"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Niveli i Historikut"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Më tepër"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "M'pak"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Versioni"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +828,33 @@ msgstr "Gjuha"
msgid "Help translate"
msgstr "Ndihmoni në përkthim"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr ""
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr ""
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Emri i Përdoruesit"
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 66a82a0dafa42638beb9874dbc37b317f391cd7d..0ee719d6452e5ead9a964a186e4063823d9c645c 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr "Doni të rivini konfigurmet më të fundit të serverit?"
msgid "Keep settings?"
msgstr "Doni të mbani konfigurimet?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "E pamundur të shtohen konfigurimet në server"
@@ -86,6 +90,18 @@ msgstr "Sukses"
msgid "Error"
msgstr "Gabim"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr "Jeni vërtetë të sigurt të fshini konfigurimet aktuale të serverit?"
msgid "Confirm Deletion"
msgstr "Konfirmoni Fshirjen"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtri i grupeve"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Ruaj"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Shtoni konfigurimet e serverit"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Pritësi"
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "E përparuar"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 0fa6842d9096be19d4a7ad72e802f336f7d35d29..41379f41ba8545956e0c69e12a63b4ddd0a27f2a 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: sr\n"
"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);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,212 +63,212 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Ðедеља"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Понедељак"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Уторак"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Среда"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Четвртак"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Петак"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Субота"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Јануар"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Фебруар"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Март"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Ðприл"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Мај"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Јун"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Јул"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "ÐвгуÑÑ‚"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Септембар"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Октобар"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Ðовембар"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Децембар"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "ПоÑтавке"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Чување у току..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "пре неколико Ñекунди"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "данаÑ"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "јуче"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "прошлог меÑеца"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "прошле године"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "година раније"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Одабери"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ðе"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Одабери"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "У реду"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Откажи"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -295,140 +300,149 @@ msgstr ""
msgid "Share"
msgstr "Дели"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Грешка"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Грешка у дељењу"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Грешка код иÑкључења дељења"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Грешка код промене дозвола"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Дељено Ñа вама и Ñа групом {group}. Поделио {owner}."
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Поделио Ñа вама {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Заштићено лозинком"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Лозинка"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Пошаљи"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "ПоÑтави датум иÑтека"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Датум иÑтека"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Подели поштом:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "ОÑобе ниÑу пронађене."
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "група"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Поновно дељење није дозвољено"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Подељено унутар {item} Ñа {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Укини дељење"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "може да мења"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "права приÑтупа"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "направи"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "ажурирај"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "обриши"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "подели"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Заштићено лозинком"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Грешка код поништавања датума иÑтека"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Грешка код поÑтављања датума иÑтека"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Шаљем..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Порука је поÑлата"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Упозорење"
@@ -460,18 +474,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -672,6 +687,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Ðаправи <strong>админиÑтративни налог</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Лозинка"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -797,8 +816,27 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Ðадоградња ownCloud-а на верзију %s, Ñачекајте тренутак."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index fa5ce02560361fcca1f1ad9ede70307253188f2e..943ff2bfed7d9ef3dc09d0ca32561bba5341a90e 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr "Ðе могу да премеÑтим %s – датотека Ñ Ð¾Ð²Ð¸
msgid "Could not move %s"
msgstr "Ðе могу да премеÑтим %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Име датотеке не може бити празно."
@@ -36,18 +36,18 @@ msgstr "Име датотеке не може бити празно."
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "ÐеиÑправан назив. Следећи знакови ниÑу дозвољени: \\, /, <, >, :, \", |, ? и *."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr "ÐедоÑтаје привремена фаÑцикла"
msgid "Failed to write to disk"
msgstr "Ðе могу да пишем на диÑк"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Ðема довољно проÑтора"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "неиÑправна фаÑцикла."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Датотеке"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Отпремање је прекинуто."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,123 +177,123 @@ msgstr "Отпремање датотеке је у току. Ðко Ñада н
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} већ поÑтоји"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Дели"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Обриши за Ñтално"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Преименуј"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Припремам преузимање. Ово може да потраје ако Ñу датотеке велике."
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Ðа чекању"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Грешка"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Име"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Величина"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Измењено"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Ваше Ñкладиште је пуно. Датотеке више не могу бити ажуриране ни Ñинхронизоване."
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ваше Ñкладиште је Ñкоро па пуно ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -299,12 +303,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -341,68 +345,75 @@ msgstr "Ðајвећа величина ZIP датотека"
msgid "Save"
msgstr "Сачувај"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "Ðова"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "текÑтуална датотека"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "фаÑцикла"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Са везе"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "ОбриÑане датотеке"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Прекини отпремање"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Овде нема ничег. Отпремите нешто!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Преузми"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Обриши"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Датотека је превелика"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Датотеке које желите да отпремите прелазе ограничење у величини."
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Скенирам датотеке…"
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Тренутно Ñкенирање"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
index b072157e7347fcb1a9f107c10e9ccf72ebaa100a..049f1b7b073bc5533e6f6370298a0f1a5cdd6a0c 100644
--- a/l10n/sr/files_encryption.po
+++ b/l10n/sr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Шифровање"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index 1e0db66f61def5f31d8fafcb45b909c4cba66c67..d2bde275c7b2c65f641e15a3be88e525aa2bc3aa 100644
--- a/l10n/sr/files_external.po
+++ b/l10n/sr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:10+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr ""
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Домаћин"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 7ec0e15f341e226b4859b61c2fb81efd3099e04a..8c7cea3a9268d3b52f9ccd04bfc35f635fe4c171 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: sr\n"
"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);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "Лозинка"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "Преузми"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index d105f0abc3c6e74643f19cf9e73fc3b1bbdd5fc0..7d52a42706e4d6f74ef84ef8335378b60a2947b1 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "ОбриÑане датотеке"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Врати"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Грешка"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Овде нема ништа. Корпа за отпатке је празна."
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Име"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Врати"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "ОбриÑано"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Обриши"
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index 9497da9f0b5a7dcc3c75002ebce699e993860257..194df8a1dadacf4d77ff7ac3bb4ce7c1f786bfff 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: sr\n"
"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);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr "веб ÑервиÑи под контролом"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Преузимање ZIP-а је иÑкључено."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Датотеке морате преузимати једну по једну."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Ðазад на датотеке"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Изабране датотеке Ñу превелике да биÑте направили ZIP датотеку."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ваш веб Ñервер тренутно не подржава Ñинхронизацију датотека јер Ñе чини да је WebDAV Ñучеље неиÑправно."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Погледајте <a href='%s'>водиче за инÑталацију</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Ðе могу да пронађем категорију „%s“."
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index b6da915058ced1adc17ca5d35b546ff0111ff303..0a6c5c2deb769bbc44b7a9cd0a71c59bf9512cae 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "Порука је поÑлата"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Шифровање"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Е-порука Ñачувана"
@@ -114,6 +124,16 @@ msgstr "Ðе могу да уклоним групу"
msgid "Unable to delete user"
msgstr "Ðе могу да уклоним кориÑника"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Језик је промењен"
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr "Ðжурирај"
msgid "Updated"
msgstr "Ðжурирано"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "обриÑано"
@@ -265,8 +293,8 @@ msgstr "опозови"
msgid "Unable to remove user"
msgstr "Ðе могу да уклоним кориÑника"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Групе"
@@ -298,7 +326,7 @@ msgstr "Морате унети иÑправну лозинку"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__language_name__"
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Упозорење о подешавању"
@@ -381,53 +409,65 @@ msgstr "Ваш веб Ñервер тренутно не подржава Ñин
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "ÐедоÑтаје модул „fileinfo“"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "ÐедоÑтаје PHP модул „fileinfo“. Препоручујемо вам да га омогућите да биÑте добили најбоље резултате Ñ Ð¾Ñ‚ÐºÑ€Ð¸Ð²Ð°ÑšÐµÐ¼ MIME врÑта."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Локализација не ради"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Веза Ñ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ð¾Ð¼ не ради"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Изврши један задатак Ñа Ñваком учитаном Ñтраницом"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Дељење"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Омогући API Share"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Дозвољава апликацијама да кориÑте API Share"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Дозволи везе"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Дозволи кориÑницима да деле Ñтавке Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð° путем веза"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Дозволи кориÑницима да деле Ñтавке Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð° путем веза"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Дозволи поновно дељење"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Дозволи кориÑницима да поновно деле Ñтавке Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð°"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Дозволи кориÑницима да деле Ñа било ким"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Дозволи кориÑницима да деле Ñамо Ñа кориÑницима у њиховим групама"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "БезбедноÑÑ‚"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Ðаметни HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "ÐдреÑа Ñервера"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Порт"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Бележење"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Ðиво бележења"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Више"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Мање"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Верзија"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +828,33 @@ msgstr "Језик"
msgid "Help translate"
msgstr " Помозите у превођењу"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr ""
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr ""
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "КориÑничко име"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 9ee48009333d2b713e83fc1cdd2410003ca3872b..4a6cbc20c0c79df65e56c7e80eab25fdafd57d83 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "Грешка"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,7 +142,7 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -134,7 +150,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -142,14 +158,30 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Филтер групе"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Сачувај"
@@ -222,10 +254,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Домаћин"
@@ -289,6 +334,14 @@ msgstr "Ðазад"
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Ðапредно"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index f43faf21534a53f89e576a39261fed0ec3274d0d..ed5a79bd3b0d76e1fe8696ac2ddca177a719ebb3 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: sr@latin\n"
"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);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -40,6 +40,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -60,212 +65,212 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Nedelja"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Ponedeljak"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Utorak"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Sreda"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "ÄŒetvrtak"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Petak"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Subota"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januar"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februar"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mart"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Jun"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Jul"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Avgust"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Septembar"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktobar"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Novembar"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Decembar"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Podešavanja"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "Pre par sekundi"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "Danas"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "juÄe"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Prije %n dan."
msgstr[1] "Prije %n dana."
msgstr[2] "Prije %n dana."
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "prošlog meseca"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "prošle godine"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "pre nekoliko godina"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Izaberi"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Izaberi"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Otkaži"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -297,140 +302,149 @@ msgstr "Deljeno"
msgid "Share"
msgstr "Podeli"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Greška"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Greška pri deljenju"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Greška u uklanjanju deljenja"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Greška u promeni dozvola"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} podelio sa Vama i grupom {group} "
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Sa vama podelio {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Zaštita lozinkom"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Lozinka"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Pošalji link e-mailom"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Pošalji"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Datum isteka"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Datum isteka"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Deli putem e-maila"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Nema pronađenih ljudi"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Dalje deljenje nije dozvoljeno"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Deljeno u {item} sa {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Ukljoni deljenje"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "dozvoljene izmene"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "kontrola pristupa"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "napravi"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "ažuriranje"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "brisanje"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "deljenje"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Zaštćeno lozinkom"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Greška u uklanjanju datuma isteka"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Greška u postavljanju datuma isteka"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Slanje..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Email poslat"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -462,18 +476,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "Ažuriranje nije uspelo. Molimo obavestite <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud zajednicu</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Ažuriranje je uspelo. Prosleđivanje na ownCloud."
@@ -674,6 +689,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Napravi <strong>administrativni nalog</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Lozinka"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -799,7 +818,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 8a5cc78d736a0e899b0361800a34bda5b24135ee..124cc3dc9d85d19832cd100fbb3689c96a105fe6 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr "Nedostaje privremena fascikla"
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Fajlovi"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,123 +177,123 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Podeli"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Preimenij"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Greška"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Ime"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "VeliÄina"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Zadnja izmena"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -299,12 +303,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -341,68 +345,75 @@ msgstr ""
msgid "Save"
msgstr "Snimi"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Ovde nema niÄeg. PoÅ¡aljite neÅ¡to!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Preuzmi"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Obriši"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Pošiljka je prevelika"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
index 11e2fec48d65932fe1d60ab5061aba8a042c0095..ecc4d3e78d56a1520c2dd00debec2479fee004fb 100644
--- a/l10n/sr@latin/files_encryption.po
+++ b/l10n/sr@latin/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index 0e7bea5bbe7f90cac0c4f0bb1cdf23b8046e4d28..fd8040a72bf52c60c11771600f63f3b569d9e639 100644
--- a/l10n/sr@latin/files_external.po
+++ b/l10n/sr@latin/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:10+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index c32964116c6c39f34808125e2b9dab0560008a7b..ffc5c791595d2e0dfa0ca064e288e282f7222119 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: sr@latin\n"
"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);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "Lozinka"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "Preuzmi"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po
index 0098ac3a7526959ab8f52fc7ee258d55d662152b..17b9afaf5047c2d8223a627e9048ca80183a72d4 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Greška"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Ime"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Obriši"
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index 5f48a6b8e94f761490728c806f67800da4955f46..acbe7fe60f984ca5d6082adcc37eb604490d9982 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: sr@latin\n"
"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);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index c53bde2cddb8a4a173700582760b8923daa80fc8..fdc9b82bacf50fc95ffc2ff8606d44f189d84541 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "Email poslat"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Jezik je izmenjen"
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupe"
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr "Jezik"
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index cc13196c21bb26feca7e1177886b3a1bb748554d..3b9cbb9ab317cdebb4f08ac3e941d8adda7c5946 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "Greška"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,7 +142,7 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -134,7 +150,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -142,14 +158,30 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Snimi"
@@ -222,10 +254,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -289,6 +334,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Napredno"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/su/core.po b/l10n/su/core.po
index ae84b0e517bb493e2d7c3916b1f1778e815680e5..9bb0a067e7f844c6ea2888c4fa862a4948106c98 100644
--- a/l10n/su/core.po
+++ b/l10n/su/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: su\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,202 +63,202 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,140 +290,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -450,18 +464,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -662,6 +677,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -787,7 +806,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/su/files.po b/l10n/su/files.po
index 5350854440606114f1ad12c8a76a3bd63998b216..cd9555ed4ea8d8e2b40c0f0586e664cec53b676f 100644
--- a/l10n/su/files.po
+++ b/l10n/su/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,117 +177,117 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -293,12 +297,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -335,68 +339,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/su/files_encryption.po b/l10n/su/files_encryption.po
index 43e3808a37d45eb10aefb3e2832d99856dc0e56d..9a941b86fd6cd17f4b67a9983559a2ab4a707552 100644
--- a/l10n/su/files_encryption.po
+++ b/l10n/su/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/su/files_external.po b/l10n/su/files_external.po
index 86fa85def16a255c65f9246c1068d67b864bede7..942014632506eb59d6165fc0e41ced367553472e 100644
--- a/l10n/su/files_external.po
+++ b/l10n/su/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/su/files_sharing.po b/l10n/su/files_sharing.po
index 35479e18ff73ad2a98c49b90269538ebd6527899..6311beffd2a45f5fd14415e5db3d4278dafcf6d0 100644
--- a/l10n/su/files_sharing.po
+++ b/l10n/su/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: su\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/su/files_trashbin.po b/l10n/su/files_trashbin.po
index a2c4e0bb72fccd8767a01c8535b1bc43ea069bba..b0691a0c2054582ba74dda475af8cbda57930f2f 100644
--- a/l10n/su/files_trashbin.po
+++ b/l10n/su/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/su/lib.po b/l10n/su/lib.po
index 392aa429e71e57bc820e2c3607eca1a1686a8849..a73000a22007ce2a4cccfb87b59f825e5d80a1d7 100644
--- a/l10n/su/lib.po
+++ b/l10n/su/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: su\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/su/settings.po b/l10n/su/settings.po
index b33b3f24895fa26a03f85036c9be10ea58fa883f..a61a20aa23e6df42ed3c8a4e505893a2aa259107 100644
--- a/l10n/su/settings.po
+++ b/l10n/su/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/su/user_ldap.po b/l10n/su/user_ldap.po
index 9265d4f0983f6d711357e2c8e64f72b794174d4d..2d9a77a13cd4bb673025623becb7447efae6cd84 100644
--- a/l10n/su/user_ldap.po
+++ b/l10n/su/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,66 +90,94 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -218,10 +250,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -285,6 +330,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 0d91b8ae31f8a84afb652e7235611eb8db4d69bd..74c9c642d5d998519385893b7a661d61587523e5 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -8,7 +8,7 @@
# enoch85 <enoch85@gmail.com>, 2014
# Gunnar Norin <blittan@xbmc.org>, 2013
# Gustav Smedberg <shadow.elf@hotmail.com>, 2013
-# medialabs, 2013
+# medialabs, 2013-2014
# kallemooo <karl.h.thoren@gmail.com>, 2013
# Magnus Höglund <magnus@linux.com>, 2013
# medialabs, 2013
@@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
-"Last-Translator: enoch85 <enoch85@gmail.com>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 10:02+0000\n"
+"Last-Translator: medialabs\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,11 +26,11 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "Utgångsdatumet är i det förflutna."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Gick inte att skicka e-post till följande användare: %s"
@@ -47,6 +47,11 @@ msgstr "Deaktiverade underhållsläge"
msgid "Updated database"
msgstr "Uppdaterade databasen"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr "Inaktiverade inkompatibla appar: %s"
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Ingen bild eller fil har tillhandahållits"
@@ -67,207 +72,207 @@ msgstr "Ingen temporär profilbild finns tillgänglig, försök igen"
msgid "No crop data provided"
msgstr "Ingen beskärdata har angivits"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Söndag"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "MÃ¥ndag"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Tisdag"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Onsdag"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Torsdag"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Fredag"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Lördag"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Januari"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Februari"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mars"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "April"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Maj"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Juni"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Juli"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Augusti"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "September"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Oktober"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "November"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "December"
-#: js/js.js:483
+#: js/js.js:496
msgid "Settings"
msgstr "Inställningar"
-#: js/js.js:583
+#: js/js.js:596
msgid "Saving..."
msgstr "Sparar..."
-#: js/js.js:1240
+#: js/js.js:1220
msgid "seconds ago"
msgstr "sekunder sedan"
-#: js/js.js:1241
+#: js/js.js:1221
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minut sedan"
msgstr[1] "%n minuter sedan"
-#: js/js.js:1242
+#: js/js.js:1222
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n timme sedan"
msgstr[1] "%n timmar sedan"
-#: js/js.js:1243
+#: js/js.js:1223
msgid "today"
msgstr "i dag"
-#: js/js.js:1244
+#: js/js.js:1224
msgid "yesterday"
msgstr "i går"
-#: js/js.js:1245
+#: js/js.js:1225
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n dag sedan"
msgstr[1] "%n dagar sedan"
-#: js/js.js:1246
+#: js/js.js:1226
msgid "last month"
msgstr "förra månaden"
-#: js/js.js:1247
+#: js/js.js:1227
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n månad sedan"
msgstr[1] "%n månader sedan"
-#: js/js.js:1248
+#: js/js.js:1228
msgid "last year"
msgstr "förra året"
-#: js/js.js:1249
+#: js/js.js:1229
msgid "years ago"
msgstr "Ã¥r sedan"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Välj"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Fel uppstod för filväljarmall: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Nej"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Välj"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Fel uppstod för filväljarmall: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Fel uppstod under inläsningen av meddelandemallen: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} filkonflikt"
msgstr[1] "{count} filkonflikter"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "En filkonflikt"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Nya filer"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Filer som redan existerar"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Vilken fil vill du behålla?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
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:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Fortsätt"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(Alla valda)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} valda)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Fel uppstod filmall existerar"
@@ -291,148 +296,157 @@ msgstr "Bra lösenord"
msgid "Strong password"
msgstr "Starkt lösenord"
-#: js/share.js:51 js/share.js:66 js/share.js:106
+#: js/share.js:69 js/share.js:84 js/share.js:127
msgid "Shared"
msgstr "Delad"
-#: js/share.js:109
+#: js/share.js:130
msgid "Share"
msgstr "Dela"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:195 js/share.js:208 js/share.js:215 js/share.js:822
#: templates/installation.php:10
msgid "Error"
msgstr "Fel"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:197 js/share.js:885
msgid "Error while sharing"
msgstr "Fel vid delning"
-#: js/share.js:171
+#: js/share.js:208
msgid "Error while unsharing"
msgstr "Fel när delning skulle avslutas"
-#: js/share.js:178
+#: js/share.js:215
msgid "Error while changing permissions"
msgstr "Fel vid ändring av rättigheter"
-#: js/share.js:188
+#: js/share.js:225
msgid "Shared with you and the group {group} by {owner}"
msgstr "Delad med dig och gruppen {group} av {owner}"
-#: js/share.js:190
+#: js/share.js:227
msgid "Shared with you by {owner}"
msgstr "Delad med dig av {owner}"
-#: js/share.js:214
+#: js/share.js:251
msgid "Share with user or group …"
msgstr "Dela med användare eller grupp..."
-#: js/share.js:220
+#: js/share.js:257
msgid "Share link"
msgstr "Dela länk"
-#: js/share.js:223
+#: js/share.js:263
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades"
+
+#: js/share.js:265
+msgid "By default the public link will expire after {days} days"
+msgstr "Som standard kommer den publika länken att sluta gälla efter {days} dagar"
+
+#: js/share.js:270
msgid "Password protect"
msgstr "Lösenordsskydda"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Lösenord"
+#: js/share.js:272
+msgid "Choose a password for the public link"
+msgstr "Välj ett lösenord för den publika länken"
-#: js/share.js:230
+#: js/share.js:278
msgid "Allow Public Upload"
msgstr "Tillåt publik uppladdning"
-#: js/share.js:234
+#: js/share.js:282
msgid "Email link to person"
msgstr "E-posta länk till person"
-#: js/share.js:235
+#: js/share.js:283
msgid "Send"
msgstr "Skicka"
-#: js/share.js:240
+#: js/share.js:288
msgid "Set expiration date"
msgstr "Sätt utgångsdatum"
-#: js/share.js:241
+#: js/share.js:289
msgid "Expiration date"
msgstr "Utgångsdatum"
-#: js/share.js:277
+#: js/share.js:326
msgid "Share via email:"
msgstr "Dela via e-post:"
-#: js/share.js:280
+#: js/share.js:329
msgid "No people found"
msgstr "Hittar inga användare"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:377 js/share.js:438
msgid "group"
msgstr "Grupp"
-#: js/share.js:357
+#: js/share.js:410
msgid "Resharing is not allowed"
msgstr "Dela vidare är inte tillåtet"
-#: js/share.js:401
+#: js/share.js:454
msgid "Shared in {item} with {user}"
msgstr "Delad i {item} med {user}"
-#: js/share.js:423
+#: js/share.js:476
msgid "Unshare"
msgstr "Sluta dela"
-#: js/share.js:431
+#: js/share.js:484
msgid "notify by email"
msgstr "informera via e-post"
-#: js/share.js:434
+#: js/share.js:487
msgid "can edit"
msgstr "kan redigera"
-#: js/share.js:436
+#: js/share.js:489
msgid "access control"
msgstr "Ã¥tkomstkontroll"
-#: js/share.js:439
+#: js/share.js:492
msgid "create"
msgstr "skapa"
-#: js/share.js:442
+#: js/share.js:495
msgid "update"
msgstr "uppdatera"
-#: js/share.js:445
+#: js/share.js:498
msgid "delete"
msgstr "radera"
-#: js/share.js:448
+#: js/share.js:501
msgid "share"
msgstr "dela"
-#: js/share.js:721
+#: js/share.js:803
msgid "Password protected"
msgstr "Lösenordsskyddad"
-#: js/share.js:734
+#: js/share.js:822
msgid "Error unsetting expiration date"
msgstr "Fel vid borttagning av utgångsdatum"
-#: js/share.js:752
+#: js/share.js:843
msgid "Error setting expiration date"
msgstr "Fel vid sättning av utgångsdatum"
-#: js/share.js:777
+#: js/share.js:872
msgid "Sending ..."
msgstr "Skickar ..."
-#: js/share.js:788
+#: js/share.js:883
msgid "Email sent"
msgstr "E-post skickat"
-#: js/share.js:812
+#: js/share.js:907
msgid "Warning"
msgstr "Varning"
@@ -464,18 +478,19 @@ msgstr "Fel under laddning utav dialog mall: {fel}"
msgid "No tags selected for deletion."
msgstr "Inga taggar valda för borttagning."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr "Uppdaterar {productName} till version {version}, detta kan ta en stund."
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Vänligen ladda om sidan."
-#: 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 "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr "Uppdateringen misslyckades."
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud."
@@ -676,6 +691,10 @@ msgstr "För information hur du korrekt konfigurerar din servern, se ownCloud <a
msgid "Create an <strong>admin account</strong>"
msgstr "Skapa ett <strong>administratörskonto</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Lösenord"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Lagring & databas"
@@ -801,8 +820,27 @@ msgstr "Tack för ditt tålamod."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Uppdaterar ownCloud till version %s, detta kan ta en stund."
+msgid "%s will be updated to version %s."
+msgstr "%s kommer att uppdateras till version %s."
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr "Följande appar kommer att inaktiveras:"
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr "Temat %s har blivit inaktiverat."
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr "Vänligen säkerställ att en säkerhetskopia har gjorts av databasen, konfigurations- och datamappen innan du fortsätter."
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr "Starta uppdateringen"
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index e8c245380d3f5f1313d630933ad9e3f7629970f0..b2ca6247e17b4ebe0ae7a4dbf675dc967afbfb06 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -9,7 +9,8 @@
# enoch85 <enoch85@gmail.com>, 2014
# Gunnar Norin <blittan@xbmc.org>, 2013
# Gustav Smedberg <shadow.elf@hotmail.com>, 2013
-# medialabs, 2013
+# henrikhjelm <mailto@henrikhjelm.se>, 2014
+# medialabs, 2013-2014
# kallemooo <karl.h.thoren@gmail.com>, 2013
# Magnus Höglund <magnus@linux.com>, 2013
# medialabs, 2013
@@ -17,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 19:40+0000\n"
+"Last-Translator: henrikhjelm <mailto@henrikhjelm.se>\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"
@@ -37,7 +38,7 @@ msgstr "Kunde inte flytta %s - Det finns redan en fil med detta namn"
msgid "Could not move %s"
msgstr "Kan inte flytta %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Filnamn kan inte vara tomt."
@@ -46,18 +47,18 @@ msgstr "Filnamn kan inte vara tomt."
msgid "\"%s\" is an invalid file name."
msgstr "\"%s\" är ett ogiltigt filnamn."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "MÃ¥lmappen har flyttats eller tagits bort."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -133,44 +134,48 @@ msgstr "En temporär mapp saknas"
msgid "Failed to write to disk"
msgstr "Misslyckades spara till disk"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Inte tillräckligt med lagringsutrymme tillgängligt"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Uppladdning misslyckades. Kunde inte hitta den uppladdade filen"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Uppladdning misslyckades. Gick inte att hämta filinformation."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Felaktig mapp."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Filer"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Alla filer"
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller har 0 bytes."
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "Totala filstorleken {size1} överskrider uppladdningsgränsen {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Inte tillräckligt med ledigt utrymme, du laddar upp {size1} men endast {size2} finns kvar."
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Uppladdning avbruten."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Gick inte att hämta resultat från server."
@@ -183,120 +188,120 @@ msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen."
msgid "URL cannot be empty"
msgstr "URL kan ej vara tomt"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1170
msgid "{new_name} already exists"
msgstr "{new_name} finns redan"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Kunde ej skapa fil"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Kunde ej skapa katalog"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Fel vid hämtning av URL"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Dela"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Radera permanent"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Byt namn"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:596 js/filelist.js:1665
msgid "Pending"
msgstr "Väntar"
-#: js/filelist.js:916
+#: js/filelist.js:1121
msgid "Error moving file."
-msgstr ""
+msgstr "Fel vid flytt av fil."
-#: js/filelist.js:924
+#: js/filelist.js:1129
msgid "Error moving file"
msgstr "Fel uppstod vid flyttning av fil"
-#: js/filelist.js:924
+#: js/filelist.js:1129
msgid "Error"
msgstr "Fel"
-#: js/filelist.js:988
+#: js/filelist.js:1207
msgid "Could not rename file"
msgstr "Kan ej byta filnamn"
-#: js/filelist.js:1122
+#: js/filelist.js:1328
msgid "Error deleting file."
msgstr "Kunde inte ta bort filen."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1431 templates/list.php:62
msgid "Name"
msgstr "Namn"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1432 templates/list.php:75
msgid "Size"
msgstr "Storlek"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1433 templates/list.php:78
msgid "Modified"
msgstr "Ändrad"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1443 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n mapp"
msgstr[1] "%n mappar"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1449 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fil"
msgstr[1] "%n filer"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1573 js/filelist.js:1612
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Laddar upp %n fil"
msgstr[1] "Laddar upp %n filer"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" är ett ogiltligt filnamn."
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och in igen"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Ogiltig privat nyckel i krypteringsprogrammet. Vänligen uppdatera lösenordet till din privata nyckel under dina personliga inställningar för att återfå tillgång till dina krypterade filer."
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -306,12 +311,12 @@ msgstr "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vän
msgid "{dirs} and {files}"
msgstr "{dirs} och {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s kunde inte namnändras"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Ladda upp (max. %s)"
@@ -348,68 +353,75 @@ msgstr "Största tillåtna storlek för ZIP-filer"
msgid "Save"
msgstr "Spara"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "Använd denna adress till <a href=\"%s\" target=\"_blank\">nå dina Filer via WebDAV</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "Ny"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Ny textfil"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Textfil"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Ny mapp"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Mapp"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Från länk"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Raderade filer"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Avbryt uppladdning"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Du har ej tillåtelse att ladda upp eller skapa filer här"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Ingenting här. Ladda upp något!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Ladda ner"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Radera"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "För stor uppladdning"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Filer skannas, var god vänta"
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Aktuell skanning"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr "sökning pågår"
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index eb0ddaf59358099362b16c770bba5d1066bd2489..763343c67f3b1a760f27c7cf2bfb907889e0e70c 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -6,6 +6,7 @@
# AsavarTzeth <asavartzeth@gmail.com>, 2014
# Daniel Sandman <revoltism@gmail.com>, 2013
# Gustav Smedberg <shadow.elf@hotmail.com>, 2013
+# henrikhjelm <mailto@henrikhjelm.se>, 2014
# medialabs, 2013
# kallemooo <karl.h.thoren@gmail.com>, 2013
# Magnus Höglund <magnus@linux.com>, 2013
@@ -15,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-06 01:55-0400\n"
-"PO-Revision-Date: 2014-04-05 18:30+0000\n"
-"Last-Translator: AsavarTzeth <asavartzeth@gmail.com>\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 19:40+0000\n"
+"Last-Translator: henrikhjelm <mailto@henrikhjelm.se>\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"
@@ -84,9 +85,9 @@ msgstr "Kan ej dekryptera denna fil, förmodligen är det en delad fil. Be ägar
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "Oväntat fel, kolla dina system inställningar eller kontakta din administratör"
+msgstr "Okänt fel. Kontrollera dina systeminställningar eller kontakta din administratör"
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -99,7 +100,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och korrekt konfigurerad. Kryptering är tillsvidare inaktiverad."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "Följande användare har inte aktiverat kryptering:"
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index 1c70c5237534e43038613811316f0eb718338813..4da2749280eafd1e3ac7ffad64061e36b1ba647e 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -6,14 +6,15 @@
# AsavarTzeth <asavartzeth@gmail.com>, 2014
# enoch85 <enoch85@gmail.com>, 2014
# henrikhjelm <mailto@henrikhjelm.se>, 2014
+# medialabs, 2014
# medialabs, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 10:12+0000\n"
+"Last-Translator: medialabs\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"
@@ -25,157 +26,161 @@ msgstr ""
msgid "Local"
msgstr "Lokal"
-#: appinfo/app.php:36
+#: appinfo/app.php:37
msgid "Location"
msgstr "Plats"
-#: appinfo/app.php:39
+#: appinfo/app.php:40
msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
-#: appinfo/app.php:41
+#: appinfo/app.php:43
msgid "Key"
-msgstr ""
+msgstr "Nyckel"
-#: appinfo/app.php:42
+#: appinfo/app.php:44
msgid "Secret"
-msgstr ""
+msgstr "Hemlig"
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
msgid "Bucket"
-msgstr ""
+msgstr "Bucket"
-#: appinfo/app.php:47
+#: appinfo/app.php:49
msgid "Amazon S3 and compliant"
-msgstr ""
+msgstr "Amazon S3 och compliant"
-#: appinfo/app.php:49
+#: appinfo/app.php:52
msgid "Access Key"
-msgstr ""
+msgstr "Accessnyckel"
-#: appinfo/app.php:50
+#: appinfo/app.php:53
msgid "Secret Key"
-msgstr ""
+msgstr "Hemlig nyckel"
-#: appinfo/app.php:52
+#: appinfo/app.php:55
msgid "Hostname (optional)"
-msgstr ""
+msgstr "Värdnamn (valfritt)"
-#: appinfo/app.php:53
+#: appinfo/app.php:56
msgid "Port (optional)"
-msgstr ""
+msgstr "Port (valfritt)"
-#: appinfo/app.php:54
+#: appinfo/app.php:57
msgid "Region (optional)"
-msgstr ""
+msgstr "Region (valfritt)"
-#: appinfo/app.php:55
+#: appinfo/app.php:58
msgid "Enable SSL"
-msgstr ""
+msgstr "Aktivera SSL"
-#: appinfo/app.php:56
+#: appinfo/app.php:59
msgid "Enable Path Style"
msgstr ""
-#: appinfo/app.php:63
+#: appinfo/app.php:67
msgid "App key"
-msgstr ""
+msgstr "App-nyckel"
-#: appinfo/app.php:64
+#: appinfo/app.php:68
msgid "App secret"
-msgstr ""
+msgstr "App-hemlighet"
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
+msgid "Host"
+msgstr "Server"
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
msgid "Username"
msgstr "Användarnamn"
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
msgid "Password"
msgstr "Lösenord"
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
msgid "Root"
-msgstr ""
+msgstr "Root"
-#: appinfo/app.php:77
+#: appinfo/app.php:82
msgid "Secure ftps://"
-msgstr ""
+msgstr "Säker ftps://"
-#: appinfo/app.php:84
+#: appinfo/app.php:90
msgid "Client ID"
-msgstr ""
+msgstr "Klient ID"
-#: appinfo/app.php:85
+#: appinfo/app.php:91
msgid "Client secret"
-msgstr ""
+msgstr "klient secret"
-#: appinfo/app.php:92
+#: appinfo/app.php:98
msgid "OpenStack Object Storage"
-msgstr ""
+msgstr "OpenStack Object Storage"
-#: appinfo/app.php:94
+#: appinfo/app.php:101
msgid "Username (required)"
-msgstr ""
+msgstr "Användarnamn (måste anges)"
-#: appinfo/app.php:95
+#: appinfo/app.php:102
msgid "Bucket (required)"
-msgstr ""
+msgstr "Bucket (krävs)"
-#: appinfo/app.php:96
+#: appinfo/app.php:103
msgid "Region (optional for OpenStack Object Storage)"
-msgstr ""
+msgstr "Region (valfritt för OpenStack Object Storage)"
-#: appinfo/app.php:97
+#: appinfo/app.php:104
msgid "API Key (required for Rackspace Cloud Files)"
-msgstr ""
+msgstr "API-nyckel (krävs för Rackspace Cloud Files)"
-#: appinfo/app.php:98
+#: appinfo/app.php:105
msgid "Tenantname (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:99
+#: appinfo/app.php:106
msgid "Password (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Lösenord (krävs för OpenStack Object Storage)"
-#: appinfo/app.php:100
+#: appinfo/app.php:107
msgid "Service Name (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Tjänstens namn (krävs för OpenStack Object Storage)"
-#: appinfo/app.php:101
+#: appinfo/app.php:108
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:102
+#: appinfo/app.php:109
msgid "Timeout of HTTP requests in seconds (optional)"
-msgstr ""
+msgstr "Timeout för HTTP-förfrågningar i sekunder (tillval)"
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
msgid "Share"
msgstr "Dela"
-#: appinfo/app.php:119
+#: appinfo/app.php:127
msgid "SMB / CIFS using OC login"
-msgstr ""
+msgstr "SMB / CIFS använder OC inloggning"
-#: appinfo/app.php:122
+#: appinfo/app.php:131
msgid "Username as share"
-msgstr ""
+msgstr "Användarnamn till utdelning"
+
+#: appinfo/app.php:141 appinfo/app.php:152
+msgid "URL"
+msgstr "URL"
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:145 appinfo/app.php:156
msgid "Secure https://"
-msgstr ""
+msgstr "Säker https://"
-#: appinfo/app.php:144
+#: appinfo/app.php:155
msgid "Remote subfolder"
-msgstr ""
+msgstr "Fjärrmapp"
#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
msgid "Access granted"
@@ -201,29 +206,29 @@ msgstr "Fel vid konfigurering av Google Drive"
msgid "Saved"
msgstr "Sparad"
-#: lib/config.php:598
+#: lib/config.php:674
msgid "<b>Note:</b> "
msgstr "<b> OBS: </ b>"
-#: lib/config.php:608
+#: lib/config.php:684
msgid " and "
msgstr "och"
-#: lib/config.php:630
+#: lib/config.php:706
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b> OBS: </ b> cURL stöd i PHP inte är aktiverat eller installeras. Montering av %s är inte möjlig. Be din systemadministratör att installera det."
-#: lib/config.php:632
+#: lib/config.php:708
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b> OBS: </ b> Den FTP-stöd i PHP inte är aktiverat eller installeras. Montering av %s är inte möjlig. Be din systemadministratör att installera det."
-#: lib/config.php:634
+#: lib/config.php:710
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 9d1259ee7c3a1daf7966c8b3bb67a36b0c7e7111..0d56e1efd3ea83ee2925d63b09d90c356f023e38 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -21,10 +21,34 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Delad av {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Den här delningen är lösenordsskyddad"
@@ -37,6 +61,14 @@ msgstr "Lösenordet är fel. Försök igen."
msgid "Password"
msgstr "Lösenord"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Tyvärr, denna länk verkar inte fungera längre."
@@ -65,11 +97,11 @@ msgstr "För mer information, kontakta den person som skickade den här länken.
msgid "Download"
msgstr "Ladda ner"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Ladda ner %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Direkt länk"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index b27247db1f8b3589ce097cf137e331825e2c67e5..8c8e1cd82d4d18af5f2a3056f7fb02ad27ba3a6b 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:55+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -29,38 +29,34 @@ msgstr "Kunde inte radera %s permanent"
msgid "Couldn't restore %s"
msgstr "Kunde inte återställa %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Raderade filer"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Ã…terskapa"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Fel"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Raderade filer"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "återställd"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Ingenting här. Din papperskorg är tom!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Namn"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Ã…terskapa"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Raderad"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Radera"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index dadfa4d6836f7e6c7f50dbba166a393549b492c3..99752e7cb4905bc55c2b7cd2904975644df640e6 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -7,7 +7,7 @@
# Daniel Sandman <revoltism@gmail.com>, 2013
# enoch85 <enoch85@gmail.com>, 2014
# henrikhjelm <mailto@henrikhjelm.se>, 2014
-# medialabs, 2013
+# medialabs, 2013-2014
# kallemooo <karl.h.thoren@gmail.com>, 2013
# Magnus Höglund <magnus@linux.com>, 2013
# medialabs, 2013
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-25 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 23:51+0000\n"
+"Last-Translator: medialabs\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"
@@ -25,16 +25,16 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
-msgstr ""
+msgstr "Du ansluter till servern från en osäker domän."
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
"example configuration is provided in config/config.sample.php."
-msgstr ""
+msgstr "Vänligen kontakta din administratör. Om du är en administratör, konfigurera inställningen \"trusted_domain\" i config/config.php. En exempelkonfiguration finns i tillgänglig i config/config.sample.php."
#: private/app.php:236
#, php-format
@@ -84,23 +84,23 @@ msgstr "Ogiltig bild"
msgid "web services under your control"
msgstr "webbtjänster under din kontroll"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Nerladdning av ZIP är avstängd."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Filer laddas ner en åt gången."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Tillbaka till Filer"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Valda filer är för stora för att skapa zip-fil."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -286,127 +286,138 @@ msgstr "Ange ett användarnamn för administratören."
msgid "Set an admin password."
msgstr "Ange ett administratörslösenord."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s delade »%s« med dig"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
-msgstr ""
+msgstr "Delning av %s misslyckades på grund av att filen inte existerar"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Du har inte rätt att dela %s"
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "Delning %s misslyckades därför att användaren %s är den som äger objektet"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "Delning %s misslyckades därför att användaren %s inte existerar"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr "Delning %s misslyckades därför att användaren %s inte är medlem i någon utav de grupper som %s är medlem i"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "Delning %s misslyckades därför att objektet redan är delat med %s"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "Delning %s misslyckades därför att gruppen %s inte existerar"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "Delning %s misslyckades därför att %s inte ingår i gruppen %s"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Du måste ange ett lösenord för att skapa en offentlig länk, endast skyddade länkar är tillåtna"
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "Delning %s misslyckades därför att delning utav länkar inte är tillåtet"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr "Delningstyp %s är inte giltig för %s"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr "Misslyckades att sätta rättigheter för %s därför att rättigheterna överskrider de som är tillåtna för %s"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "Att sätta rättigheterna för %s misslyckades därför att objektet inte hittades"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr "Delningsgränssnittet %s måste implementera gränssnittet OCP\\Share_Backend"
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr "Delningsgränssnittet %s hittades inte"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr "Delningsgränssnittet för %s hittades inte"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr "Delning %s misslyckades därför att användaren %s är den som delade objektet först"
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr "Delning %s misslyckades därför att rättigheterna överskrider de rättigheter som är tillåtna för %s"
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr "Delning %s misslyckades därför att vidaredelning inte är tillåten"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr "Delning %s misslyckades därför att delningsgränsnittet för %s inte kunde hitta sin källa"
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr "Delning %s misslyckades därför att filen inte kunde hittas i filcachen"
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Kunde inte hitta kategorin \"%s\""
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 740ae25e56c9736fc2e21174bdab74f2914607e7..01340ef83ab3fb045e20cd113fb29f7ce669cf24 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -11,7 +11,7 @@
# henrikhjelm <mailto@henrikhjelm.se>, 2014
# Jan Busk, 2013
# Jan Busk, 2013
-# medialabs, 2013
+# medialabs, 2013-2014
# kallemooo <karl.h.thoren@gmail.com>, 2013
# Magnus Höglund <magnus@linux.com>, 2013
# medialabs, 2013
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -60,15 +60,15 @@ msgstr "E-post skickat"
msgid "You need to set your user email before being able to send test emails."
msgstr "Du behöver ställa in din användares e-postadress före du kan skicka test e-post."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Sändningsläge"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Kryptering"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Autentiseringsmetod"
@@ -111,6 +111,16 @@ msgstr "Det gick inte att dekryptera dina filer, kontrollera din owncloud.log el
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Krypteringsnycklar raderades permanent"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Det gick inte att permanent ta bort dina krypteringsnycklar, kontrollera din owncloud.log eller fråga din administratör"
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "E-post sparad"
@@ -127,6 +137,16 @@ msgstr "Kan inte radera grupp"
msgid "Unable to delete user"
msgstr "Kan inte radera användare"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Återställning av säkerhetskopior lyckades"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Kan inte återställa dina krypteringsnycklar, vänligen kontrollera din owncloud.log eller fråga din administratör."
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Språk ändrades"
@@ -182,7 +202,7 @@ msgstr "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteri
msgid "Unable to change password"
msgstr "Kunde inte ändra lösenord"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Skickar..."
@@ -238,34 +258,42 @@ msgstr "Uppdatera"
msgid "Updated"
msgstr "Uppdaterad"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Välj en profilbild"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Väldigt svagt lösenord"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Svagt lösenord"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Okej lösenord"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Bra lösenord"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Starkt lösenord"
-#: js/personal.js:313
+#: js/personal.js:310
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:324
+msgid "Delete encryption keys permanently."
+msgstr "Radera krypteringsnycklar permanent"
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Återställ krypteringsnycklar"
+
#: js/users.js:47
msgid "deleted"
msgstr "raderad"
@@ -278,8 +306,8 @@ msgstr "Ã¥ngra"
msgid "Unable to remove user"
msgstr "Kan inte ta bort användare"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Grupper"
@@ -311,7 +339,7 @@ msgstr "Ett giltigt lösenord måste anges"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Varning: Hem katalogen för varje användare \"{användare}\" finns redan"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__language_name__"
@@ -379,7 +407,7 @@ msgid ""
"root."
msgstr "Din datakatalog och dina filer är förmodligen åtkomliga från internet. Filen .htaccess fungerar inte. Vi rekommenderar starkt att du konfigurerar din webbserver så att datakatalogen inte längre är åtkomlig eller du flyttar datakatalogen utanför webbserverns rotkatalog."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Installationsvarning"
@@ -394,53 +422,65 @@ 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 "Vänligen dubbelkolla igenom <a href=\"%s\">installationsguiden</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Modulen \"fileinfo\" saknas"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "Din PHP version är föråldrad"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "Din PHP version är föråldrad. Vi rekommenderar starkt att uppdatera till 5.3.8 eller nyare eftersom äldre versioner är obrukbara. Det är möjligt att denna installation inte fungerar korrekt."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Locale fungerar inte"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "Systemspråk kan inte ställas in till ett som stödjer UTF-8."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Detta betyder att där kan komma att uppstå problem med vissa tecken i filnamn."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Vi rekommenderar starkt att installera de paket som krävs på ditt system för att stödja en av följande systemspråk: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Internetförbindelsen fungerar inte"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -449,198 +489,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Servern har ingen fungerande internetanslutning. Detta innebär att en del av de funktioner som montering av extern lagring, notifieringar om uppdateringar eller installation av 3: e part appar inte fungerar. Åtkomst till filer och skicka e-postmeddelanden fungerar troligen inte heller. Vi rekommenderar starkt att aktivera en internetuppkoppling för denna server om du vill ha alla funktioner."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "Sista cron kördes vid %s"
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "Sista cron kördes vid %s. Detta är mer än en timme sedan, något verkar fel."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "Cron kördes inte ännu!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Exekvera en uppgift vid varje sidladdning"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php är registrerad som en webcron service att ropa på cron.php varje 15 minuter över http."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "Använd systemets cron service att ropa på cron.php filen varje 15 minuter."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Dela"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Aktivera delat API"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Tillåt applikationer att använda delat API"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Tillåt länkar"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Tillåt delning till allmänheten via publika länkar"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr "Tillämpa lösenordskydd"
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Tillåt offentlig uppladdning"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Tillåt användare att aktivera\nTillåt användare att göra det möjligt för andra att ladda upp till sina offentligt delade mappar"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "Ställ in standardutgångsdatum"
-#: templates/admin.php:235
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Förfaller efter"
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "dagar"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Tillämpa förfallodatum"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Tillåt delning till allmänheten via publika länkar"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Tillåt vidaredelning"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Tillåt användare att dela vidare filer som delats med dem"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Tillåt delning med alla"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Tillåt bara delning med användare i egna grupper"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Tillåt e-post notifikation"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Tillåt användare att skicka mailnotifieringar för delade filer"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Förfaller efter"
-
-#: templates/admin.php:266
-msgid "days"
-msgstr "dagar"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr "Exkludera grupp från att dela"
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Låt delningar förfalla som standard efter N dagar"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar."
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Säkerhet"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "Kräv HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Tvingar klienterna att ansluta till %s via en krypterad anslutning."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Anslut till din %s via HTTPS för att aktivera/deaktivera SSL"
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "E-postserver"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "Detta används för att skicka ut notifieringar."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Från adress"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr "mail"
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Autentisering krävs"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Serveradress"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Port"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Inloggningsuppgifter"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "SMTP användarnamn"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "SMTP lösenord"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "Testa e-post inställninggar"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "Skicka e-post"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Logg"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Nivå på loggning"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Mer"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Version"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -793,29 +841,33 @@ msgstr "Språk"
msgid "Help translate"
msgstr "Hjälp att översätta"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "Använd denna adress till <a href=\"%s\" target=\"_blank\">nå dina Filer via WebDAV</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Inloggningslösenord"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "Dekryptera alla filer"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Dina krypteringsnycklar flyttas till en backup. Om något gick fel kan du återställa nycklarna. Bara ta bort dem permanent om du är säker på att alla filer dekrypteras korrekt."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Återställ krypteringsnycklar"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Radera krypteringsnycklar"
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Inloggningsnamn"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index c54d109cc9a70c5f46b2fb958eb2974fb2591f5d..ebbf8ca17d014529fa45632b154a9491a64eae5a 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -9,6 +9,7 @@
# henrikhjelm <mailto@henrikhjelm.se>, 2014
# Jan Busk, 2013
# Jonas Erlandsson <jonas.erlandsson@gmail.com>, 2013
+# medialabs, 2014
# kallemooo <karl.h.thoren@gmail.com>, 2013
# lagre, 2014
# Magnus Höglund <magnus@linux.com>, 2013
@@ -17,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: henrikhjelm <mailto@henrikhjelm.se>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 19:02+0000\n"
+"Last-Translator: medialabs\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"
@@ -80,6 +81,10 @@ msgstr "Ta över inställningar från tidigare serverkonfiguration?"
msgid "Keep settings?"
msgstr "Behåll inställningarna?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Server"
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Kunde inte lägga till serverinställning"
@@ -96,6 +101,18 @@ msgstr "Lyckat"
msgid "Error"
msgstr "Fel"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Vänligen ange en Base DN"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Det gick inte att avgöra Base DN"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Specificera en port"
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Konfigurationen är OK"
@@ -136,28 +153,44 @@ msgstr "Vill du verkligen radera den nuvarande serverinställningen?"
msgid "Confirm Deletion"
msgstr "Bekräfta radering"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s grupp hittad"
msgstr[1] "%s grupper hittade"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s användare hittad"
msgstr[1] "%s användare hittade"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Felaktig Host"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "Det gick inte hitta den önskade funktionen"
+#: settings.php:52
+msgid "Server"
+msgstr "Server"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Användar filter"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Login Filtrer"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Gruppfilter"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Spara"
@@ -230,10 +263,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1.Server"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Server:"
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Lägg till serverinställning"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Radera Konfiguration"
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Server"
@@ -297,6 +343,14 @@ msgstr "Tillbaka"
msgid "Continue"
msgstr "Fortsätt"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Expert"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avancerad"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index 61d4b11f7e7e44e9e21d074793049bae3db746ab..35a164421def6608ee76659b6ef9d4af9fba2632 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: sw_KE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index 8775961483be9945e3eb3973b60e890116cebc92..7a914ace448298eba0a8b08ea0a22dde3b7256c3 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/sw_KE/files_encryption.po b/l10n/sw_KE/files_encryption.po
index d431247af8b748e97c6e3ec836823313136da021..d697a104bd125c3874328b3fc2c1f2d76de0f917 100644
--- a/l10n/sw_KE/files_encryption.po
+++ b/l10n/sw_KE/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/sw_KE/files_external.po b/l10n/sw_KE/files_external.po
index e3c79414c876256a7de6a34cecb3f745b22d3252..c9a028aedc509477d4064d43382b1c3413a9d852 100644
--- a/l10n/sw_KE/files_external.po
+++ b/l10n/sw_KE/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/sw_KE/files_sharing.po b/l10n/sw_KE/files_sharing.po
index 51beb82fc772f688c45a5aaf2721f85096a40e7f..b159890de4957566bae9895dd4549e3f57e3b5a4 100644
--- a/l10n/sw_KE/files_sharing.po
+++ b/l10n/sw_KE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: sw_KE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/sw_KE/files_trashbin.po b/l10n/sw_KE/files_trashbin.po
index 3dd0ee02599cd8e266c7d2ed4379bace8cf796fb..7142c39ecd388bec1e2141d4cd4f6b94eff5d11b 100644
--- a/l10n/sw_KE/files_trashbin.po
+++ b/l10n/sw_KE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index 282d78a92c7d2d17fb2b95499f9b27b6c80a0cb4..ce43a57945e838dbc5dc6a7b966c86d90fa606a8 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: sw_KE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index 9ab7ca5f0ad34d9bb1460b40ea2d945a57f1b203..f8a369e01c0c3e0259a8873a1e47285b71ef3936 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
index 2249c487160e5e8d6c3610db669f5d21f9eb7d8c..de47ea8b92c808df6c2720969a095a68ce09469c 100644
--- a/l10n/sw_KE/user_ldap.po
+++ b/l10n/sw_KE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ta_IN/core.po b/l10n/ta_IN/core.po
index 50dd80450e3ca1b7ee636a58eb475e1654cb1afd..ad19a756d564c319f6293cba233675fa4d16084f 100644
--- a/l10n/ta_IN/core.po
+++ b/l10n/ta_IN/core.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ta_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/ta_IN/files.po b/l10n/ta_IN/files.po
index 662173065d96507e5739693d6952a9afe46129f4..b79efc2cce35996a253c3702ebcfa9aaacfe582e 100644
--- a/l10n/ta_IN/files.po
+++ b/l10n/ta_IN/files.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/ta_IN/files_encryption.po b/l10n/ta_IN/files_encryption.po
index df89e0a6f403a31e930a761a17cbb5b047a6a3b7..e53964ca4c7e85423f2e54aa004a85fc9eaecff6 100644
--- a/l10n/ta_IN/files_encryption.po
+++ b/l10n/ta_IN/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/ta_IN/files_external.po b/l10n/ta_IN/files_external.po
index c0f52b2eab8f71a08b92d548171a8931ba3d87ef..168867f5ca9be1152cb3f4186df434ac2a656573 100644
--- a/l10n/ta_IN/files_external.po
+++ b/l10n/ta_IN/files_external.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ta_IN/files_sharing.po b/l10n/ta_IN/files_sharing.po
index 84a5934cd23f5c8a5cece5457c0334f3f41cae32..516f00ec2e9e21a029dde69946cef3c978a090fc 100644
--- a/l10n/ta_IN/files_sharing.po
+++ b/l10n/ta_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: ta_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/ta_IN/files_trashbin.po b/l10n/ta_IN/files_trashbin.po
index efb3059364c270dfc9b159b18576cb9db0ebcab5..0c95a17b305cf37c322a9fd52ec2ec374ef14814 100644
--- a/l10n/ta_IN/files_trashbin.po
+++ b/l10n/ta_IN/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/filelist.js:88 js/filelist.js:132 js/filelist.js:181
-msgid "Error"
-msgstr ""
-
-#: js/trash.js:48 templates/index.php:22 templates/index.php:24
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
msgid "Restore"
msgstr ""
-#: js/trash.js:107
-msgid "Deleted Files"
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
msgstr ""
#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
diff --git a/l10n/ta_IN/lib.po b/l10n/ta_IN/lib.po
index f75539c785d0780e7b35cb2910b7a73f93cb3f05..f7c50a25e5cf0f998b994c607eda294425266846 100644
--- a/l10n/ta_IN/lib.po
+++ b/l10n/ta_IN/lib.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ta_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:712
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:713
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -289,116 +289,127 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/ta_IN/settings.po b/l10n/ta_IN/settings.po
index 2bfa5979306c2ccb06547ad53862351249894049..dfc5c4a9a686ba98d64430cc374dbc0b4365f572 100644
--- a/l10n/ta_IN/settings.po
+++ b/l10n/ta_IN/settings.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/ta_IN/user_ldap.po b/l10n/ta_IN/user_ldap.po
index 546db3ae84d3a84bee37ddf618e7ff658776cc30..675ed9062ecfe66b3cbdb669a053270e4860c8ed 100644
--- a/l10n/ta_IN/user_ldap.po
+++ b/l10n/ta_IN/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr ""
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 18eb823a9f0058ac5f8f69228d681aa2bba051ef..c67e662e760f313c9b80cada5d3c8570858814c0 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "ஞாயிறà¯à®±à¯à®•à¯à®•à®¿à®´à®®à¯ˆ"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "திஙà¯à®•à®Ÿà¯à®•à®¿à®´à®®à¯ˆ"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "செவà¯à®µà®¾à®¯à¯à®•à¯à®•à®¿à®´à®®à¯ˆ"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "பà¯à®¤à®©à¯à®•à®¿à®´à®®à¯ˆ"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "வியாழகà¯à®•à®¿à®´à®®à¯ˆ"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "வெளà¯à®³à®¿à®•à¯à®•à®¿à®´à®®à¯ˆ"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "சனிகà¯à®•à®¿à®´à®®à¯ˆ"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "தை"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "மாசி"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "பஙà¯à®•à¯à®©à®¿"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "சிதà¯à®¤à®¿à®°à¯ˆ"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "வைகாசி"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "ஆனி"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "ஆடி"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "ஆவணி"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "பà¯à®°à®Ÿà¯à®Ÿà®¾à®šà®¿"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "à®à®ªà¯à®ªà®šà®¿"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "காரà¯à®¤à¯à®¤à®¿à®•à¯ˆ"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "மாரà¯à®•à®´à®¿"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "அமைபà¯à®ªà¯à®•à®³à¯"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "சேமிகà¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "செகà¯à®•à®©à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "இனà¯à®±à¯"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "நேறà¯à®±à¯"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "கடநà¯à®¤ மாதமà¯"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "கடநà¯à®¤ வரà¯à®Ÿà®®à¯"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "வரà¯à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "தெரிவà¯à®šà¯†à®¯à¯à®• "
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "ஆமà¯"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "இலà¯à®²à¯ˆ"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "தெரிவà¯à®šà¯†à®¯à¯à®• "
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "சரி"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "இரதà¯à®¤à¯ செயà¯à®•"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr "பகிரà¯à®µà¯"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "வழà¯"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "பகிரà¯à®®à¯ போதான வழà¯"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "பகிராமல௠உளà¯à®³à®ªà¯à®ªà¯‹à®¤à®¾à®© வழà¯"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "அனà¯à®®à®¤à®¿à®•à®³à¯ மாறà¯à®®à¯à®ªà¯‹à®¤à®¾à®© வழà¯"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "உஙà¯à®•à®³à¯à®Ÿà®©à¯à®®à¯ கà¯à®´à¯à®µà¯à®•à¯à®•à®¿à®Ÿà¯ˆà®¯à®¿à®²à¯à®®à¯ {கà¯à®´à¯} பகிரபà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯ {உரிமையாளரà¯}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "உஙà¯à®•à®³à¯à®Ÿà®©à¯ பகிரபà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯ {உரிமையாளரà¯}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ பாதà¯à®•à®¾à®¤à¯à®¤à®²à¯"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "காலாவதி தேதியை கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®•"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "காலவதியாகà¯à®®à¯ திகதி"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "மினà¯à®©à®žà¯à®šà®²à®¿à®©à¯‚டான பகிரà¯à®µà¯: "
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "நபரà¯à®•à®³à¯ யாரà¯à®®à¯ இலà¯à®²à¯ˆ"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "கà¯à®´à¯"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "மீளà¯à®ªà®•à®¿à®°à¯à®µà®¤à®±à¯à®•à¯ அனà¯à®®à®¤à®¿ இலà¯à®²à¯ˆ "
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "{பயனாளரà¯} உடன௠{உரà¯à®ªà¯à®ªà®Ÿà®¿} பகிரபà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "பகிரபà¯à®ªà®Ÿà®¾à®¤à®¤à¯"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "தொகà¯à®•à¯à®• à®®à¯à®Ÿà®¿à®¯à¯à®®à¯"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà®¾à®© அணà¯à®•à®²à¯"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "உரà¯à®µà®µà®¾à®•à¯à®•à®²à¯"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "இறà¯à®±à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à¯"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "நீகà¯à®•à¯à®•"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "பகிரà¯à®¤à®²à¯"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯ பாதà¯à®•à®¾à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "காலாவதியாகà¯à®®à¯ திகதியை கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®¾à®®à¯ˆà®•à¯à®•à®¾à®© வழà¯"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "காலாவதியாகà¯à®®à¯ திகதியை கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®µà®¤à®¿à®²à¯ வழà¯"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "எசà¯à®šà®°à®¿à®•à¯à®•à¯ˆ"
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "<strong> நிரà¯à®µà®¾à®• கணகà¯à®•à¯Šà®©à¯à®±à¯ˆ </strong> உரà¯à®µà®¾à®•à¯à®•à¯à®•"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index e3c3d80568baaf3296d4e983f80b8b7a01cba11d..a83a5a4d8841a372b0d03012232d773381c8ee71 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "செலà¯à®²à¯à®ªà®Ÿà®¿à®¯à®±à¯à®± பெயரà¯,'\\', '/', '<', '>', ':', '\"', '|', '?' மறà¯à®±à¯à®®à¯ '*' ஆகியன அனà¯à®®à®¤à®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà®®à®¾à®Ÿà¯à®Ÿà®¾à®¤à¯."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr "ஒர௠தறà¯à®•à®¾à®²à®¿à®•à®®à®¾à®© கோபà¯à®ªà¯à®±à¯ˆà®¯
msgid "Failed to write to disk"
msgstr "வடà¯à®Ÿà®¿à®²à¯ எழà¯à®¤ à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "கோபà¯à®ªà¯à®•à®³à¯"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "பதிவேறà¯à®±à®²à¯ இரதà¯à®¤à¯ செயà¯à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯"
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr "கோபà¯à®ªà¯ பதிவேறà¯à®±à®®à¯ செயலà¯à®ªà®¾
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} à®à®±à¯à®•à®©à®µà¯‡ உளà¯à®³à®¤à¯"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "பகிரà¯à®µà¯"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "பெயரà¯à®®à®¾à®±à¯à®±à®®à¯"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "நிலà¯à®µà¯ˆà®¯à®¿à®²à¯à®³à¯à®³"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "வழà¯"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "பெயரà¯"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "அளவà¯"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "மாறà¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr "ZIP கோபà¯à®ªà¯à®•à®³à¯à®•à¯à®•à®¾à®© ஆககà¯à®•à¯‚டி
msgid "Save"
msgstr "சேமிகà¯à®• "
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "பà¯à®¤à®¿à®¯"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "கோபà¯à®ªà¯ உரை"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "கோபà¯à®ªà¯à®±à¯ˆ"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "இணைபà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "பதிவேறà¯à®±à®²à¯ˆ இரதà¯à®¤à¯ செயà¯à®•"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "இஙà¯à®•à¯ ஒனà¯à®±à¯à®®à¯ இலà¯à®²à¯ˆ. à®à®¤à®¾à®µà®¤à¯ பதிவேறà¯à®±à¯à®•!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "பதிவிறகà¯à®•à¯à®•"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "நீகà¯à®•à¯à®•"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "பதிவேறà¯à®±à®²à¯ மிகபà¯à®ªà¯†à®°à®¿à®¯à®¤à¯"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "நீஙà¯à®•à®³à¯ பதிவேறà¯à®± à®®à¯à®¯à®±à¯à®šà®¿à®•à¯à®•à¯à®®à¯ கோபà¯à®ªà¯à®•à®³à®¾à®©à®¤à¯ இநà¯à®¤ சேவையகதà¯à®¤à®¿à®²à¯ கோபà¯à®ªà¯ பதிவேறà¯à®±à®•à¯à®•à¯‚டிய ஆககà¯à®•à¯‚டிய அளவிலà¯à®®à¯ கூடியதà¯."
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "கோபà¯à®ªà¯à®•à®³à¯ வரà¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®©, தயவà¯à®šà¯†à®¯à¯à®¤à¯ காதà¯à®¤à®¿à®°à¯à®™à¯à®•à®³à¯."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "தறà¯à®ªà¯‹à®¤à¯ வரà¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®ªà®µà¯ˆ"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po
index 6f5ef1e912886d72091816724cf381e03abce0a0..36f5c18b0b83eee205839c8694ad2d77a51948dc 100644
--- a/l10n/ta_LK/files_encryption.po
+++ b/l10n/ta_LK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "மறைகà¯à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index 5daa52be8bd1d268e04a13328064b5756d36aa07..bb291cdc942c8b955b88ba5d91a6d359db6eb090 100644
--- a/l10n/ta_LK/files_external.po
+++ b/l10n/ta_LK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "ஓமà¯à®ªà¯à®©à®°à¯"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr "Google இயகà¯à®• சேமிபà¯à®ªà®•à®¤à¯à®¤à¯ˆ தகமை
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index ca4ae0af9aa8082e2bade6a677394f6d68c4f4a9..2bc4f15521ee181c5101ed5350b9278e752944cd 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "பகிரபà¯à®ªà®Ÿà¯à®Ÿà®¤à¯ {சொநà¯à®¤à®•à®¾à®°à®°à¯}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "பதிவிறகà¯à®•à¯à®•"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index daa23bb0de48b92c996c2dd3402c958e96826dc3..dffd9f1b12e1e0e8634fec24826f30f1976c0766 100644
--- a/l10n/ta_LK/files_trashbin.po
+++ b/l10n/ta_LK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "வழà¯"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "பெயரà¯"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "நீகà¯à®•à¯à®•"
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index abd682767bc8ef6b9fd6d85e76d4ef578d31ae8f..7d10e93ba0243919ffd30f843e14f56c7b3e7b2a 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr "வலைய சேவைகள௠உஙà¯à®•à®³à¯à®Ÿà¯ˆà®¯ கடà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®©à¯ கீழ௠உளà¯à®³à®¤à¯"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "வீசொலிப௠பூடà¯à®Ÿà¯ பதிவிறகà¯à®•à®®à¯ நிறà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "கோபà¯à®ªà¯à®•à®³à¯à®’னà¯à®±à®©à¯ பின௠ஒனà¯à®±à®¾à®• பதிவிறகà¯à®•à®ªà¯à®ªà®Ÿà®µà¯‡à®£à¯à®Ÿà¯à®®à¯."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "கோபà¯à®ªà¯à®•à®³à¯à®•à¯à®•à¯ செலà¯à®•"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "வீ சொலிக௠கோபà¯à®ªà¯à®•à®³à¯ˆ உரà¯à®µà®¾à®•à¯à®•à¯à®µà®¤à®±à¯à®•à¯ தெரிவà¯à®šà¯†à®¯à¯à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿ கோபà¯à®ªà¯à®•à®³à¯ மிகபà¯à®ªà¯†à®°à®¿à®¯à®µà¯ˆ"
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "பிரிவ௠\"%s\" ஠கணà¯à®Ÿà¯à®ªà¯à®ªà®¿à®Ÿà®¿à®•à¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index efb53ddde84c3a0a0f7fef2e5c9d29ed3da57bbd..b9e8d2f9b346e7af00b1c63080957a2856be3651 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "மறைகà¯à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "மினà¯à®©à®žà¯à®šà®²à¯ சேமிகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
@@ -114,6 +124,16 @@ msgstr "கà¯à®´à¯à®µà¯ˆ நீகà¯à®• à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯"
msgid "Unable to delete user"
msgstr "பயனாளரை நீகà¯à®• à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "மொழி மாறà¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr "இறà¯à®±à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à¯"
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr "à®®à¯à®©à¯ செயல௠நீகà¯à®•à®®à¯ "
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "கà¯à®´à¯à®•à¯à®•à®³à¯"
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "_மொழி_பெயரà¯_"
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "சேவையக à®®à¯à®•à®µà®°à®¿"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "தà¯à®±à¯ˆ "
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "சானà¯à®±à¯ ஆவணஙà¯à®•à®³à¯"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "மேலதிக"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "கà¯à®±à¯ˆà®µà®¾à®©"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr "மொழி"
msgid "Help translate"
msgstr "மொழிபெயரà¯à®•à¯à®• உதவி"
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 1592ce84a9bd3f8defd3b668062428a946a8571c..ed161da013df55588bbdf3e571f8d72cbb29fd96 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "வழà¯"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "சேமிகà¯à®• "
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "ஓமà¯à®ªà¯à®©à®°à¯"
@@ -287,6 +332,14 @@ msgstr "பினà¯à®©à¯à®•à¯à®•à¯"
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "உயரà¯à®¨à¯à®¤"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/te/core.po b/l10n/te/core.po
index bfe1e59fce8e214a2e31f865784cd0ef36fff753..7fa101c891a8d6003bf71c8929a9b5e8c9b9b25f 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -59,207 +64,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "ఆదివారం"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "సోమవారం"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "మంగళవారం"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "à°¬à±à°§à°µà°¾à°°à°‚"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "à°—à±à°°à±à°µà°¾à°°à°‚"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "à°¶à±à°•à±à°°à°µà°¾à°°à°‚"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "శనివారం"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "జనవరి"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "à°«à°¿à°¬à±à°°à°µà°°à°¿"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "మారà±à°šà°¿"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "à°à°ªà±à°°à°¿à°²à±"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "మే"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "జూనà±"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "జూలై"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "ఆగసà±à°Ÿà±"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "సెపà±à°Ÿà±†à°‚బరà±"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "à°…à°•à±à°Ÿà±‹à°¬à°°à±"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "నవంబరà±"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "డిసెంబరà±"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "అమరికలà±"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "à°•à±à°·à°£à°¾à°² à°•à±à°°à°¿à°¤à°‚"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n నిమిషం à°•à±à°°à°¿à°¤à°‚"
msgstr[1] "%n నిమిషాల à°•à±à°°à°¿à°¤à°‚"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚"
msgstr[1] "%n à°—à°‚à°Ÿà°² à°•à±à°°à°¿à°¤à°‚"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "ఈరోజà±"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "నినà±à°¨"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n రోజౠకà±à°°à°¿à°¤à°‚"
msgstr[1] "%n రోజà±à°² à°•à±à°°à°¿à°¤à°‚"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "పోయిన నెల"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n నెల à°•à±à°°à°¿à°¤à°‚"
msgstr[1] "%n నెలల à°•à±à°°à°¿à°¤à°‚"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "పోయిన సంవతà±à°¸à°°à°‚"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "సంవతà±à°¸à°°à°¾à°² à°•à±à°°à°¿à°¤à°‚"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "à°…à°µà±à°¨à±"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "కాదà±"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "సరే"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "కొనసాగించà±"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -291,140 +296,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "పొరపాటà±"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "సంకేతపదం"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "పంపించà±"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "కాలం చెలà±à°²à± తేదీ"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "తొలగించà±"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "హెచà±à°šà°°à°¿à°•"
@@ -456,18 +470,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -668,6 +683,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "సంకేతపదం"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -793,7 +812,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/te/files.po b/l10n/te/files.po
index 36152d9d129e6f705f78b8bb99bb2c39d274fe21..ae9adc99cc9fc76496165fe468d55f587567414d 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "శాశà±à°µà°¤à°‚à°—à°¾ తొలగించà±"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "పొరపాటà±"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "పేరà±"
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "పరిమాణం"
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr "à°à°¦à±à°°à°ªà°°à°šà±"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "కొతà±à°¤ సంచయం"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "సంచయం"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "తొలగించà±"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/te/files_encryption.po b/l10n/te/files_encryption.po
index c9545f4e681ad300be70afdf85c280876a8f2128..182b49a08c34c1647010f9c9acfc267a85bc64d3 100644
--- a/l10n/te/files_encryption.po
+++ b/l10n/te/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -92,7 +92,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -112,91 +112,91 @@ msgstr ""
msgid "personal settings"
msgstr "à°µà±à°¯à°•à±à°¤à°¿à°—à°¤ అమరికలà±"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/te/files_external.po b/l10n/te/files_external.po
index 44c9d8c6957d9e06ce87db6844b5db058a900806..332c62c427ff08fd8cfe5de6146ef0bbd75545f2 100644
--- a/l10n/te/files_external.po
+++ b/l10n/te/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po
index 5cfac634fcbdbee5672050b1768a665bfc63d8f2..27158c2ca6bf49f188d32afb19be603b0b06d593 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "సంకేతపదం"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/te/files_trashbin.po b/l10n/te/files_trashbin.po
index 4e49411bff2456b00a66296f3cd0265d70fdb7bf..187f84f16ae9aef054de15fdae3543748a8bad69 100644
--- a/l10n/te/files_trashbin.po
+++ b/l10n/te/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "పొరపాటà±"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "పేరà±"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "తొలగించà±"
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index e9aeccff5dda5e6f92251841797a1294dcaf1702..68a71517b362e6b1b58d66ec13a7075d27ade98a 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index cb101ffa919f85906dbf89c3aa124e71e9611f87..66a3c03e8f2530e774694ab35856da2f8da525ad 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "సేవకి à°šà°¿à°°à±à°¨à°¾à°®à°¾"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "మరినà±à°¨à°¿"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr "à°à°¾à°·"
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index 79af6e1f351bfd66207587f0f9016a8cfa7d095c..848701686316dc8912c73793db99b3069d49c052 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "పొరపాటà±"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "à°à°¦à±à°°à°ªà°°à°šà±"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr "కొనసాగించà±"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "ఉనà±à°¨à°¤à°‚"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 169ae4b7800d3f71d34a655af9237d0bf2d7018c..e57d2b4d1d8db1f1aa304ea27d478d634404d7e6 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"POT-Creation-Date: 2014-05-31 01:54-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,11 +18,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -59,207 +64,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:483
+#: js/js.js:496
msgid "Settings"
msgstr ""
-#: js/js.js:583
+#: js/js.js:596
msgid "Saving..."
msgstr ""
-#: js/js.js:1240
+#: js/js.js:1220
msgid "seconds ago"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1221
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1242
+#: js/js.js:1222
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1223
msgid "today"
msgstr ""
-#: js/js.js:1244
+#: js/js.js:1224
msgid "yesterday"
msgstr ""
-#: js/js.js:1245
+#: js/js.js:1225
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1226
msgid "last month"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1227
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1228
msgid "last year"
msgstr ""
-#: js/js.js:1249
+#: js/js.js:1229
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its "
"name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -283,148 +288,157 @@ msgstr ""
msgid "Strong password"
msgstr ""
-#: js/share.js:51 js/share.js:66 js/share.js:106
+#: js/share.js:69 js/share.js:84 js/share.js:127
msgid "Shared"
msgstr ""
-#: js/share.js:109
+#: js/share.js:130
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:195 js/share.js:208 js/share.js:215 js/share.js:822
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:197 js/share.js:885
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:208
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:215
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:225
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:227
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:251
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:257
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:263
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:265
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:270
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:272
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:278
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:282
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:283
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:288
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:289
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:326
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:329
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:377 js/share.js:438
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:410
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:454
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:476
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:484
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:487
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:489
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:492
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:495
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:498
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:501
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:803
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:822
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:843
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:872
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:883
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:907
msgid "Warning"
msgstr ""
@@ -456,18 +470,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index b9cc6fd87279c269507e060785e8682c500036e5..0719fb4b71a6ff9f734faaba46a84671eeeb5806 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"POT-Creation-Date: 2014-05-31 01:54-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,7 +28,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -37,18 +37,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different name."
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,119 +177,123 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1188
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:211
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:224
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:226 templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: js/fileactions.js:262
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:314
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:619 js/filelist.js:1691
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1139
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1147
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1147
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1225
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1346
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1449 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1450 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1451 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1599 js/filelist.js:1638
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -295,12 +303,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -337,68 +345,71 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
-msgid "Delete"
-msgstr ""
-
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 54d4edfeedfa48a7f7e1ab35161555215650135a..24b85776d5b9e481b30cee73fcca0ed1c043c712 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"POT-Creation-Date: 2014-05-31 01:54-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,7 +75,8 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your administrator"
+"Unknown error. Please check your system settings or contact your "
+"administrator"
msgstr ""
#: hooks/hooks.php:64
@@ -89,7 +90,7 @@ msgid ""
"the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
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 2aa7ed17ee9ab981e866ea7128f2a6b0bcfd83ab..e00a27fa70317effdac073943a608e0a4a9ac8d3 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"POT-Creation-Date: 2014-05-31 01:54-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"
@@ -21,155 +21,159 @@ msgstr ""
msgid "Local"
msgstr ""
-#: appinfo/app.php:36
+#: appinfo/app.php:37
msgid "Location"
msgstr ""
-#: appinfo/app.php:39
+#: appinfo/app.php:40
msgid "Amazon S3"
msgstr ""
-#: appinfo/app.php:41
+#: appinfo/app.php:43
msgid "Key"
msgstr ""
-#: appinfo/app.php:42
+#: appinfo/app.php:44
msgid "Secret"
msgstr ""
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
msgid "Bucket"
msgstr ""
-#: appinfo/app.php:47
+#: appinfo/app.php:49
msgid "Amazon S3 and compliant"
msgstr ""
-#: appinfo/app.php:49
+#: appinfo/app.php:52
msgid "Access Key"
msgstr ""
-#: appinfo/app.php:50
+#: appinfo/app.php:53
msgid "Secret Key"
msgstr ""
-#: appinfo/app.php:52
+#: appinfo/app.php:55
msgid "Hostname (optional)"
msgstr ""
-#: appinfo/app.php:53
+#: appinfo/app.php:56
msgid "Port (optional)"
msgstr ""
-#: appinfo/app.php:54
+#: appinfo/app.php:57
msgid "Region (optional)"
msgstr ""
-#: appinfo/app.php:55
+#: appinfo/app.php:58
msgid "Enable SSL"
msgstr ""
-#: appinfo/app.php:56
+#: appinfo/app.php:59
msgid "Enable Path Style"
msgstr ""
-#: appinfo/app.php:63
+#: appinfo/app.php:67
msgid "App key"
msgstr ""
-#: appinfo/app.php:64
+#: appinfo/app.php:68
msgid "App secret"
msgstr ""
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
+msgid "Host"
msgstr ""
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
msgid "Username"
msgstr ""
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
msgid "Password"
msgstr ""
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
msgid "Root"
msgstr ""
-#: appinfo/app.php:77
+#: appinfo/app.php:82
msgid "Secure ftps://"
msgstr ""
-#: appinfo/app.php:84
+#: appinfo/app.php:90
msgid "Client ID"
msgstr ""
-#: appinfo/app.php:85
+#: appinfo/app.php:91
msgid "Client secret"
msgstr ""
-#: appinfo/app.php:92
+#: appinfo/app.php:98
msgid "OpenStack Object Storage"
msgstr ""
-#: appinfo/app.php:94
+#: appinfo/app.php:101
msgid "Username (required)"
msgstr ""
-#: appinfo/app.php:95
+#: appinfo/app.php:102
msgid "Bucket (required)"
msgstr ""
-#: appinfo/app.php:96
+#: appinfo/app.php:103
msgid "Region (optional for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:97
+#: appinfo/app.php:104
msgid "API Key (required for Rackspace Cloud Files)"
msgstr ""
-#: appinfo/app.php:98
+#: appinfo/app.php:105
msgid "Tenantname (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:99
+#: appinfo/app.php:106
msgid "Password (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:100
+#: appinfo/app.php:107
msgid "Service Name (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:101
+#: appinfo/app.php:108
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:102
+#: appinfo/app.php:109
msgid "Timeout of HTTP requests in seconds (optional)"
msgstr ""
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
msgid "Share"
msgstr ""
-#: appinfo/app.php:119
+#: appinfo/app.php:127
msgid "SMB / CIFS using OC login"
msgstr ""
-#: appinfo/app.php:122
+#: appinfo/app.php:131
msgid "Username as share"
msgstr ""
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:141 appinfo/app.php:152
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:145 appinfo/app.php:156
msgid "Secure https://"
msgstr ""
-#: appinfo/app.php:144
+#: appinfo/app.php:155
msgid "Remote subfolder"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:674
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:684
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:706
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:708
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of "
"%s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:710
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please "
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 8163df2bf5979fc445414bc8b91474ab73825c4c..564bed250af16fd0c1a017219333ade2080910be 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"POT-Creation-Date: 2014-05-31 01:54-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"
@@ -17,10 +17,34 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 567f4963224531b4ecfb26f1306ddabd316b6d33..dbdf73ce1dd0dbc64ac44950b2c374d7bf3c482c 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"POT-Creation-Date: 2014-05-31 01:54-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"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/filelist.js:88 js/filelist.js:132 js/filelist.js:181
-msgid "Error"
-msgstr ""
-
-#: js/trash.js:48 templates/index.php:22 templates/index.php:24
+#: js/app.js:52 templates/index.php:21 templates/index.php:23
msgid "Restore"
msgstr ""
-#: js/trash.js:107
-msgid "Deleted Files"
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
msgstr ""
#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 1084bbfb0f58fc0473e08bdaa0732d73e71dcbda..71d323fe207d406add34708b0d906bad3dbd42d4 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"POT-Creation-Date: 2014-05-31 01:54-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,22 +22,22 @@ msgstr ""
msgid "Could not revert: %s"
msgstr ""
-#: js/versions.js:39
+#: js/versions.js:48
msgid "Versions"
msgstr ""
-#: js/versions.js:61
+#: js/versions.js:70
msgid "Failed to revert {file} to revision {timestamp}."
msgstr ""
-#: js/versions.js:88
+#: js/versions.js:97
msgid "More versions..."
msgstr ""
-#: js/versions.js:126
+#: js/versions.js:135
msgid "No other versions available"
msgstr ""
-#: js/versions.js:156
+#: js/versions.js:165
msgid "Restore"
msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 14423c83f008f3380780ca26ced661f29ac9108b..64a3f22dbadb5d67bc04a0878721b0acbd690a25 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"POT-Creation-Date: 2014-05-31 01:54-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,11 +18,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: base.php:713
+#: base.php:710
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:711
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -77,23 +77,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -128,29 +128,29 @@ msgstr ""
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: private/installer.php:141
+#: private/installer.php:138
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: private/installer.php:147
+#: private/installer.php:144
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: private/installer.php:160
+#: private/installer.php:157
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 ""
-#: private/installer.php:170
+#: private/installer.php:167
msgid "App directory already exists"
msgstr ""
-#: private/installer.php:183
+#: private/installer.php:180
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -290,116 +290,127 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s "
"is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links "
+"are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
@@ -452,20 +463,20 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: private/user/manager.php:232
+#: private/user/manager.php:238
msgid ""
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
"\"0-9\", and \"_.@-\""
msgstr ""
-#: private/user/manager.php:237
+#: private/user/manager.php:243
msgid "A valid username must be provided"
msgstr ""
-#: private/user/manager.php:241
+#: private/user/manager.php:247
msgid "A valid password must be provided"
msgstr ""
-#: private/user/manager.php:246
+#: private/user/manager.php:252
msgid "The username is already being used"
msgstr ""
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index d208a9b312a67cd3a3d73e170bb5b1c72f48c0c1..5f9822789ab50b35b0788bc2ac016392a261e95c 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"POT-Creation-Date: 2014-05-31 01:54-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"
@@ -66,23 +66,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: files.php:232
+#: files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:233
+#: files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:234 files.php:261
+#: files.php:237 files.php:264
msgid "Back to Files"
msgstr ""
-#: files.php:259
+#: files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: files.php:260
+#: files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -117,29 +117,29 @@ msgstr ""
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:141
+#: installer.php:138
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:147
+#: installer.php:144
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:160
+#: installer.php:157
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:170
+#: installer.php:167
msgid "App directory already exists"
msgstr ""
-#: installer.php:183
+#: installer.php:180
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
@@ -272,115 +272,126 @@ msgstr ""
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: share/mailnotifications.php:72 share/mailnotifications.php:118
+#: share/mailnotifications.php:91 share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: share/share.php:498
+#: share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: share/share.php:523
+#: share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: share/share.php:529
+#: share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: share/share.php:538
+#: share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s "
"is a member of"
msgstr ""
-#: share/share.php:551 share/share.php:579
+#: share/share.php:554 share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: share/share.php:559
+#: share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: share/share.php:566
+#: share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: share/share.php:629
+#: share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links "
+"are allowed"
+msgstr ""
+
+#: share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: share/share.php:636
+#: share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: share/share.php:773
+#: share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: share/share.php:834
+#: share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: share/share.php:940
+#: share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: share/share.php:947
+#: share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: share/share.php:953
+#: share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: share/share.php:1367
+#: share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: share/share.php:1376
+#: share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: share/share.php:1391
+#: share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: share/share.php:1403
+#: share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: share/share.php:1417
+#: share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: tags.php:193
+#: tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
@@ -433,20 +444,20 @@ msgstr ""
msgid "years ago"
msgstr ""
-#: user/manager.php:232
+#: user/manager.php:238
msgid ""
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
"\"0-9\", and \"_.@-\""
msgstr ""
-#: user/manager.php:237
+#: user/manager.php:243
msgid "A valid username must be provided"
msgstr ""
-#: user/manager.php:241
+#: user/manager.php:247
msgid "A valid password must be provided"
msgstr ""
-#: user/manager.php:246
+#: user/manager.php:252
msgid "The username is already being used"
msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 8bbfa6c61de73a93fa034e0da2b516ad90f60995..ab180f79d8f4d19872f304f993367a85bb45c85a 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"POT-Creation-Date: 2014-05-31 01:54-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"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your owncloud."
+"log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask "
+"your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -168,7 +188,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -224,34 +244,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -264,8 +292,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -297,7 +325,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -365,7 +393,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -380,53 +408,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -435,197 +475,205 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems "
"wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
"\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -778,27 +826,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong "
+"you can restore the keys. Only delete them permanently if you are sure that "
+"all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index e94e6bc32ce4b3714a4d69b2f3e1d33f99631329..7687984feeefd72c14416cdfa8d8f8d7530d659d 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"POT-Creation-Date: 2014-05-31 01:54-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"
@@ -71,6 +71,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -87,6 +91,18 @@ msgstr ""
msgid "Error"
msgstr ""
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -127,28 +143,44 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -221,10 +253,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may "
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 154edc8adb4afe6bff41b9babcceb90efe354065..a3eed1da5e4a52502e22c1e27f29c638e38ffe29 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
+"POT-Creation-Date: 2014-05-31 01:54-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 99a8a23d835e339494d22e67341e90ce69f4a43e..373e3652dfe52deb424224e873b06847c9a789ca 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,202 +63,202 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "วันà¸à¸²à¸—ิตย์"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "วันจันทร์"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "วันà¸à¸±à¸‡à¸„าร"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "วันพุธ"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "วันพฤหัสบดี"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "วันศุà¸à¸£à¹Œ"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "วันเสาร์"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "มà¸à¸£à¸²à¸„ม"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "à¸à¸¸à¸¡à¸ าพันธ์"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "มีนาคม"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "เมษายน"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "พฤษภาคม"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "มิถุนายน"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "à¸à¸£à¸à¸à¸²à¸„ม"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "สิงหาคม"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "à¸à¸±à¸™à¸¢à¸²à¸¢à¸™"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "ตุลาคม"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "พฤศจิà¸à¸²à¸¢à¸™"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "ธันวาคม"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "ตั้งค่า"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸šà¸±à¸™à¸—ึà¸à¸‚้à¸à¸¡à¸¹à¸¥..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "วินาที à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "วันนี้"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "เมื่à¸à¸§à¸²à¸™à¸™à¸µà¹‰"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "เดืà¸à¸™à¸—ี่à¹à¸¥à¹‰à¸§"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "ปีที่à¹à¸¥à¹‰à¸§"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "ปี ที่ผ่านมา"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "เลืà¸à¸"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "ตà¸à¸¥à¸‡"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "ไม่ตà¸à¸¥à¸‡"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "เลืà¸à¸"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "ตà¸à¸¥à¸‡"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "ไฟล์ใหม่"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "ยà¸à¹€à¸¥à¸´à¸"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,140 +290,149 @@ msgstr "à¹à¸Šà¸£à¹Œà¹à¸¥à¹‰à¸§"
msgid "Share"
msgstr "à¹à¸Šà¸£à¹Œ"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "ข้à¸à¸œà¸´à¸”พลาด"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดในระหว่างà¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดในà¸à¸²à¸£à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดในà¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸ªà¸´à¸—ธิ์à¸à¸²à¸£à¹€à¸‚้าใช้งาน"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "ได้à¹à¸Šà¸£à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸šà¸„ุณ à¹à¸¥à¸°à¸à¸¥à¸¸à¹ˆà¸¡ {group} โดย {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "ถูà¸à¹à¸Šà¸£à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸šà¸„ุณโดย {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "ใส่รหัสผ่านไว้"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "รหัสผ่าน"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "ส่งลิงà¸à¹Œà¹ƒà¸«à¹‰à¸—างà¸à¸µà¹€à¸¡à¸¥"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "ส่ง"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "à¸à¸³à¸«à¸™à¸”วันที่หมดà¸à¸²à¸¢à¸¸"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "วันที่หมดà¸à¸²à¸¢à¸¸"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "à¹à¸Šà¸£à¹Œà¸œà¹ˆà¸²à¸™à¸—างà¸à¸µà¹€à¸¡à¸¥"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "ไม่พบบุคคลที่ต้à¸à¸‡à¸à¸²à¸£"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "à¸à¸¥à¸¸à¹ˆà¸¡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "ไม่à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥à¸‹à¹‰à¸³à¹„ด้"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "ได้à¹à¸Šà¸£à¹Œ {item} ให้à¸à¸±à¸š {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œ"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "สามารถà¹à¸à¹‰à¹„ข"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "ระดับควบคุมà¸à¸²à¸£à¹€à¸‚้าใช้งาน"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "สร้าง"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "à¸à¸±à¸žà¹€à¸”ท"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "ลบ"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "à¹à¸Šà¸£à¹Œ"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "ใส่รหัสผ่านไว้"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดในà¸à¸²à¸£à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าวันที่หมดà¸à¸²à¸¢à¸¸"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดในà¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าวันที่หมดà¸à¸²à¸¢à¸¸"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸ªà¹ˆà¸‡..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "ส่งà¸à¸µà¹€à¸¡à¸¥à¹Œà¹à¸¥à¹‰à¸§"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "คำเตืà¸à¸™"
@@ -450,18 +464,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "à¸à¸²à¸£à¸à¸±à¸žà¹€à¸”ทไม่เป็นผลสำเร็จ à¸à¸£à¸¸à¸“าà¹à¸ˆà¹‰à¸‡à¸›à¸±à¸à¸«à¸²à¸—ี่เà¸à¸´à¸”ขึ้นไปยัง <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">คà¸à¸¡à¸¡à¸¹à¸™à¸´à¸•à¸µà¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ ownCloud</a>"
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "à¸à¸²à¸£à¸à¸±à¸žà¹€à¸”ทเสร็จเรียบร้à¸à¸¢à¹à¸¥à¹‰à¸§ à¸à¸³à¸¥à¸±à¸‡à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹€à¸ªà¹‰à¸™à¸—างไปที่ ownCloud à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸‚ณะนี้"
@@ -662,6 +677,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "สร้าง <strong>บัà¸à¸Šà¸µà¸œà¸¹à¹‰à¸”ูà¹à¸¥à¸£à¸°à¸šà¸š</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "รหัสผ่าน"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -787,8 +806,27 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "à¸à¸³à¸¥à¸±à¸‡à¸à¸±à¸žà¹€à¸”ท ownCloud ไปเป็นรุ่น %s, à¸à¸£à¸¸à¸“ารà¸à¸ªà¸±à¸à¸„รู่"
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index d6ed7ef02e599d5a11549c0af695139082648267..3efd5855827f0c2169a9ef826aa1f95bf084687a 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr "ไม่สามารถย้าย %s ได้ - ไฟล์ท
msgid "Could not move %s"
msgstr "ไม่สามารถย้าย %s ได้"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "ชื่à¸à¹„ฟล์ไม่สามารถเว้นว่างได้"
@@ -36,18 +36,18 @@ msgstr "ชื่à¸à¹„ฟล์ไม่สามารถเว้นว่า
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "ชื่à¸à¸—ี่ใช้ไม่ถูà¸à¸•à¹‰à¸à¸‡, '\\', '/', '<', '>', ':', '\"', '|', '?' à¹à¸¥à¸° '*' ไม่ได้รับà¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„ด้"
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr "โฟลเดà¸à¸£à¹Œà¸Šà¸±à¹ˆà¸§à¸„ราวเà¸à¸´à¸”à¸à¸²à¸£à¸ª
msgid "Failed to write to disk"
msgstr "เขียนข้à¸à¸¡à¸¹à¸¥à¸¥à¸‡à¹à¸œà¹ˆà¸™à¸”ิสà¸à¹Œà¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "เหลืà¸à¸žà¸·à¹‰à¸™à¸—ี่ไม่เพียงสำหรับใช้งาน"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "ไดเร็à¸à¸—à¸à¸£à¸µà¹ˆà¹„ม่ถูà¸à¸•à¹‰à¸à¸‡"
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "ไฟล์"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "à¸à¸²à¸£à¸à¸±à¸žà¹‚หลดถูà¸à¸¢à¸à¹€à¸¥à¸´à¸"
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,117 +177,117 @@ msgstr "à¸à¸²à¸£à¸à¸±à¸žà¹‚หลดไฟล์à¸à¸³à¸¥à¸±à¸‡à¸à¸¢à¸¹à¹ˆà¹ƒ
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} มีà¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§à¹ƒà¸™à¸£à¸°à¸šà¸š"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "à¹à¸Šà¸£à¹Œ"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "เปลี่ยนชื่à¸"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸•à¸£à¸µà¸¢à¸¡à¸”าวน์โหลดข้à¸à¸¡à¸¹à¸¥ หาà¸à¹„ฟล์มีขนาดใหà¸à¹ˆ à¸à¸²à¸ˆà¹ƒà¸Šà¹‰à¹€à¸§à¸¥à¸²à¸ªà¸±à¸à¸„รู่"
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "à¸à¸¢à¸¹à¹ˆà¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸”ำเนินà¸à¸²à¸£"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "ข้à¸à¸œà¸´à¸”พลาด"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "ชื่à¸"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "ขนาด"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "à¹à¸à¹‰à¹„ขà¹à¸¥à¹‰à¸§"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "พื้นที่จัดเà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸„ุณเต็มà¹à¸¥à¹‰à¸§ ไม่สามารถà¸à¸±à¸žà¹€à¸”ทหรืà¸à¸œà¸ªà¸²à¸™à¹„ฟล์ต่างๆได้à¸à¸µà¸à¸•à¹ˆà¸à¹„ป"
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "พื้นที่จัดเà¸à¹‡à¸šà¸‚้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸„ุณใà¸à¸¥à¹‰à¹€à¸•à¹‡à¸¡à¹à¸¥à¹‰à¸§ ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -293,12 +297,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -335,68 +339,75 @@ msgstr "ขนาดไฟล์ ZIP สูงสุด"
msgid "Save"
msgstr "บันทึà¸"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "à¸à¸±à¸žà¹‚หลดไฟล์ใหม่"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "ไฟล์ข้à¸à¸„วาม"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "โฟลเดà¸à¸£à¹Œà¹ƒà¸«à¸¡à¹ˆ"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "à¹à¸Ÿà¹‰à¸¡à¹€à¸à¸à¸ªà¸²à¸£"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "จาà¸à¸¥à¸´à¸‡à¸à¹Œ"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸à¸±à¸žà¹‚หลด"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "ยังไม่มีไฟล์ใดๆà¸à¸¢à¸¹à¹ˆà¸—ี่นี่ à¸à¸£à¸¸à¸“าà¸à¸±à¸žà¹‚หลดไฟล์!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "ดาวน์โหลด"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "ลบ"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "ไฟล์ที่à¸à¸±à¸žà¹‚หลดมีขนาดใหà¸à¹ˆà¹€à¸à¸´à¸™à¹„ป"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "ไฟล์ที่คุณพยายามที่จะà¸à¸±à¸žà¹‚หลดมีขนาดเà¸à¸´à¸™à¸à¸§à¹ˆà¸²à¸‚นาดสูงสุดที่à¸à¸³à¸«à¸™à¸”ไว้ให้à¸à¸±à¸žà¹‚หลดได้สำหรับเซิร์ฟเวà¸à¸£à¹Œà¸™à¸µà¹‰"
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "ไฟล์à¸à¸³à¸¥à¸±à¸‡à¸à¸¢à¸¹à¹ˆà¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸à¸²à¸£à¸ªà¹à¸à¸™, à¸à¸£à¸¸à¸“ารà¸à¸ªà¸±à¸à¸„รู่."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "ไฟล์ที่à¸à¸³à¸¥à¸±à¸‡à¸ªà¹à¸à¸™à¸à¸¢à¸¹à¹ˆà¸‚ณะนี้"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index 737d2545c599e0d00c09e2444e069794a69b25f3..a35e6e9d583b64969cf193aeb1680c6d91870de2 100644
--- a/l10n/th_TH/files_encryption.po
+++ b/l10n/th_TH/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "à¸à¸²à¸£à¹€à¸‚้ารหัส"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index 89074afb964107108cd74bd9f50991d53c09dbc0..1de24ba06406325b82d0334cfbcefe794a508f7d 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "โฮสต์"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr "เà¸à¸´à¸”ข้à¸à¸œà¸´à¸”พลาดในà¸à¸²à¸£à¸à¸³à¸«à¸™à¸”
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 7fc9831193aac4b6ea5ca085187903cc59846d75..babec9a1cc4caa015bc6a6860be72ee173d782aa 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "ถูà¸à¹à¸Šà¸£à¹Œà¹‚ดย {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "รหัสผ่าน"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "ดาวน์โหลด"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index 71833cb7c03108de86d534658c6476a020d5d83e..0cace3ee80b534cfe74db0c7a169027215f16f64 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "คืนค่า"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "ข้à¸à¸œà¸´à¸”พลาด"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "ไฟล์ที่ลบทิ้ง"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "ไม่มีà¸à¸°à¹„รà¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸™à¸µà¹‰ ถังขยะขà¸à¸‡à¸„ุณยังว่างà¸à¸¢à¸¹à¹ˆ"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "ชื่à¸"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "คืนค่า"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "ลบà¹à¸¥à¹‰à¸§"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "ลบ"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index 407faaaf20da073a1ca6920c6cfba672586cb943..60ba4b0a4d16559527154f76370ecba066e47638 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr "เว็บเซà¸à¸£à¹Œà¸§à¸´à¸ªà¸—ี่คุณควบคุมà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„ด้"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "คุณสมบัติà¸à¸²à¸£à¸”าวน์โหลด zip ถูà¸à¸›à¸´à¸”à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„ว้"
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น"
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "à¸à¸¥à¸±à¸šà¹„ปที่ไฟล์"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "ไฟล์ที่เลืà¸à¸à¸¡à¸µà¸‚นาดใหà¸à¹ˆà¹€à¸à¸´à¸™à¸à¸§à¹ˆà¸²à¸—ี่จะสร้างเป็นไฟล์ zip"
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "ไม่พบหมวดหมู่ \"%s\""
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 387c7f2e62bbb8ed125ff808e3ac3fcc7a1c5d82..36c5d294e5156f22a3f9f9ad896b4251701c6f2c 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "ส่งà¸à¸µà¹€à¸¡à¸¥à¹Œà¹à¸¥à¹‰à¸§"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "à¸à¸²à¸£à¹€à¸‚้ารหัส"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "à¸à¸µà¹€à¸¡à¸¥à¸–ูà¸à¸šà¸±à¸™à¸—ึà¸à¹à¸¥à¹‰à¸§"
@@ -114,6 +124,16 @@ msgstr "ไม่สามารถลบà¸à¸¥à¸¸à¹ˆà¸¡à¹„ด้"
msgid "Unable to delete user"
msgstr "ไม่สามารถลบผู้ใช้งานได้"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "เปลี่ยนภาษาเรียบร้à¸à¸¢à¹à¸¥à¹‰à¸§"
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr "à¸à¸±à¸žà¹€à¸”ท"
msgid "Updated"
msgstr "à¸à¸±à¸žà¹€à¸”ทà¹à¸¥à¹‰à¸§"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "ลบà¹à¸¥à¹‰à¸§"
@@ -265,8 +293,8 @@ msgstr "เลิà¸à¸—ำ"
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "à¸à¸¥à¸¸à¹ˆà¸¡"
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "ภาษาไทย"
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "ประมวลคำสั่งหนึ่งงานในà¹à¸•à¹ˆà¸¥à¸°à¸„รั้งที่มีà¸à¸²à¸£à¹‚หลดหน้าเว็บ"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "เปิดใช้งาน API สำหรับคุณสมบัติà¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹à¸à¸›à¸¯à¸ªà¸²à¸¡à¸²à¸£à¸–ใช้ API สำหรับà¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥à¹„ด้"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸¥à¸´à¸‡à¸à¹Œà¹„ด้"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸ªà¸²à¸¡à¸²à¸£à¸–à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥à¸£à¸²à¸¢à¸à¸²à¸£à¸•à¹ˆà¸²à¸‡à¹†à¹„ปให้สาธารณะชนเป็นลิงà¸à¹Œà¹„ด้"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸ªà¸²à¸¡à¸²à¸£à¸–à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥à¸£à¸²à¸¢à¸à¸²à¸£à¸•à¹ˆà¸²à¸‡à¹†à¹„ปให้สาธารณะชนเป็นลิงà¸à¹Œà¹„ด้"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥à¸‹à¹‰à¸³à¹ƒà¸«à¸¡à¹ˆà¹„ด้"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥à¸£à¸²à¸¢à¸à¸²à¸£à¸•à¹ˆà¸²à¸‡à¹†à¸—ี่ถูà¸à¹à¸Šà¸£à¹Œà¸¡à¸²à¹ƒà¸«à¹‰à¸•à¸±à¸§à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„ด้เท่านั้น"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥à¸–ึงใครà¸à¹‡à¹„ด้"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸Šà¸£à¹Œà¸‚้à¸à¸¡à¸¹à¸¥à¹„ด้เฉพาะà¸à¸±à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸¥à¸¸à¹ˆà¸¡à¹€à¸”ียวà¸à¸±à¸™à¹€à¸—่านั้น"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "ที่à¸à¸¢à¸¹à¹ˆà¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "พà¸à¸£à¹Œà¸•"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "ข้à¸à¸¡à¸¹à¸¥à¸ªà¹ˆà¸§à¸™à¸•à¸±à¸§à¸ªà¸³à¸«à¸£à¸±à¸šà¹€à¸‚้าระบบ"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "บันทึà¸à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "ระดับà¸à¸²à¸£à¹€à¸à¹‡à¸šà¸šà¸±à¸™à¸—ึภlog"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "มาà¸"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "น้à¸à¸¢"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "รุ่น"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,29 +828,33 @@ msgstr "ภาษา"
msgid "Help translate"
msgstr "ช่วยà¸à¸±à¸™à¹à¸›à¸¥"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr ""
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr ""
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "ชื่à¸à¸—ี่ใช้สำหรับเข้าสู่ระบบ"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 7f859f040209bd404cacd5749013d9c987bbe83d..336ba436c3772a07e7dcfb6942c430dcfebef484 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr "รัà¸à¸©à¸²à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าไว้?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "ไม่สามารถเพิ่มค่าà¸à¸³à¸«à¸™à¸”เซิร์ฟเวà¸à¸£à¹Œà¹„ด้"
@@ -86,6 +90,18 @@ msgstr "เสร็จสิ้น"
msgid "Error"
msgstr "ข้à¸à¸œà¸´à¸”พลาด"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,26 +142,42 @@ msgstr "คุณà¹à¸™à¹ˆà¹ƒà¸ˆà¹à¸¥à¹‰à¸§à¸«à¸£à¸·à¸à¸§à¹ˆà¸²à¸•à¹‰à¸à¸‡à¸
msgid "Confirm Deletion"
msgstr "ยืนยันà¸à¸²à¸£à¸¥à¸šà¸—ิ้ง"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "ตัวà¸à¸£à¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸à¸¥à¸¸à¹ˆà¸¡"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "บันทึà¸"
@@ -218,10 +250,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "เพิ่มà¸à¸²à¸£à¸à¸³à¸«à¸™à¸”ค่าเซิร์ฟเวà¸à¸£à¹Œ"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "โฮสต์"
@@ -285,6 +330,14 @@ msgstr "ย้à¸à¸™à¸à¸¥à¸±à¸š"
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "ขั้นสูง"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 9bd3356e9663643f31e7c1d93876b7fa485daf7d..6a5cc44055bb03e6f5b6ab68d3bda52e8dc14e05 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 12:01+0000\n"
+"Last-Translator: volkangezer <volkangezer@gmail.com>\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"
@@ -21,11 +21,11 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "Son kullanma tarihi geçmişte."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Şu kullanıcılara posta gönderilemedi: %s"
@@ -42,6 +42,11 @@ msgstr "Bakım kipi kapatıldı"
msgid "Updated database"
msgstr "Veritabanı güncellendi"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr "Uyumsuz uygulamalar devre dışı bırakıldı: %s"
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Resim veya dosya belirtilmedi"
@@ -62,207 +67,207 @@ msgstr "Kullanılabilir geçici profil resmi yok, tekrar deneyin"
msgid "No crop data provided"
msgstr "Kesme verisi sağlanmamış"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Pazar"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Pazartesi"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Salı"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Çarşamba"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "PerÅŸembe"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Cuma"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Cumartesi"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Ocak"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Åžubat"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Mart"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Nisan"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Mayıs"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Haziran"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Temmuz"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "AÄŸustos"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Eylül"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Ekim"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Kasım"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Aralık"
-#: js/js.js:483
+#: js/js.js:496
msgid "Settings"
msgstr "Ayarlar"
-#: js/js.js:583
+#: js/js.js:596
msgid "Saving..."
msgstr "Kaydediliyor..."
-#: js/js.js:1240
+#: js/js.js:1220
msgid "seconds ago"
msgstr "saniyeler önce"
-#: js/js.js:1241
+#: js/js.js:1221
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n dakika önce"
msgstr[1] "%n dakika önce"
-#: js/js.js:1242
+#: js/js.js:1222
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n saat önce"
msgstr[1] "%n saat önce"
-#: js/js.js:1243
+#: js/js.js:1223
msgid "today"
msgstr "bugün"
-#: js/js.js:1244
+#: js/js.js:1224
msgid "yesterday"
msgstr "dün"
-#: js/js.js:1245
+#: js/js.js:1225
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n gün önce"
msgstr[1] "%n gün önce"
-#: js/js.js:1246
+#: js/js.js:1226
msgid "last month"
msgstr "geçen ay"
-#: js/js.js:1247
+#: js/js.js:1227
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n ay önce"
msgstr[1] "%n ay önce"
-#: js/js.js:1248
+#: js/js.js:1228
msgid "last year"
msgstr "geçen yıl"
-#: js/js.js:1249
+#: js/js.js:1229
msgid "years ago"
msgstr "yıllar önce"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Seç"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Dosya seçici şablonu yüklenirken hata: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Evet"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Hayır"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Seç"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Dosya seçici şablonu yüklenirken hata: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Tamam"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "İleti şablonu yüklenirken hata: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} dosya çakışması"
msgstr[1] "{count} dosya çakışması"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Bir dosya çakışması"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Yeni Dosyalar"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "Zaten mevcut olan dosyalar"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Hangi dosyaları saklamak istiyorsunuz?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "İki sürümü de seçerseniz, kopyalanan dosyanın ismine bir sayı ilave edilecektir."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Ä°ptal"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Devam et"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(tümü seçildi)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} seçildi)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Dosya mevcut şablonu yüklenirken hata"
@@ -286,148 +291,157 @@ msgstr "Ä°yi parola"
msgid "Strong password"
msgstr "Güçlü parola"
-#: js/share.js:51 js/share.js:66 js/share.js:106
+#: js/share.js:69 js/share.js:84 js/share.js:127
msgid "Shared"
msgstr "Paylaşılan"
-#: js/share.js:109
+#: js/share.js:130
msgid "Share"
msgstr "PaylaÅŸ"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:195 js/share.js:208 js/share.js:215 js/share.js:822
#: templates/installation.php:10
msgid "Error"
msgstr "Hata"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:197 js/share.js:885
msgid "Error while sharing"
msgstr "Paylaşım sırasında hata"
-#: js/share.js:171
+#: js/share.js:208
msgid "Error while unsharing"
msgstr "Paylaşım iptal edilirken hata"
-#: js/share.js:178
+#: js/share.js:215
msgid "Error while changing permissions"
msgstr "Ä°zinleri deÄŸiÅŸtirirken hata"
-#: js/share.js:188
+#: js/share.js:225
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} tarafından sizinle ve {group} ile paylaştırılmış"
-#: js/share.js:190
+#: js/share.js:227
msgid "Shared with you by {owner}"
msgstr "{owner} tarafından sizinle paylaşıldı"
-#: js/share.js:214
+#: js/share.js:251
msgid "Share with user or group …"
msgstr "Kullanıcı veya grup ile paylaş..."
-#: js/share.js:220
+#: js/share.js:257
msgid "Share link"
msgstr "Paylaşma bağlantısı"
-#: js/share.js:223
+#: js/share.js:263
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "Herkese açık bağlantı, oluşturulduktan en geç {days} gün sonra sona erecek"
+
+#: js/share.js:265
+msgid "By default the public link will expire after {days} days"
+msgstr "Öntanımlı olarak herkese açık bağlantı {days} gün sonra sona erecek"
+
+#: js/share.js:270
msgid "Password protect"
msgstr "Parola koruması"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Parola"
+#: js/share.js:272
+msgid "Choose a password for the public link"
+msgstr "Herkese açık bağlantı için bir parola seçin"
-#: js/share.js:230
+#: js/share.js:278
msgid "Allow Public Upload"
msgstr "Herkes Tarafından Gönderime İzin Ver"
-#: js/share.js:234
+#: js/share.js:282
msgid "Email link to person"
msgstr "Bağlantıyı e-posta ile gönder"
-#: js/share.js:235
+#: js/share.js:283
msgid "Send"
msgstr "Gönder"
-#: js/share.js:240
+#: js/share.js:288
msgid "Set expiration date"
msgstr "Son kullanma tarihini ayarla"
-#: js/share.js:241
+#: js/share.js:289
msgid "Expiration date"
msgstr "Son kullanım tarihi"
-#: js/share.js:277
+#: js/share.js:326
msgid "Share via email:"
msgstr "E-posta ile paylaÅŸ:"
-#: js/share.js:280
+#: js/share.js:329
msgid "No people found"
msgstr "Kişi bulunamadı"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:377 js/share.js:438
msgid "group"
msgstr "grup"
-#: js/share.js:357
+#: js/share.js:410
msgid "Resharing is not allowed"
msgstr "Tekrar paylaÅŸmaya izin verilmiyor"
-#: js/share.js:401
+#: js/share.js:454
msgid "Shared in {item} with {user}"
msgstr "{item} içinde {user} ile paylaşılanlar"
-#: js/share.js:423
+#: js/share.js:476
msgid "Unshare"
-msgstr "Paylaşılmayan"
+msgstr "Paylaşmayı Kaldır"
-#: js/share.js:431
+#: js/share.js:484
msgid "notify by email"
msgstr "e-posta ile bildir"
-#: js/share.js:434
+#: js/share.js:487
msgid "can edit"
msgstr "düzenleyebilir"
-#: js/share.js:436
+#: js/share.js:489
msgid "access control"
msgstr "erişim kontrolü"
-#: js/share.js:439
+#: js/share.js:492
msgid "create"
msgstr "oluÅŸtur"
-#: js/share.js:442
+#: js/share.js:495
msgid "update"
msgstr "güncelle"
-#: js/share.js:445
+#: js/share.js:498
msgid "delete"
msgstr "sil"
-#: js/share.js:448
+#: js/share.js:501
msgid "share"
msgstr "paylaÅŸ"
-#: js/share.js:721
+#: js/share.js:803
msgid "Password protected"
msgstr "Parola korumalı"
-#: js/share.js:734
+#: js/share.js:822
msgid "Error unsetting expiration date"
msgstr "Son kullanma tarihi kaldırma hatası"
-#: js/share.js:752
+#: js/share.js:843
msgid "Error setting expiration date"
msgstr "Son kullanma tarihi ayarlama hatası"
-#: js/share.js:777
+#: js/share.js:872
msgid "Sending ..."
msgstr "Gönderiliyor..."
-#: js/share.js:788
+#: js/share.js:883
msgid "Email sent"
msgstr "E-posta gönderildi"
-#: js/share.js:812
+#: js/share.js:907
msgid "Warning"
msgstr "Uyarı"
@@ -459,18 +473,19 @@ msgstr "İletişim şablonu yüklenirken hata: {error}"
msgid "No tags selected for deletion."
msgstr "Silmek için bir etiket seçilmedi."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr "{productName}, {version} sürümüne güncelleniyor, bu biraz zaman alabilir."
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Lütfen sayfayı yeniden yükleyin."
-#: 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 "Güncelleme başarısız oldu. Lütfen bu hatayı <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud topluluğu</a>na bildirin."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr "Güncelleme başarısız oldu."
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz."
@@ -640,7 +655,7 @@ msgstr "PHP sürümünüz NULL Byte saldırısına açık (CVE-2006-7243)"
#: templates/installation.php:27
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr "%s güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin."
+msgstr "%s yazılımını güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin."
#: templates/installation.php:33
msgid ""
@@ -671,6 +686,10 @@ msgstr "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=
msgid "Create an <strong>admin account</strong>"
msgstr "Bir <strong>yönetici hesabı</strong> oluşturun"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Parola"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "Depolama ve veritabanı"
@@ -725,7 +744,7 @@ msgstr "Uygulama, doğru çalışabilmesi için JavaScript'in etkinleştirilmesi
#: templates/layout.user.php:44
#, php-format
msgid "%s is available. Get more information on how to update."
-msgstr "%s mevcut. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın."
+msgstr "%s kullanılabilir. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın."
#: templates/layout.user.php:74 templates/singleuser.user.php:8
msgid "Log out"
@@ -796,8 +815,27 @@ msgstr "Sabrınız için teşekkür ederiz."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud %s sürümüne güncelleniyor. Biraz zaman alabilir."
+msgid "%s will be updated to version %s."
+msgstr "%s, %s sürümüne güncellenecek."
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr "Aşağıdaki uygulamalar devre dışı bırakılacak:"
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr "%s teması devre dışı bırakıldı."
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr "Devam etmeden önce lütfen veritabanının, config ve data klasörlerinin yedeklenmiş olduğundan emin olun."
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr "Güncellemeyi başlat"
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index dae3ef74fe5d3c423bd557213c74848b98ee3478..50b6baddcbb7eb95f8e9a83ad333011cf24f8d9a 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 10:32+0000\n"
"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -32,27 +32,27 @@ msgstr "%s taşınamadı. Bu isimde dosya zaten mevcut"
msgid "Could not move %s"
msgstr "%s taşınamadı"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Dosya adı boş olamaz."
#: ajax/newfile.php:63
#, php-format
msgid "\"%s\" is an invalid file name."
-msgstr "'%s' geçersiz bir dosya adı."
+msgstr "\"%s\" geçersiz bir dosya adı."
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir."
+msgstr "Geçersiz isim. '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "Hedef klasör taşındı veya silindi."
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -66,7 +66,7 @@ msgstr "Geçerli bir kaynak değil"
#: ajax/newfile.php:102
msgid ""
"Server is not allowed to open URLs, please check the server configuration"
-msgstr "Sunucunun adresleri açma izi yok, lütfen sunucu yapılandırmasını denetleyin"
+msgstr "Sunucunun adresleri açma izni yok, lütfen sunucu yapılandırmasını denetleyin"
#: ajax/newfile.php:118
#, php-format
@@ -87,11 +87,11 @@ msgstr "Klasör oluşturulurken hata"
#: ajax/upload.php:19 ajax/upload.php:57
msgid "Unable to set upload directory."
-msgstr "Yükleme dizini tanımlanamadı."
+msgstr "Yükleme dizini ayarlanamadı."
#: ajax/upload.php:33
msgid "Invalid Token"
-msgstr "Geçersiz Simge"
+msgstr "Geçersiz Belirteç"
#: ajax/upload.php:75
msgid "No file was uploaded. Unknown error"
@@ -104,7 +104,7 @@ msgstr "Dosya başarıyla yüklendi, hata oluşmadı"
#: ajax/upload.php:83
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı."
+msgstr "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı:"
#: ajax/upload.php:85
msgid ""
@@ -114,7 +114,7 @@ msgstr "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limi
#: ajax/upload.php:86
msgid "The uploaded file was only partially uploaded"
-msgstr "Dosya kısmen karşıya yüklenebildi"
+msgstr "Dosya karşıya kısmen yüklenebildi"
#: ajax/upload.php:87
msgid "No file was uploaded"
@@ -122,191 +122,195 @@ msgstr "Hiç dosya gönderilmedi"
#: ajax/upload.php:88
msgid "Missing a temporary folder"
-msgstr "Geçici dizin eksik"
+msgstr "Geçici bir dizin eksik"
#: ajax/upload.php:89
msgid "Failed to write to disk"
msgstr "Diske yazılamadı"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Yeterli disk alanı yok"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Yükleme başarısız. Yüklenen dosya bulunamadı"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Yükleme başarısız. Dosya bilgisi alınamadı."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Geçersiz dizin."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Dosyalar"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr "Tüm dosyalar"
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
-msgstr "Bir dizin veya 0 bayt olduğundan {filename} yüklenemedi"
+msgstr "{filename} bir dizin veya 0 bayt olduğundan yüklenemedi"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "Toplam dosya boyutu {size1}, {size2} gönderme sınırını aşıyor"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "Yeterince boş alan yok. Gönderdiğiniz boyut {size1} ancak {size2} alan mevcut"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Yükleme iptal edildi."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Sunucudan sonuç alınamadı."
#: js/file-upload.js:490
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."
+msgstr "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek."
#: js/file-upload.js:555
msgid "URL cannot be empty"
msgstr "URL boÅŸ olamaz"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} zaten mevcut"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Dosya oluşturulamadı"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Klasör oluşturulamadı"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "Adres getirilirken hata"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "PaylaÅŸ"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Kalıcı olarak sil"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Yeniden adlandır"
-#: js/filelist.js:221
+#: js/filelist.js:299
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."
+msgstr "İndirme hazırlanıyor. Dosyalar büyük ise bu biraz zaman alabilir."
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Bekliyor"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr "Dosya taşıma hatası."
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Dosya taşıma hatası"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Hata"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Dosya adlandırılamadı"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Dosya silinirken hata."
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Ä°sim"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Boyut"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "DeÄŸiÅŸtirilme"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n dizin"
msgstr[1] "%n dizin"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n dosya"
msgstr[1] "%n dosya"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n dosya yükleniyor"
msgstr[1] "%n dosya yükleniyor"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "\"{name}\" geçersiz bir dosya adı."
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Depolama alanınız dolu, artık dosyalar güncellenmeyecek veya eşitlenmeyecek."
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)"
+msgstr "Depolama alanınız neredeyse dolu (%{usedSpacePercent})"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "Şifreleme Uygulaması için geçersiz özel anahtar. Lütfen şifreli dosyalarınıza erişimi tekrar kazanabilmek için kişisel ayarlarınızdan özel anahtar parolanızı güncelleyin."
-#: js/files.js:141
+#: js/files.js:148
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çin."
+msgstr "Şifreleme işlemi durduruldu ancak dosyalarınız hala şifreli. Dosyalarınızın şifrelemesini kaldırmak için lütfen kişisel ayarlar kısmına geçin."
#: js/filesummary.js:182
msgid "{dirs} and {files}"
msgstr "{dirs} ve {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s yeniden adlandırılamadı"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "Yükle (azami: %s)"
@@ -317,7 +321,7 @@ msgstr "Dosya iÅŸlemleri"
#: templates/admin.php:6
msgid "Maximum upload size"
-msgstr "Maksimum yükleme boyutu"
+msgstr "Azami yükleme boyutu"
#: templates/admin.php:9
msgid "max. possible: "
@@ -343,68 +347,75 @@ msgstr "ZIP dosyaları için en fazla girdi boyutu"
msgid "Save"
msgstr "Kaydet"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "<a href=\"%s\" target=\"_blank\">Dosyalarınıza WebDAV aracılığıyla erişmek için</a> bu adresi kullanın"
+
+#: templates/list.php:5
msgid "New"
msgstr "Yeni"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "Yeni metin dosyası"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Metin dosyası"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Yeni klasör"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Klasör"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Bağlantıdan"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "SilinmiÅŸ dosyalar"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Yüklemeyi iptal et"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Buraya dosya yükleme veya oluşturma izniniz yok"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Burada hiçbir şey yok. Bir şeyler yükleyin!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Ä°ndir"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Sil"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Yükleme çok büyük"
-#: templates/index.php:100
+#: templates/list.php:97
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."
+msgstr "Yüklemeye çalıştığınız dosyalar bu sunucudaki azami yükleme boyutunu aşıyor."
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Dosyalar taranıyor, lütfen bekleyin."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Güncel tarama"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr "Åžu anda taranan"
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index 76d669faeaa5e400f0e31ab9beab558b3ee5c1b0..3a189b7876ad3719afe091853153fa05cdf0d7de 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 10:51+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:18+0000\n"
"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -47,13 +47,13 @@ msgstr "Parola değiştirilemedi. Eski parolanız doğru olmayabilir."
#: ajax/updatePrivateKeyPassword.php:52
msgid "Private key password successfully updated."
-msgstr "Gizli anahtar parolası başarıyla güncellendi"
+msgstr "Özel anahtar parolası başarıyla güncellendi."
#: ajax/updatePrivateKeyPassword.php:54
msgid ""
"Could not update the private key password. Maybe the old password was not "
"correct."
-msgstr "Gizli anahtar parolası güncellenemedi. Eski parola hatalı olabilir."
+msgstr "Özel anahtar parolası güncellenemedi. Eski parola hatalı olabilir."
#: files/error.php:12
msgid ""
@@ -68,17 +68,17 @@ msgid ""
"Your private key is not valid! Likely your password was changed outside of "
"%s (e.g. your corporate directory). You can update your private key password"
" in your personal settings to recover access to your encrypted files."
-msgstr "Gizli anahtarınız geçerli değil! Muhtemelen parolanız ownCloud sistemi %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz."
+msgstr "Özel anahtarınız geçerli değil! Muhtemelen parolanız %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz."
#: files/error.php:19
msgid ""
"Can not decrypt this file, probably this is a shared file. Please ask the "
"file owner to reshare the file with you."
-msgstr "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifresi çözülemiyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin."
+msgstr "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifrelemesi kaldırılamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin."
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr "Bilinmeyen hata. Lütfen sistem ayarlarınızı denetleyin veya yöneticiniz ile iletişime geçin"
@@ -91,11 +91,11 @@ 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 "PHP 5.3.3 veya daha sürümü ile birlikte OpenSSL ve OpenSSL PHP uzantısının birlikte etkin olduğunu ve doğru bir şekilde yapılandırıldığından emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı"
+msgstr "PHP 5.3.3 veya daha sürümü ile birlikte OpenSSL ve OpenSSL PHP uzantısının birlikte etkin olduğundan ve doğru bir şekilde yapılandırıldığından emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı."
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
-msgstr "Aşağıdaki kullanıcılar şifreleme için ayarlanmadılar:"
+msgstr "Aşağıdaki kullanıcılar şifreleme için ayarlanmamış:"
#: js/detect-migration.js:21
msgid "Initial encryption started... This can take some time. Please wait."
@@ -107,97 +107,97 @@ msgstr "İlk şifreleme çalışıyor... Lütfen daha sonra tekrar deneyin."
#: templates/invalid_private_key.php:8
msgid "Go directly to your "
-msgstr "DoÄŸrudan ÅŸuraya gidin:"
+msgstr "DoÄŸrudan "
#: templates/invalid_private_key.php:8
msgid "personal settings"
-msgstr "kiÅŸisel ayarlar"
+msgstr "kişisel ayarlarınıza gidin"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Åžifreleme"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "Kurtarma anahtarını etkinleştir (parola kaybı durumunda kullanıcı dosyalarının kurtarılmasına izin verir):"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "Kurtarma anahtarı parolası"
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
-msgstr "Kurtarma anahtarı parolasını yenileyin"
+msgstr "Kurtarma anahtarı parolasını yineleyin"
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
-msgstr "EtkinleÅŸtirildi"
+msgstr "Etkin"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
-msgstr "Devre dışı"
+msgstr "Devre Dışı"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "Kurtarma anahtarı parolasını değiştir:"
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
-msgstr "Eski Kurtarma anahtar parolası"
+msgstr "Eski Kurtarma anahtarı parolası"
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
-msgstr "Yeni Kurtarma anahtar parolası"
+msgstr "Yeni Kurtarma anahtarı parolası"
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
-msgstr "Yeni Kurtarma anahtarı parolasını yenileyin"
+msgstr "Yeni Kurtarma anahtarı parolasını yineleyin"
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Parola DeÄŸiÅŸtir"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Özel anahtar parolanız artık oturum açma parolanızla eşleşmiyor:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Eski özel anahtar parolanızı geçerli oturum açma parolanız olarak ayarlayın."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Eğer eski parolanızı hatırlamıyorsanız, yöneticinizden dosyalarınızı kurtarmasını talep edebilirsiniz."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Eski oturum açma parolası"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Geçerli oturum açma parolası"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Özel Anahtar Parolasını Güncelle"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "Parola kurtarmayı etkinleştir:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Bu seçeneği etkinleştirmek, parola kaybı durumunda şifrelenmiş dosyalarınıza erişimi yeniden kazanmanızı sağlayacaktır"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Dosya kurtarma ayarları güncellendi"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Dosya kurtarma güncellenemedi"
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index 617e793777f6e39ca938d44116660bfbcbe8c003..00a95543eca61e45ef521c9120c6fe8bd9dc4b1c 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 17:20+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-25 09:53+0000\n"
"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -22,155 +22,159 @@ msgstr ""
msgid "Local"
msgstr "Yerel"
-#: appinfo/app.php:36
+#: appinfo/app.php:37
msgid "Location"
msgstr "Konum"
-#: appinfo/app.php:39
+#: appinfo/app.php:40
msgid "Amazon S3"
msgstr "Amazon S3"
-#: appinfo/app.php:41
+#: appinfo/app.php:43
msgid "Key"
msgstr "Anahtar"
-#: appinfo/app.php:42
+#: appinfo/app.php:44
msgid "Secret"
msgstr "Parola"
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
msgid "Bucket"
msgstr "Bucket"
-#: appinfo/app.php:47
+#: appinfo/app.php:49
msgid "Amazon S3 and compliant"
msgstr "Amazon S3 ve uyumlu olanlar"
-#: appinfo/app.php:49
+#: appinfo/app.php:52
msgid "Access Key"
msgstr "Erişim Anahtarı"
-#: appinfo/app.php:50
+#: appinfo/app.php:53
msgid "Secret Key"
msgstr "Gizli Anahtar"
-#: appinfo/app.php:52
+#: appinfo/app.php:55
msgid "Hostname (optional)"
msgstr "Makine Adı (isteğe bağlı)"
-#: appinfo/app.php:53
+#: appinfo/app.php:56
msgid "Port (optional)"
msgstr "Bağl. Nok. (isteğe bağlı)"
-#: appinfo/app.php:54
+#: appinfo/app.php:57
msgid "Region (optional)"
msgstr "Bölge (isteğe bağlı)"
-#: appinfo/app.php:55
+#: appinfo/app.php:58
msgid "Enable SSL"
msgstr "SSL'yi EtkinleÅŸtir"
-#: appinfo/app.php:56
+#: appinfo/app.php:59
msgid "Enable Path Style"
msgstr "Yol Biçemini Etkinleştir"
-#: appinfo/app.php:63
+#: appinfo/app.php:67
msgid "App key"
msgstr "Uyg. anahtarı"
-#: appinfo/app.php:64
+#: appinfo/app.php:68
msgid "App secret"
msgstr "Uyg. parolası"
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
+msgid "Host"
+msgstr "Sunucu"
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
msgid "Username"
-msgstr "Kullanıcı Adı:"
+msgstr "Kullanıcı Adı"
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
msgid "Password"
-msgstr "Parola:"
+msgstr "Parola"
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
msgid "Root"
msgstr "Kök"
-#: appinfo/app.php:77
+#: appinfo/app.php:82
msgid "Secure ftps://"
msgstr "Güvenli ftps://"
-#: appinfo/app.php:84
+#: appinfo/app.php:90
msgid "Client ID"
msgstr "Ä°stemci KimliÄŸ"
-#: appinfo/app.php:85
+#: appinfo/app.php:91
msgid "Client secret"
msgstr "İstemci parolası"
-#: appinfo/app.php:92
+#: appinfo/app.php:98
msgid "OpenStack Object Storage"
msgstr "OpenStack Nesne Depolama"
-#: appinfo/app.php:94
+#: appinfo/app.php:101
msgid "Username (required)"
msgstr "Kullanıcı adı (gerekli)"
-#: appinfo/app.php:95
+#: appinfo/app.php:102
msgid "Bucket (required)"
msgstr "Bucket (gerekli)"
-#: appinfo/app.php:96
+#: appinfo/app.php:103
msgid "Region (optional for OpenStack Object Storage)"
msgstr "Bölge (OpenStack Nesne Depolaması için isteğe bağlı)"
-#: appinfo/app.php:97
+#: appinfo/app.php:104
msgid "API Key (required for Rackspace Cloud Files)"
msgstr "API Anahtarı (Rackspace Bulut Dosyaları için gerekli)"
-#: appinfo/app.php:98
+#: appinfo/app.php:105
msgid "Tenantname (required for OpenStack Object Storage)"
msgstr "Kiracı Adı (OpenStack Nesne Depolaması için gerekli)"
-#: appinfo/app.php:99
+#: appinfo/app.php:106
msgid "Password (required for OpenStack Object Storage)"
msgstr "Parola (OpenStack Nesne Depolaması için gerekli)"
-#: appinfo/app.php:100
+#: appinfo/app.php:107
msgid "Service Name (required for OpenStack Object Storage)"
msgstr "Hizmet Adı (OpenStack Nesne Depolaması için gerekli)"
-#: appinfo/app.php:101
+#: appinfo/app.php:108
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
msgstr "Kimlik uç nokta adresi (OpenStack Nesne Depolaması için gerekli)"
-#: appinfo/app.php:102
+#: appinfo/app.php:109
msgid "Timeout of HTTP requests in seconds (optional)"
msgstr "Saniye cinsinden HTTP istek zaman aşımı (isteğe bağlı)"
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
msgid "Share"
msgstr "PaylaÅŸ"
-#: appinfo/app.php:119
+#: appinfo/app.php:127
msgid "SMB / CIFS using OC login"
msgstr "OC oturumu kullanarak SMB / CIFS"
-#: appinfo/app.php:122
+#: appinfo/app.php:131
msgid "Username as share"
msgstr "Paylaşım olarak kullanıcı adı"
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:141 appinfo/app.php:152
+msgid "URL"
+msgstr "URL"
+
+#: appinfo/app.php:145 appinfo/app.php:156
msgid "Secure https://"
msgstr "Güvenli https://"
-#: appinfo/app.php:144
+#: appinfo/app.php:155
msgid "Remote subfolder"
msgstr "Uzak alt klasör"
@@ -198,29 +202,29 @@ msgstr "Google Drive depo yapılandırma hatası"
msgid "Saved"
msgstr "Kaydedildi"
-#: lib/config.php:598
+#: lib/config.php:674
msgid "<b>Note:</b> "
msgstr "<b>Not:</b> "
-#: lib/config.php:608
+#: lib/config.php:684
msgid " and "
msgstr "ve"
-#: lib/config.php:630
+#: lib/config.php:706
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin."
-#: lib/config.php:632
+#: lib/config.php:708
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin."
-#: lib/config.php:634
+#: lib/config.php:710
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 1556e35688a3b12bad58e9ffd432db0f65951e5f..4765f3fd513b29fb2501300dd399c2b828b23e89 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 15:53+0000\n"
-"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -18,10 +18,34 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "{owner} tarafından paylaşılmış"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Bu paylaşım parola korumalı"
@@ -34,6 +58,14 @@ msgstr "Parola hatalı. Yeniden deneyin."
msgid "Password"
msgstr "Parola"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Üzgünüz, bu bağlantı artık çalışıyor gibi görünmüyor."
@@ -62,11 +94,11 @@ msgstr "Daha fazla bilgi için bu bağlantıyı aldığınız kişi ile iletişi
msgid "Download"
msgstr "Ä°ndir"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr "Ä°ndir: %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "Doğrudan bağlantı"
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index e3d0ae59b847871bc920f628cd6b44ed7b01ae47..dd5976a1fba6dbfb1372c69252e718b44ca3464b 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/files_trashbin.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 18:59+0000\n"
"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -22,45 +22,41 @@ msgstr ""
#: ajax/delete.php:59
#, php-format
msgid "Couldn't delete %s permanently"
-msgstr "%s alıcı olarak silinemedi"
+msgstr "%s kalıcı olarak silinemedi"
#: ajax/undelete.php:64
#, php-format
msgid "Couldn't restore %s"
msgstr "%s geri yüklenemedi"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "SilinmiÅŸ dosyalar"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Geri yükle"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Hata"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Silinen Dosyalar"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "geri yüklendi"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Burada hiçbir şey yok. Çöp kutunuz tamamen boş!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Ä°sim"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Geri yükle"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
-msgstr "Silindi"
+msgstr "Silinme"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Sil"
diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po
index b6fd8395583ef083e4b1b9422f488bcdebccdff7..798a8a140332680adc00cd57c107224ad4669709 100644
--- a/l10n/tr/files_versions.po
+++ b/l10n/tr/files_versions.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# volkangezer <volkangezer@gmail.com>, 2013
+# volkangezer <volkangezer@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 19:10+0000\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-25 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 14:42+0000\n"
"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -21,24 +21,24 @@ msgstr ""
#: ajax/rollbackVersion.php:13
#, php-format
msgid "Could not revert: %s"
-msgstr "Geri alınamıyor: %s"
+msgstr "Geri alınamayan: %s"
-#: js/versions.js:7
+#: js/versions.js:39
msgid "Versions"
msgstr "Sürümler"
-#: js/versions.js:53
+#: js/versions.js:61
msgid "Failed to revert {file} to revision {timestamp}."
msgstr "{file} dosyası {timestamp} gözden geçirmesine geri alınamadı."
-#: js/versions.js:79
+#: js/versions.js:88
msgid "More versions..."
msgstr "Daha fazla sürüm..."
-#: js/versions.js:116
+#: js/versions.js:126
msgid "No other versions available"
msgstr "Başka sürüm mevcut değil"
-#: js/versions.js:147
+#: js/versions.js:156
msgid "Restore"
msgstr "Geri yükle"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index a105b5d212786418ca04c34e331497055a072cf9..ed1fab04c9c11422a8662e5b59f45c05fd3b53e2 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 12:00+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-25 21:40+0000\n"
"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: base.php:712
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr "Sunucuya güvenilmeyen bir alan adından ulaşıyorsunuz."
-#: base.php:713
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -37,7 +37,7 @@ msgstr "Lütfen yöneticiniz ile iletişime geçin. Eğer bu örneğin bir yöne
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
-msgstr "ownCloud yazılımının bu sürümü ile uyumlu olmadığı için \"%s\" uygulaması kurulamaz."
+msgstr "ownCloud yazılımının bu sürümü ile uyumlu olmadığı için \"%s\" uygulaması kurulamıyor."
#: private/app.php:248
msgid "No app name specified"
@@ -78,25 +78,25 @@ msgstr "Geçersiz resim"
#: private/defaults.php:35
msgid "web services under your control"
-msgstr "kontrolünüzün altındaki web hizmetleri"
+msgstr "denetiminizdeki web hizmetleri"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP indirmeleri kapatıldı."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Dosyaların tek tek indirilmesi gerekmektedir."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Dosyalara Dön"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyük."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -108,7 +108,7 @@ msgstr "Uygulama kurulurken bir kaynak belirtilmedi"
#: private/installer.php:71
msgid "No href specified when installing app from http"
-msgstr "Uygulama kuruluyorken http'de href belirtilmedi"
+msgstr "Uygulama http'den kurulurken href belirtilmedi"
#: private/installer.php:76
msgid "No path specified when installing app from local file"
@@ -121,7 +121,7 @@ msgstr "%s arşiv türü desteklenmiyor"
#: private/installer.php:104
msgid "Failed to open archive when installing app"
-msgstr "Uygulama kuruluyorken arşiv dosyası açılamadı"
+msgstr "Uygulama kurulurken arşiv dosyası açılamadı"
#: private/installer.php:126
msgid "App does not provide an info.xml file"
@@ -129,25 +129,25 @@ msgstr "Uygulama info.xml dosyası sağlamıyor"
#: private/installer.php:132
msgid "App can't be installed because of not allowed code in the App"
-msgstr "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor."
+msgstr "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor"
#: private/installer.php:141
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor."
+msgstr "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor"
#: private/installer.php:147
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ü \"birlikte gelmeyen\" uygulamalar için <shipped>true</shipped> etiketi içeriyor"
+msgstr "Uygulama, birlikte gelmeyen uygulama olmasına rağmen <shipped>true</shipped> etiketi içerdiği için kurulamıyor"
#: private/installer.php:160
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 markette belirtilen sürüm aynı değil"
+msgstr "Uygulama info.xml/version ile uygulama marketinde belirtilen sürüm aynı olmadığından kurulamıyor"
#: private/installer.php:170
msgid "App directory already exists"
@@ -160,7 +160,7 @@ msgstr "Uygulama dizini oluşturulamıyor. Lütfen izinleri düzeltin. %s"
#: private/json.php:29
msgid "Application is not enabled"
-msgstr "Uygulama etkinleÅŸtirilmedi"
+msgstr "Uygulama etkin deÄŸil"
#: private/json.php:40 private/json.php:62 private/json.php:87
msgid "Authentication error"
@@ -168,7 +168,7 @@ msgstr "Kimlik doğrulama hatası"
#: private/json.php:51
msgid "Token expired. Please reload page."
-msgstr "Jetonun süresi geçti. Lütfen sayfayı yenileyin."
+msgstr "Belirteç süresi geçti. Lütfen sayfayı yenileyin."
#: private/json.php:74
msgid "Unknown user"
@@ -293,116 +293,127 @@ msgstr "Web sunucunuz dosya eşitlemesine izin vermek üzere düzgün bir şekil
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."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s sizinle »%s« paylaşımında bulundu"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr "%s paylaşımı, dosya mevcut olmadığından başarısız oldu"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "%s paylaşımını yapma izniniz yok"
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "%s paylaşımı, %s öge sahibi olduğundan başarısız oldu"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "%s paylaşımı, %s kullanıcısı mevcut olmadığından başarısız oldu"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr "%s paylaşımı, %s kullanıcısının %s üyeliklerinden birine sahip olmadığından başarısız oldu"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "%s paylaşımı, %s ile zaten paylaşıldığından dolayı başarısız oldu"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "%s paylaşımı, %s grubu mevcut olmadığından başarısız oldu"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "%s paylaşımı, %s kullanıcısı %s grup üyesi olmadığından başarısız oldu"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr "Herkese açık bir bağlantı oluşturmak için bir parola belirtmeniz gerekiyor. Sadece korunmuş bağlantılara izin verilmektedir"
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "%s paylaşımı, bağlantılar ile paylaşım izin verilmediğinden başarısız oldu"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr "%s paylaşım türü %s için geçerli değil"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr "%s için izinler, izinler %s için verilen izinleri aştığından dolayı ayarlanamadı"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "%s için izinler öge bulunamadığından ayarlanamadı"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr "Paylaşma arka ucu %s OCP\\Share_Backend arayüzünü desteklemeli"
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr "Paylaşım arka ucu %s bulunamadı"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr "%s için paylaşım arka ucu bulunamadı"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr "%s paylaşımı, %s kullanıcısı özgün paylaşan kişi olduğundan başarısız oldu"
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr "%s paylaşımı, izinler %s için verilen izinleri aştığından dolayı başarısız oldu"
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr "%s paylaşımı, tekrar paylaşımın izin verilmemesinden dolayı başarısız oldu"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr "%s paylaşımı, %s için arka ucun kaynağını bulamamasından dolayı başarısız oldu"
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr "%s paylaşımı, dosyanın dosya önbelleğinde bulunamamasınndan dolayı başarısız oldu"
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "\"%s\" kategorisi bulunamadı"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index fb67c9f0683f3d2af78c04105b0d108ff1cff08c..13d46abc7087a9a742fffca733f85eb7edc1c4a2 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
-"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -51,15 +51,15 @@ msgstr "E-posta gönderildi"
msgid "You need to set your user email before being able to send test emails."
msgstr "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarlamanız gerekiyor."
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "Gönderme kipi"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Åžifreleme"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "Kimlik doğrulama yöntemi"
@@ -86,21 +86,31 @@ msgstr "Grup zaten mevcut"
#: ajax/creategroup.php:19
msgid "Unable to add group"
-msgstr "Gruba eklenemiyor"
+msgstr "Grup eklenemiyor"
#: ajax/decryptall.php:31
msgid "Files decrypted successfully"
-msgstr "Dosya şifresi başarıyla çözüldü"
+msgstr "Dosyaların şifrelemesi başarıyla kaldırıldı"
#: ajax/decryptall.php:33
msgid ""
"Couldn't decrypt your files, please check your owncloud.log or ask your "
"administrator"
-msgstr "Dosyalarınızın şifresi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin."
+msgstr "Dosyalarınızın şifrelemesi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin"
#: ajax/decryptall.php:36
msgid "Couldn't decrypt your files, check your password and try again"
-msgstr "Dosyalarınızın şifresi kaldırılamadı, parolanızı denetleyip yeniden deneyin."
+msgstr "Dosyalarınızın şifrelemesi kaldırılamadı, parolanızı denetleyip yeniden deneyin"
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr "Şifreleme anahtarları kalıcı olarak silindi"
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr "Şifreleme anahtarlarınız kalıcı olarak silinemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın"
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -118,6 +128,16 @@ msgstr "Grup silinemiyor"
msgid "Unable to delete user"
msgstr "Kullanıcı silinemiyor"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr "Yedekler başarıyla geri yüklendi"
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr "Şifreleme anahtarlarınız geri yüklenemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın"
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Dil deÄŸiÅŸtirildi"
@@ -156,7 +176,7 @@ msgstr "Kullanıcı girilmedi"
msgid ""
"Please provide an admin recovery password, otherwise all user data will be "
"lost"
-msgstr "Lütfen bir yönetici kurtarma parolası girin, aksi takdirde tüm kullanıcı verisi kaybedilecek"
+msgstr "Lütfen yönetici kurtarma parolasını girin, aksi takdirde tüm kullanıcı verisi kaybedilecek"
#: changepassword/controller.php:73
msgid ""
@@ -173,7 +193,7 @@ msgstr "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme
msgid "Unable to change password"
msgstr "Parola deÄŸiÅŸtirilemiyor"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "Gönderiliyor..."
@@ -187,11 +207,11 @@ msgstr "Yönetici Belgelendirmesi"
#: js/apps.js:67
msgid "Update to {appversion}"
-msgstr "{appversion} Güncelle"
+msgstr "{appversion} sürümüne güncelle"
#: js/apps.js:73 js/apps.js:106 js/apps.js:134
msgid "Disable"
-msgstr "Devre dışı bırak"
+msgstr "Devre Dışı Bırak"
#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
msgid "Enable"
@@ -223,39 +243,47 @@ msgstr "Hata"
#: js/apps.js:153 templates/apps.php:55
msgid "Update"
-msgstr "Güncelleme"
+msgstr "Güncelle"
#: js/apps.js:156
msgid "Updated"
msgstr "Güncellendi"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "Bir profil fotoğrafı seçin"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Çok güçsüz parola"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Güçsüz parola"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "Normal parola"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Ä°yi parola"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Güçlü parola"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
-msgstr "Dosyaların şifresi çözülüyor... Lütfen bekleyin, bu biraz zaman alabilir."
+msgstr "Dosyaların şifrelemesi kaldırılıyor... Lütfen bekleyin, bu biraz zaman alabilir."
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr "Şifreleme anahtarlarını kalıcı olarak sil."
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr "Şifreleme anahtarlarını geri yükle."
#: js/users.js:47
msgid "deleted"
@@ -269,8 +297,8 @@ msgstr "geri al"
msgid "Unable to remove user"
msgstr "Kullanıcı kaldırılamıyor"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Gruplar"
@@ -302,29 +330,29 @@ msgstr "Geçerli bir parola mutlaka sağlanmalı"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Uyarı: \"{user}\" kullanıcısı için zaten bir Ev dizini mevcut"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "Türkçe"
#: templates/admin.php:8
msgid "Everything (fatal issues, errors, warnings, info, debug)"
-msgstr "Her şey (Ölümcül konular, hatalar, uyarılar, bilgi, hata ayıklama)"
+msgstr "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)"
#: templates/admin.php:9
msgid "Info, warnings, errors and fatal issues"
-msgstr "Bilgi, uyarılar, hatalar ve ölümcül konular"
+msgstr "Bilgi, uyarılar, hatalar ve ciddi sorunlar"
#: templates/admin.php:10
msgid "Warnings, errors and fatal issues"
-msgstr "Uyarılar, hatalar ve ölümcül konular"
+msgstr "Uyarılar, hatalar ve ciddi sorunlar"
#: templates/admin.php:11
msgid "Errors and fatal issues"
-msgstr "Hatalar ve ölümcül konular"
+msgstr "Hatalar ve ciddi sorunlar"
#: templates/admin.php:12
msgid "Fatal issues only"
-msgstr "Sadece ölümcül konular"
+msgstr "Sadece ciddi sorunlar"
#: templates/admin.php:16 templates/admin.php:23
msgid "None"
@@ -359,7 +387,7 @@ msgstr "Güvenlik Uyarısı"
msgid ""
"You are accessing %s via HTTP. We strongly suggest you configure your server"
" to require using HTTPS instead."
-msgstr "%s konumuna HTTP aracılığıyla erişiyorsunuz. Sunucunuzu HTTPS kullanımını zorlaması üzere yapılandırmanızı şiddetle öneririz."
+msgstr "%s erişiminiz HTTP aracılığıyla yapılıyor. Sunucunuzu, HTTPS kullanımını zorlamak üzere yapılandırmanızı şiddetle öneririz."
#: templates/admin.php:64
msgid ""
@@ -370,7 +398,7 @@ msgid ""
"root."
msgstr "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu belge kök dizini dışına almanızı şiddetle tavsiye ederiz."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "Kurulum Uyarısı"
@@ -385,53 +413,65 @@ msgstr "Web sunucunuz dosya eşitlemesine izin vermek üzere düzgün bir şekil
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "Lütfen <a href='%s'>kurulum kılavuzlarını</a> tekrar kontrol edin."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Modül 'fileinfo' kayıp"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
-msgstr "PHP modülü 'fileinfo' kayıp. MIME-tip tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz."
+msgstr "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "PHP sürümünüz eski"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "PHP sürümünüz eski. Eski sürümlerde sorun olduğundan 5.3.8 veya daha yeni bir sürüme güncellemenizi şiddetle tavsiye ederiz. Bu kurulumun da doğru çalışmaması da olasıdır."
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
-msgstr "Locale çalışmıyor."
+msgstr "Yerel çalışmıyor"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
-msgstr "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı"
+msgstr "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı."
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "Bu, dosya adlarında belirli karakterlerde problem olabileceği anlamına gelir."
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "Şu dillerden birini desteklemesi için sisteminize gerekli paketleri kurmanızı şiddetle tavsiye ederiz: %s."
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "İnternet bağlantısı çalışmıyor"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -440,198 +480,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "Bu sunucunun çalışan bir internet bağlantısı yok. Bu, harici depolama alanı bağlama, güncelleştirme bildirimleri veya 3. parti uygulama kurma gibi bazı özellikler çalışmayacak demektir. Uzak dosyalara erişim ve e-posta ile bildirim gönderme de çalışmayacaktır. Eğer bu özelliklerin tamamını kullanmak istiyorsanız, sunucu için internet bağlantısını etkinleştirmenizi öneriyoruz."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "Son cron %s zamanında çalıştırıldı."
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "Son cron %s zamanında çalıştırıldı. Bu bir saatten daha uzun bir süre, bir şeyler yanlış gibi görünüyor."
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "Cron henüz çalıştırılmadı!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Yüklenen her sayfa ile bir görev çalıştır"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir."
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
-msgstr "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan."
+msgstr "cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan."
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Paylaşım"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Paylaşım API'sini etkinleştir"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Uygulamaların paylaşım API'sini kullanmasına izin ver"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Bağlantılara izin ver"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Kullanıcıların ögeleri paylaşması için herkese açık bağlantılara izin ver"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr "Parola korumasını zorla"
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "Herkes tarafından yüklemeye izin ver"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "Kullanıcıların, herkese açık dizinlerine, başkalarının dosya yüklemelerini etkinleştirmelerine izin ver"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "Öntanımlı son kullanma tarihini ayarla"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "Süre"
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "gün sonra dolsun"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "Son kullanma tarihini zorla"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Kullanıcıların ögeleri paylaşması için herkese açık bağlantılara izin ver"
-#: templates/admin.php:235
+#: templates/admin.php:264
msgid "Allow resharing"
-msgstr "Paylaşıma izin ver"
+msgstr "Yeniden paylaşıma izin ver"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Kullanıcıların kendileri ile paylaşılan ögeleri yeniden paylaşmasına izin ver"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
-msgstr "Kullanıcıların her şeyi paylaşmalarına izin ver"
+msgstr "Kullanıcıların herkesle paylaşmasına izin ver"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "Posta bilgilendirmesine izin ver"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "Paylaşılmış dosyalar için kullanıcıların posta bildirimi göndermesine izin ver"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr "Öntanımlı son kullanma tarihini ayarla"
-
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr "Şu süreden sonra süresi dolsun"
-
-#: templates/admin.php:266
-msgid "days"
-msgstr "gün"
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr "Son kullanma tarihini zorla"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
+msgstr "Grupları paylaşma eyleminden hariç tut"
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
-msgstr "Paylaşımların süresini öntanımlı olarak N günden sonra doldur"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Bu gruplar hala paylaşımları alabilecek, ancak başlatamayacaktır."
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Güvenlik"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "HTTPS bağlantısına zorla"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "İstemcileri %s'a şifreli bir bağlantı ile bağlanmaya zorlar."
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen %s'a HTTPS ile bağlanın."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "E-Posta Sunucusu"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "Bu, bildirimler gönderilirken kullanılır."
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "Kimden adresi"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr "posta"
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "Kimlik doÄŸrulama gerekli"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Sunucu adresi"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Port"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Kimlik Bilgileri"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "SMTP Kullanıcı Adı"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "SMTP Parolası"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "E-posta ayarlarını sına"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "E-posta gönder"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Günlük"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Günlük seviyesi"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Daha fazla"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
-msgstr "Az"
+msgstr "Daha az"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Sürüm"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -667,7 +715,7 @@ msgstr "Uygulama web sitesine bakın"
#: templates/apps.php:53
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr "<span class=\"licence\"></span>-lisanslayan <span class=\"author\"></span>"
+msgstr "<span class=\"licence\"></span> ile lisanslayan: <span class=\"author\"></span>"
#: templates/help.php:6
msgid "Administrator Documentation"
@@ -691,11 +739,11 @@ msgstr "Ticari Destek"
#: templates/personal.php:8
msgid "Get the apps to sync your files"
-msgstr "Dosyalarınızı eşitlemek için uygulamayı indirin"
+msgstr "Dosyalarınızı eşitlemek için uygulamaları indirin"
#: templates/personal.php:19
msgid "Show First Run Wizard again"
-msgstr "İlk Çalıştırma Sihirbazını yeniden göster"
+msgstr "İlk Çalıştırma Sihirbazı'nı yeniden göster"
#: templates/personal.php:27
#, php-format
@@ -708,7 +756,7 @@ msgstr "Parola"
#: templates/personal.php:39
msgid "Your password was changed"
-msgstr "Åžifreniz deÄŸiÅŸtirildi"
+msgstr "Parolanız değiştirildi"
#: templates/personal.php:40
msgid "Unable to change your password"
@@ -784,28 +832,32 @@ msgstr "Dil"
msgid "Help translate"
msgstr "Çevirilere yardım edin"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "<a href=\"%s\" target=\"_blank\">Dosyalarınıza WebDAV aracılığıyla erişmek için</a> bu adresi kullanın"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
-msgstr "Şifreleme uygulaması artık etkin değil, tüm dosyalarınızın şifrelemesini kaldırın"
+msgstr "Şifreleme uygulaması artık etkin değil, lütfen tüm dosyalarınızın şifrelemesini kaldırın"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "Oturum açma parolası"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
-msgstr "Tüm dosyaların şifresini çöz"
+msgstr "Tüm Dosyaların Şifrelemesini Kaldır"
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın şifrelemelerinin düzgün bir şekilde kaldırıldığından eminseniz kalıcı olarak silin."
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr "Şifreleme Anahtarlarını Geri Yükle"
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr "Şifreleme Anahtarlarını Sil"
#: templates/users.php:19
msgid "Login Name"
@@ -823,7 +875,7 @@ msgstr "Yönetici Kurtarma Parolası"
msgid ""
"Enter the recovery password in order to recover the users files during "
"password change"
-msgstr "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için bir kurtarma paroalsı girin"
+msgstr "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin"
#: templates/users.php:40
msgid "Default Storage"
@@ -835,7 +887,7 @@ msgstr "Lütfen disk alanı kotasını girin (örnek: \"512MB\" veya \"12GB\")"
#: templates/users.php:46 templates/users.php:146
msgid "Unlimited"
-msgstr "Limitsiz"
+msgstr "Sınırsız"
#: templates/users.php:64 templates/users.php:161
msgid "Other"
@@ -859,4 +911,4 @@ msgstr "yeni parola belirle"
#: templates/users.php:141
msgid "Default"
-msgstr "Varsayılan"
+msgstr "Öntanımlı"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 7a60a60484c5e57fdf36686ab1d2e9fc36200ce8..7bc77602431864d4c6ffcd8aa46e1209ea9e94cb 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 17:01+0000\n"
"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@ msgstr "Yapılandırma geçerli ve bağlantı kuruldu!"
msgid ""
"The configuration is valid, but the Bind failed. Please check the server "
"settings and credentials."
-msgstr "Yapılandırma geçerli fakat bağlama (bind) başarısız. Lütfen Sunucu ayarları ve kimlik bilgilerini kontrol edin."
+msgstr "Yapılandırma geçerli fakat bağlama (bind) başarısız. Lütfen sunucu ayarları ve kimlik bilgilerini kontrol edin."
#: ajax/testConfiguration.php:46
msgid ""
@@ -59,7 +59,7 @@ msgstr "Veri belirtilmemiÅŸ"
#: ajax/wizard.php:89
#, php-format
msgid " Could not set configuration %s"
-msgstr "Yapılandırma %s olarak ayarlanamadı"
+msgstr "%s yapılandırması ayarlanamadı"
#: js/settings.js:67
msgid "Deletion failed"
@@ -71,7 +71,11 @@ msgstr "Ayarlar son sunucu yapılandırmalarından devralınsın mı?"
#: js/settings.js:84
msgid "Keep settings?"
-msgstr "Ayarlar kalsın mı?"
+msgstr "Ayarlar korunsun mu?"
+
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Sunucu"
#: js/settings.js:99
msgid "Cannot add server configuration"
@@ -89,6 +93,18 @@ msgstr "Başarılı"
msgid "Error"
msgstr "Hata"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Lütfen bir Base DN belirtin"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Base DN belirlenemedi"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Lütfen bağlantı noktasını belirtin"
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr "Yapılandırma tamam"
@@ -129,35 +145,51 @@ msgstr "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz
msgid "Confirm Deletion"
msgstr "Silmeyi onayla"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s grup bulundu"
msgstr[1] "%s grup bulundu"
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s kullanıcı bulundu"
msgstr[1] "%s kullanıcı bulundu"
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr "Geçersiz Makine"
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr "İstenen özellik bulunamadı"
+#: settings.php:52
+msgid "Server"
+msgstr "Sunucu"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Kullanıcı Süzgeci"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Oturum Süzgeci"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Grup Süzgeci"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Kaydet"
#: templates/part.settingcontrols.php:4
msgid "Test Configuration"
-msgstr "Test Yapılandırması"
+msgstr "Yapılandırmayı Sına"
#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
msgid "Help"
@@ -166,7 +198,7 @@ msgstr "Yardım"
#: templates/part.wizard-groupfilter.php:4
#, php-format
msgid "Groups meeting these criteria are available in %s:"
-msgstr "Bu kriterle eşleşen gruplar %s içinde mevcut:"
+msgstr "Bu kriterlerle eşleşen gruplar %s içinde mevcut:"
#: templates/part.wizard-groupfilter.php:8
#: templates/part.wizard-userfilter.php:8
@@ -202,7 +234,7 @@ msgstr "grup bulundu"
#: templates/part.wizard-loginfilter.php:4
msgid "Users login with this attribute:"
-msgstr "Bu nitelikle oturum açan kullanıcılar:"
+msgstr "Kullanıcılar şu öznitelikle oturum açarlar:"
#: templates/part.wizard-loginfilter.php:8
msgid "LDAP Username:"
@@ -214,7 +246,7 @@ msgstr "LDAP E-posta Adresi:"
#: templates/part.wizard-loginfilter.php:24
msgid "Other Attributes:"
-msgstr "DiÄŸer Nitelikler"
+msgstr "DiÄŸer Nitelikler:"
#: templates/part.wizard-loginfilter.php:38
#, php-format
@@ -223,10 +255,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr "Oturum açma girişimi olduğunda uygulanacak filtreyi tanımlar. %%uid, oturum işleminde kullanıcı adı ile değiştirilir. Örneğin: \"uid=%%uid\""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Sunucu"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Sunucu:"
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Sunucu Yapılandırması Ekle"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Yapılandırmayı Sil"
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Sunucu"
@@ -234,7 +279,7 @@ msgstr "Sunucu"
#: templates/part.wizard-server.php:31
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr "SSL gerektirmediğiniz takdirde protokol belirtmeyebilirsiniz. Ardından ldaps:// ile başlayın"
+msgstr "SSL gerekmediği takdirde protokol belirtmeyebilirsiniz. Gerekiyorsa ldaps:// ile başlayın"
#: templates/part.wizard-server.php:36
msgid "Port"
@@ -249,7 +294,7 @@ 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 "İstemci kullanıcısının yapılacağı atamanın DN'i örn. uid=agent,dc=örnek,dc=com. Anonim erişim için DN ve Parolayı boş bırakın."
+msgstr "İstemci kullanıcısının yapılacağı atamanın DN'si. Örn. uid=agent,dc=örnek,dc=com. Anonim erişim için DN ve Parolayı boş bırakın."
#: templates/part.wizard-server.php:52
msgid "Password"
@@ -265,12 +310,12 @@ msgstr "Her satırda tek bir Base DN"
#: templates/part.wizard-server.php:61
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "Gelişmiş sekmesinde kullanıcılar ve gruplar için Base DN belirtebilirsiniz."
+msgstr "Gelişmiş sekmesinde, kullanıcılar ve gruplar için Base DN belirtebilirsiniz"
#: templates/part.wizard-userfilter.php:4
#, php-format
msgid "Limit %s access to users meeting these criteria:"
-msgstr "%s erişimini, şu kriterle eşleşen kullanıcılara sınırla:"
+msgstr "%s erişimini, şu kriterlerle eşleşen kullanıcılara sınırla:"
#: templates/part.wizard-userfilter.php:31
#, php-format
@@ -290,6 +335,14 @@ msgstr "Geri"
msgid "Continue"
msgstr "Devam et"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Uzman"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "GeliÅŸmiÅŸ"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
@@ -305,7 +358,7 @@ msgstr "<b>Uyarı:</b> PHP LDAP modülü kurulu değil, arka uç çalışmayacak
#: templates/settings.php:20
msgid "Connection Settings"
-msgstr "Bağlantı ayarları"
+msgstr "Bağlantı Ayarları"
#: templates/settings.php:22
msgid "Configuration Active"
@@ -331,11 +384,11 @@ msgstr "Yedek (Replica) Bağlantı Noktası"
#: templates/settings.php:25
msgid "Disable Main Server"
-msgstr "Ana sunucuyu devredışı birak"
+msgstr "Ana Sunucuyu Devre Dışı Bırak"
#: templates/settings.php:25
msgid "Only connect to the replica server."
-msgstr "Sadece kopya sunucuya baÄŸlan."
+msgstr "Sadece yedek sunucuya baÄŸlan."
#: templates/settings.php:26
msgid "Case insensitive LDAP server (Windows)"
@@ -378,7 +431,7 @@ msgstr "Temel Kullanıcı Ağacı"
#: templates/settings.php:33
msgid "One User Base DN per line"
-msgstr "Her satırda Tek Kullanıcı Base DN'i"
+msgstr "Her satırda Tek Kullanıcı Base DN'si"
#: templates/settings.php:34
msgid "User Search Attributes"
@@ -402,7 +455,7 @@ msgstr "Temel Grup Ağacı"
#: templates/settings.php:36
msgid "One Group Base DN per line"
-msgstr "Her satırda Tek Grup Base DN'i"
+msgstr "Her satırda Tek Grup Base DN'si"
#: templates/settings.php:37
msgid "Group Search Attributes"
@@ -414,7 +467,7 @@ msgstr "Grup-Ãœye iÅŸbirliÄŸi"
#: templates/settings.php:39
msgid "Nested Groups"
-msgstr "İç içe Gruplar"
+msgstr "İç İçe Gruplar"
#: templates/settings.php:39
msgid ""
@@ -461,7 +514,7 @@ msgstr "Kullanıcı Ana Dizini İsimlendirme Kuralı"
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
-msgstr "Kullanıcı adı bölümünü boş bırakın (varsayılan). "
+msgstr "Kullanıcı adı bölümünü boş bırakın (öntanımlı). Aksi halde bir LDAP/AD özniteliği belirtin."
#: templates/settings.php:53
msgid "Internal Username"
@@ -481,7 +534,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 "Öntanımlı olarak UUID niteliğinden dahili bir kullanıcı adı oluşturulacak. Bu, kullanıcı adının benzersiz ve karakterlerinin dönüştürme gereksinimini ortadan kaldırır. Dahili kullanıcı adı, sadece bu karakterlerin izin verildiği kısıtlamaya sahip: [ a-zA-Z0-9_.@- ]. Diğer karakterler ise ASCII karşılıkları ile yer değiştirilir veya basitçe yoksayılır. Çakışmalar olduğunda ise bir numara eklenir veya arttırılır. Dahili kullanıcı adı, bir kullanıcıyı dahili olarak tanımlamak için kullanılır. Ayrıca kullanıcı ev klasörü için öntanımlı bir isimdir. Bu ayrıca uzak adreslerin (örneğin tüm *DAV hizmetleri) bir parçasıdır. Bu yar ise, öntanımlı davranışın üzerine yazılabilir. ownCloud 5'ten önce benzer davranışı yapabilmek için aşağıdaki alana bir kullanıcı görünen adı niteliği girin. Öntanımlı davranış için boş bırakın. Değişiklikler, sadece yeni eşleştirilen (eklenen) LDAP kullanıcılarında etkili olacaktır."
+msgstr "Öntanımlı olarak UUID niteliğinden dahili bir kullanıcı adı oluşturulacak. Bu, kullanıcı adının benzersiz ve karakterlerinin dönüştürme gereksinimini ortadan kaldırır. Dahili kullanıcı adı, sadece bu karakterlerin izin verildiği kısıtlamaya sahip: [ a-zA-Z0-9_.@- ]. Diğer karakterler ise ASCII karşılıkları ile yer değiştirilir veya basitçe yoksayılır. Çakışmalar olduğunda ise bir numara eklenir veya arttırılır. Dahili kullanıcı adı, bir kullanıcıyı dahili olarak tanımlamak için kullanılır. Ayrıca kullanıcı ev klasörü için öntanımlı bir isimdir. Bu ayrıca uzak adreslerin (örneğin tüm *DAV hizmetleri) bir parçasıdır. Bu ayar ise, öntanımlı davranışın üzerine yazılabilir. ownCloud 5'ten önce benzer davranışı yapabilmek için aşağıdaki alana bir kullanıcı görünen adı niteliği girin. Öntanımlı davranış için boş bırakın. Değişiklikler, sadece yeni eşleştirilen (eklenen) LDAP kullanıcılarında etkili olacaktır."
#: templates/settings.php:55
msgid "Internal Username Attribute:"
@@ -534,4 +587,4 @@ msgstr "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirmesini Temizle"
#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
-msgstr "Grup Adı-LDAP Grubu Eşleştirme"
+msgstr "Grup Adı-LDAP Grubu Eşleştirmesini Temizle"
diff --git a/l10n/tr/user_webdavauth.po b/l10n/tr/user_webdavauth.po
index 0844a027bc5490ed172b381c4f300f5e77578f7b..0b0b8ab3f0b06af1de7483d319a5aaea63ea6b7c 100644
--- a/l10n/tr/user_webdavauth.po
+++ b/l10n/tr/user_webdavauth.po
@@ -6,14 +6,14 @@
# alpere <info@beyboo.de>, 2012
# Necdet Yücel <necdetyucel@gmail.com>, 2012
# atakan96 <tayancatakan@gmail.com>, 2013
-# volkangezer <volkangezer@gmail.com>, 2013
+# volkangezer <volkangezer@gmail.com>, 2013-2014
# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 16:30+0000\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-25 21:40+0000\n"
"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -22,15 +22,15 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: templates/settings.php:3
+#: templates/settings.php:2
msgid "WebDAV Authentication"
-msgstr "WebDAV Kimlik doğrulaması"
+msgstr "WebDAV Kimlik Doğrulaması"
-#: templates/settings.php:4
+#: templates/settings.php:3
msgid "Address: "
-msgstr "Adres:"
+msgstr "WebDAV Kimlik Doğrulaması"
-#: templates/settings.php:7
+#: templates/settings.php:6
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 "
diff --git a/l10n/tzm/core.po b/l10n/tzm/core.po
index 30ead15ba097293cfae43b309cf21a14dd945f3d..bfe78eee7663c36b0b20a83273389cb2315bea43 100644
--- a/l10n/tzm/core.po
+++ b/l10n/tzm/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: tzm\n"
"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/tzm/files.po b/l10n/tzm/files.po
index 49b5b1aca1edb33038ee5ecac5f277f056d0e353..6d724a44da09af8ed62c23a9488260003beacd94 100644
--- a/l10n/tzm/files.po
+++ b/l10n/tzm/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/tzm/files_encryption.po b/l10n/tzm/files_encryption.po
index 405617354701d77fa4a663d4b952928ceaf7e171..ca51ee1060ec7e9259401bc1d816dea20f360b98 100644
--- a/l10n/tzm/files_encryption.po
+++ b/l10n/tzm/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/tzm/files_external.po b/l10n/tzm/files_external.po
index 01f97d8ef85b2bb8c9e22fd9cd947ea47c74b2ae..69401b2381c986775f43cdcf91ec2ba86e41b6e3 100644
--- a/l10n/tzm/files_external.po
+++ b/l10n/tzm/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/tzm/files_sharing.po b/l10n/tzm/files_sharing.po
index 77b8970bc25a977c7638119625c8ea7a2e0121f6..4c88071ee15dbc51b7a32abf17c4a6e886223030 100644
--- a/l10n/tzm/files_sharing.po
+++ b/l10n/tzm/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: tzm\n"
"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/tzm/files_trashbin.po b/l10n/tzm/files_trashbin.po
index a872160a5b1d56a02297955e1d2b0ce2ae948361..aaaf221f705f3eebb1b3d36720ef3f3456dcd490 100644
--- a/l10n/tzm/files_trashbin.po
+++ b/l10n/tzm/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/tzm/lib.po b/l10n/tzm/lib.po
index 39d3e9159e5865a5da73f9aef0402f7b8f0422cd..7a8891c21bc778f1f9a4c7ae488b512319794e2b 100644
--- a/l10n/tzm/lib.po
+++ b/l10n/tzm/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: tzm\n"
"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/tzm/settings.po b/l10n/tzm/settings.po
index 5b93005287736d06f6ebf7107629eaa65fa69652..21e27eee2e2ec1231e799609e3b59e61ede6ba7d 100644
--- a/l10n/tzm/settings.po
+++ b/l10n/tzm/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/tzm/user_ldap.po b/l10n/tzm/user_ldap.po
index 3a134d5e9737c7c5c18368de90edcbe95387f764..07ba04ca2f6cd36f924de28b6aafa4f6837d69a0 100644
--- a/l10n/tzm/user_ldap.po
+++ b/l10n/tzm/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index b29af2437cb90562b8dc08ee886f44f35fe0ca32..9f57af284aa340eee1c998caf87c4aff901e6b9a 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ug\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,202 +63,202 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "يەكشەنبە"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "دۈشەنبە"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "سەيشەنبە"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "چارشەنبە"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "پەيشەنبە"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "جۈمە"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "شەنبە"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "قەھرىتان"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "ھۇت"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "نەۋرۇز"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "ئۇمۇت"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "باھار"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "سەپەر"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "چىللە"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "تومۇز"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "مىزان"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "ئوغۇز"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "ئوغلاق"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "ÙƒÛ†Ù†Û•Ùƒ"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "تەÚشەكلەر"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "ساقلاۋاتىدۇ…"
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "بۈگۈن"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "تۈنۈگۈن"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "ھەئە"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "ياق"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "جەزملە"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "ۋاز كەچ"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,140 +290,149 @@ msgstr ""
msgid "Share"
msgstr "ھەمبەھىر"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "خاتالىق"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "ئىم"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "يوللا"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "گۇرۇپپا"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "ھەمبەھىرلىمە"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "ئۆچۈر"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "ھەمبەھىر"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "ئاگاھلاندۇرۇش"
@@ -450,18 +464,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -662,6 +677,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "ئىم"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -787,7 +806,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index 0161a25e81491eaa2ad5ae9f73aa72e61a6ba9fd..cbe6fa897a4c04d74c7365bf84d10cf8bef4bfaf 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr "%s يۆتكىيەلمەيدۇ"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr "ۋاقىتلىق قىسقۇچ كەم."
msgid "Failed to write to disk"
msgstr "دىسكىغا يازالمىدى"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "ÙŠÛتەرلىك ساقلاش بوشلۇقى يوق"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "ھۆججەتلەر"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "يۈكلەشتىن ۋاز كەچتى."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,117 +177,117 @@ msgstr "ھۆججەت يۈكلەش مەشغۇلاتى ئÛلىپ بÛرىلىۋا
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} مەۋجۇت"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "ھەمبەھىر"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Ù…Û•ÚÚ¯ÛˆÙ„ÛˆÙƒ ئۆچۈر"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "ئات ئۆزگەرت"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "كۈتۈۋاتىدۇ"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "خاتالىق"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "ئاتى"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Ú†ÙˆÚلۇقى"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "ئۆزگەرتكەن"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -293,12 +297,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -335,68 +339,75 @@ msgstr ""
msgid "Save"
msgstr "ساقلا"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "ÙŠÛÚÙ‰"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "تÛكىست ھۆججەت"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "ÙŠÛÚÙ‰ قىسقۇچ"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "قىسقۇچ"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "ئۆچۈرۈلگەن ھۆججەتلەر"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "يۈكلەشتىن ۋاز كەچ"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "بۇ جايدا Ú¾ÛÚ†Ù†ÛÙ…Û• يوق. Upload something!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "چۈشۈر"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "ئۆچۈر"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "يۈكلەندىغىنى بەك Ú†ÙˆÚ"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/ug/files_encryption.po b/l10n/ug/files_encryption.po
index c781d1dd9feee0e6375a2cb83a7d120e70dd1e78..ad014580c60bd883b3a91292b171d41288ba3e36 100644
--- a/l10n/ug/files_encryption.po
+++ b/l10n/ug/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "شىÙىرلاش"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ug/files_external.po b/l10n/ug/files_external.po
index c0088640273fc4c1a30020801b8492fc17a3aebd..0dbaea20caf78bba4045d72f7ca9a53cb2be4567 100644
--- a/l10n/ug/files_external.po
+++ b/l10n/ug/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -82,9 +82,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "باش ئاپپارات"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po
index 8ba9c5f68fc720acfc6a06aeb6a74c3d08d344a6..5f66c89ded599214bcc28fc7ef6c68a40dc650bd 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: ug\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -34,6 +58,14 @@ msgstr ""
msgid "Password"
msgstr "ئىم"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -62,11 +94,11 @@ msgstr ""
msgid "Download"
msgstr "چۈشۈر"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/ug/files_trashbin.po b/l10n/ug/files_trashbin.po
index 31b2c70a5b8bfc951b20d9f0badfc117d248e780..c88e107c29be9b6ce467956dee00f840628a9c78 100644
--- a/l10n/ug/files_trashbin.po
+++ b/l10n/ug/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "ئۆچۈرۈلگەن ھۆججەتلەر"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "خاتالىق"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "بۇ جايدا Ú¾ÛÚ†Ù†ÛÙ…Û• يوق. Your trash bin is empty!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "ئاتى"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "ئۆچۈرۈلدى"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "ئۆچۈر"
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index a5ab719396bbc37b9daa60899b4b1c28e8b15441..1fb2ac4c9fca2a9d40437556ed98392a003194f0 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ug\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ø³Ù‰Ø²Ù†Ù‰Ú ØªÙˆØ± مۇلازىمÛتىرىÚىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەÚشەلمەپتۇ، چۈنكى WebDAV Ù†Ù‰Ú Ø¦Ûغىزى بۇزۇلغاندەك تۇرىدۇ."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index 3bbdfffec800fc8de8dd872a7d855c6db7f9b098..32e4f324aa3b3bb7ea1e402aac65391b1987a4ff 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "شىÙىرلاش"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -99,6 +99,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "تورخەت ساقلاندى"
@@ -115,6 +125,16 @@ msgstr "گۇرۇپپىنى ئۆچۈرەلمىدى"
msgid "Unable to delete user"
msgstr "ئىشلەتكۈچىنى ئۆچۈرەلمىدى"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "تىل ئۆزگەردى"
@@ -170,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -226,34 +246,42 @@ msgstr "ÙŠÛÚىلا"
msgid "Updated"
msgstr "ÙŠÛÚىلاندى"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "ئۆچۈرۈلگەن"
@@ -266,8 +294,8 @@ msgstr "ÙŠÛنىۋال"
msgid "Unable to remove user"
msgstr "ئىشلەتكۈچىنى چىقىرىۋÛتەلمەيدۇ"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "گۇرۇپپا"
@@ -299,7 +327,7 @@ msgstr "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش ÙƒÛرەك"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "ئۇيغۇرچە"
@@ -367,7 +395,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "ئاگاھلاندۇرۇش تەÚØ´Û•Ùƒ"
@@ -382,53 +410,65 @@ msgstr "Ø³Ù‰Ø²Ù†Ù‰Ú ØªÙˆØ± مۇلازىمÛتىرىÚىز ھۆججەت قەدە
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان"
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -437,198 +477,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "ھەمبەھىر"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "بىخەتەرلىك"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "مۇلازىمÛتىر ئادرىسى"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "ئÛغىز"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "خاتىرە"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "خاتىرە دەرىجىسى"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "تÛخىمۇ ÙƒÛ†Ù¾"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "ئاز"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "نەشرى"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +829,33 @@ msgstr "تىل"
msgid "Help translate"
msgstr "تەرجىمىگە ياردەم"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr ""
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr ""
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "تىزىمغا كىرىش ئاتى"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index f818facabb84822798aed461a81903468c2b4f14..5a93300e23615a48d3c3f33d5f86b72fb4602b51 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "خاتالىق"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,26 +142,42 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "گۇرۇپپا سۈزگۈچ"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "ساقلا"
@@ -218,10 +250,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "باش ئاپپارات"
@@ -285,6 +330,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "ئالىي"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 438ccebc017e68f3dca5f1c32f7560c6ed3f9529..fcb61a5bc77dc36a12abfc95be56c84e37a22377 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
-"Last-Translator: azdk94 <azdk94@gmail.com>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -19,11 +19,11 @@ msgstr ""
"Language: uk\n"
"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);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "Термін дії минув."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Ðеможливо надіÑлати пошту наÑтупним кориÑтувачам: %s "
@@ -40,6 +40,11 @@ msgstr "Вимкнено захищений режим"
msgid "Updated database"
msgstr "Базу даних оновлено"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Ðемає наданого Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð°Ð±Ð¾ файлу"
@@ -60,212 +65,212 @@ msgstr "Ðемає доÑтупного тимчаÑового профілю д
msgid "No crop data provided"
msgstr "Ðемає інформації щодо обрізки даних"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "ÐеділÑ"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Понеділок"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Вівторок"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Середа"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Четвер"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "П'ÑтницÑ"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Субота"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Січень"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Лютий"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Березень"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Квітень"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Травень"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Червень"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Липень"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Серпень"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "ВереÑень"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Жовтень"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "ЛиÑтопад"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Грудень"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "ÐалаштуваннÑ"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Зберігаю..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "Ñекунди тому"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n хвилину тому"
msgstr[1] "%n хвилини тому"
msgstr[2] "%n хвилин тому"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n годину тому"
msgstr[1] "%n години тому"
msgstr[2] "%n годин тому"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "Ñьогодні"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "вчора"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n день тому"
msgstr[1] "%n дні тому"
msgstr[2] "%n днів тому"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "минулого міÑÑцÑ"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n міÑÑць тому"
msgstr[1] "%n міÑÑці тому"
msgstr[2] "%n міÑÑців тому"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "минулого року"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "роки тому"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Обрати"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Помилка при завантаженні шаблону вибору: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Так"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "ÐÑ–"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Обрати"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Помилка при завантаженні шаблону вибору: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Помилка при завантаженні шаблону повідомленнÑ: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} файловий конфлікт"
msgstr[1] "{count} файлових конфліктів"
msgstr[2] "{count} файлових конфліктів"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Один файловий конфлікт"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "Ðових Файлів"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Які файли ви хочете залишити?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Якщо ви оберете обидві верÑÑ–Ñ—, Ñкопійований файл буде мати номер, доданий у його ім'Ñ."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Відмінити"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Продовжити"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(вÑе вибрано)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} вибрано)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Помилка при завантаженні файлу Ñ–Ñнуючого шаблону"
@@ -297,140 +302,149 @@ msgstr "Опубліковано"
msgid "Share"
msgstr "ПоділитиÑÑ"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Помилка"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Помилка під Ñ‡Ð°Ñ Ð¿ÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ—"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Помилка під Ñ‡Ð°Ñ Ð²Ñ–Ð´Ð¼Ñ–Ð½Ð¸ публікації"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Помилка при зміні повноважень"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr " {owner} опублікував Ð´Ð»Ñ Ð’Ð°Ñ Ñ‚Ð° Ð´Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¸ {group}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "{owner} опублікував Ð´Ð»Ñ Ð’Ð°Ñ"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "ПоділитиÑÑ Ð· кориÑтувачем або групою ..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Опублікувати поÑиланнÑ"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "ЗахиÑтити паролем"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Пароль"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Дозволити Публічне ЗавантаженнÑ"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Ел. пошта належить Пану"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "ÐадіÑлати"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Ð’Ñтановити термін дії"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Термін дії"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Опублікувати через Ел. пошту:"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Жодної людини не знайдено"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "група"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Пере-Ð¿ÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ Ð½Ðµ дозволÑєтьÑÑ"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Опубліковано {item} Ð´Ð»Ñ {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "Закрити доÑтуп"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "повідомити по Email"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "може редагувати"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "контроль доÑтупу"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "Ñтворити"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "оновити"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "видалити"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "опублікувати"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Захищено паролем"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Помилка при відміні терміна дії"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Помилка при вÑтановленні терміна дії"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "ÐадÑиланнÑ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Ел. пошта надіÑлана"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "ПопередженнÑ"
@@ -462,18 +476,19 @@ msgstr "Помилка при завантаженні шаблону діало
msgid "No tags selected for deletion."
msgstr "Жодних тегів не обрано Ð´Ð»Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ."
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð»Ð¾ÑÑŒ неуÑпішно. Будь лаÑка, повідомте про цю проблему в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Ñпільноті ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð»Ð¾ÑÑŒ уÑпішно. ПеренаправлÑємо Ð²Ð°Ñ Ð½Ð° ownCloud."
@@ -674,6 +689,10 @@ msgstr "Ð”Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ—, Ñк правильно
msgid "Create an <strong>admin account</strong>"
msgstr "Створити <strong>обліковий Ð·Ð°Ð¿Ð¸Ñ Ð°Ð´Ð¼Ñ–Ð½Ñ–Ñтратора</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Пароль"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -799,8 +818,27 @@ msgstr "ДÑкуємо за ваше терпіннÑ."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ownCloud до верÑÑ–Ñ— %s, це може зайнÑти деÑкий чаÑ."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 8a8db636db3f5787ad93ba305f78a17835a752c9..9534f960b621fc7b2382acd2caf74a63fd95b4f0 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr "Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñтити %s - Файл з таким
msgid "Could not move %s"
msgstr "Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñтити %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr " Ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ не може бути порожнім."
@@ -37,18 +37,18 @@ msgstr " Ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ не може бути порожнім."
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Ðевірне ім'Ñ, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -124,44 +124,48 @@ msgstr "ВідÑутній тимчаÑовий каталог"
msgid "Failed to write to disk"
msgstr "ÐевдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати на диÑк"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "МіÑÑ†Ñ Ð±Ñ–Ð»ÑŒÑˆÐµ немає"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Ðевірний каталог."
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Файли"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÑ€Ð²Ð°Ð½Ð¾."
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -174,123 +178,123 @@ msgstr "ВиконуєтьÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ. Закрит
msgid "URL cannot be empty"
msgstr "URL не може бути порожнім"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} вже Ñ–Ñнує"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Ðе вдалоÑÑ Ñтворити файл"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Ðе вдалоÑÑ Ñтворити теку"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "ПоділитиÑÑ"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Видалити назавжди"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Перейменувати"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Ваше Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð³Ð¾Ñ‚ÑƒÑ”Ñ‚ÑŒÑÑ. Це може зайнÑти деÑкий чаÑ, Ñкщо файли завеликі."
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "ОчікуваннÑ"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Помилка Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Помилка"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Ðеможливо перейменувати файл"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Ім'Ñ"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "Розмір"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Змінено"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n тека"
msgstr[1] "%n тека"
msgstr[2] "%n теки"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n файл"
msgstr[1] "%n файлів"
msgstr[2] "%n файли"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "Ваше Ñховище переповнене, файли більше не можуть бути оновлені або Ñинхронізовані !"
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ваше Ñховище майже повне ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -300,12 +304,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s не може бути перейменований"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -342,68 +346,75 @@ msgstr "МакÑимальний розмір завантажуємого ZIP
msgid "Save"
msgstr "Зберегти"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "Створити"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "ТекÑтовий файл"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Ðова тека"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Тека"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "З поÑиланнÑ"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "Видалено файлів"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Перервати завантаженнÑ"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "Тут нічого немає. Відвантажте що-небудь!"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "Завантажити"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Видалити"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Файл занадто великий"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Файли,що ви намагаєтеÑÑŒ відвантажити перевищують макÑимальний дозволений розмір файлів на цьому Ñервері."
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Файли ÑкануютьÑÑ, зачекайте, будь-лаÑка."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Поточне ÑкануваннÑ"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index 0df9952e26d7961da594834705f5204866f8bc71..94427439a3e1482111aeb6c9ba389b6f254d287a 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# zubr139 <zubr139@ukr.net>, 2013
+# zubr139, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -92,7 +92,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -112,91 +112,91 @@ msgstr ""
msgid "personal settings"
msgstr "оÑобиÑÑ‚Ñ– налаштуваннÑ"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "ШифруваннÑ"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Змінити Пароль"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index 2632a66d4bd0edb60654964d6aecb6a41c1922a9..e4b7f894b251ed7c472dfa032c4f2512ca27b031 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "ХоÑÑ‚"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,6 +166,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -198,29 +202,29 @@ msgstr "Помилка при налаштуванні Ñховища Google Dri
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index 2599a0ff2f30996535f10431accea1caa22c267e..f253602490e6c0933ac4c98ddb2211d7be45cbc9 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: uk\n"
"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);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Опублікував {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "Цей реÑÑƒÑ€Ñ Ð¾Ð±Ð¼Ñ–Ð½Ñƒ захищений паролем"
@@ -34,6 +58,14 @@ msgstr "Ðевірний пароль. Спробуйте ще раз."
msgid "Password"
msgstr "Пароль"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "Ðа жаль, поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð±Ñ–Ð»ÑŒÑˆÐµ не працює."
@@ -62,11 +94,11 @@ msgstr "Ð”Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— інформації, б
msgid "Download"
msgstr "Завантажити"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "ПрÑме поÑиланнÑ"
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index 8c04df52af4b4ee3dd5a88e3a014a22c0178f56e..eeb769ee30831d49171ccdc7dc13b0ab3808b9e9 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "Ðеможливо видалити %s назавжди"
msgid "Couldn't restore %s"
msgstr "Ðеможливо відновити %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "Видалено файлів"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Відновити"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Помилка"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "Видалено Файлів"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "відновлено"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Ðічого немає. Ваший кошик Ð´Ð»Ñ ÑÐ¼Ñ–Ñ‚Ñ‚Ñ Ð¿ÑƒÑтий!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Ім'Ñ"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Відновити"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Видалено"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Видалити"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index 3ec9d069e548fee98c771dab5d2dac5261a9a526..8b5cd953c9c1f8e141859a8bbd6d545e46e21e3d 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: uk\n"
"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);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr "Ðевірне зображеннÑ"
msgid "web services under your control"
msgstr "підконтрольні Вам веб-ÑервіÑи"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Файли повинні бути завантаженні поÑлідовно."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "ПовернутиÑÑ Ð´Ð¾ файлів"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Вибрані фали завеликі Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ zip файлу."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr "Ð’Ñтановіть ім'Ñ Ð°Ð´Ð¼Ñ–Ð½Ñ–Ñтратора."
msgid "Set an admin password."
msgstr "Ð’Ñтановіть пароль адмініÑтратора."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ваш Web-Ñервер ще не налаштований належним чином Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб дозволити Ñинхронізацію файлів, через те що Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ WebDAV, здаєтьÑÑ, зламаний."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Будь лаÑка, перевірте <a href='%s'>інÑтрукції по вÑтановленню</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s розподілено »%s« з тобою"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ категорію \"%s\""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 3a29ee985c1f881f1ee8f062d16cb4bb04e6ace5..3b631d97e1a4c0d32fc4fc5e0f82f4749012f457 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "Ел. пошта надіÑлана"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "ШифруваннÑ"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -99,6 +99,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "ÐдреÑу збережено"
@@ -115,6 +125,16 @@ msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ групу"
msgid "Unable to delete user"
msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ кориÑтувача"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Мова змінена"
@@ -170,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -226,34 +246,42 @@ msgstr "Оновити"
msgid "Updated"
msgstr "Оновлено"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "Дуже Ñлабкий пароль"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "Слабкий пароль"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "Добрий пароль"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "Ðадійний пароль"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "видалені"
@@ -266,8 +294,8 @@ msgstr "відмінити"
msgid "Unable to remove user"
msgstr "Ðеможливо видалити кориÑтувача"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Групи"
@@ -299,7 +327,7 @@ msgstr "Потрібно задати вірний пароль"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__language_name__"
@@ -367,7 +395,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸ Ðалаштуванні"
@@ -382,53 +410,65 @@ msgstr "Ваш Web-Ñервер ще не налаштований належн
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "Модуль 'fileinfo' відÑутній"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "PHP модуль 'fileinfo' відÑутній. Ми наполегливо рекомендуємо увімкнути цей модуль, щоб отримати кращі результати при виÑвленні MIME-типів."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "Ð›Ð¾ÐºÐ°Ð»Ñ–Ð·Ð°Ñ†Ñ–Ñ Ð½Ðµ працює"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "Інтернет-з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½Ðµ працює"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -437,198 +477,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Виконати одне Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÐºÐ¾Ð¶Ð½Ð¾Ñ— завантаженої Ñторінки "
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Спільний доÑтуп"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Увімкнути API Ñпільного доÑтупу"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Дозволити програмам викориÑтовувати API Ñпільного доÑтупу"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Дозволити поÑиланнÑ"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Дозволити кориÑтувачам відкривати Ñпільний доÑтуп до елементів за допомогою поÑилань"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Дозволити кориÑтувачам відкривати Ñпільний доÑтуп до елементів за допомогою поÑилань"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Дозволити перевідкривати Ñпільний доÑтуп"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Дозволити кориÑтувачам знову відкривати Ñпільний доÑтуп до елементів, Ñкі вже відкриті Ð´Ð»Ñ Ð´Ð¾Ñтупу"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Дозволити кориÑтувачам відкривати Ñпільний доÑтуп Ð´Ð»Ñ Ð²ÑÑ–Ñ…"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Дозволити кориÑтувачам відкривати Ñпільний доÑтуп лише Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸Ñтувачів з їхньої групи"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "Безпека"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "ПримуÑове заÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "ÐдреÑа Ñервера"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Порт"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Облікові дані"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Протокол"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "Рівень протоколюваннÑ"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "Більше"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Менше"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "ВерÑÑ–Ñ"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +829,33 @@ msgstr "Мова"
msgid "Help translate"
msgstr "Допомогти з перекладом"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr ""
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr ""
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Ім'Ñ Ð›Ð¾Ð³Ñ–Ð½Ñƒ"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index e31b3db44daaeaf06035bf5f2d59fa55bb171443..82a0a6776b69c4f58e475c62379213535551728d 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr "ЗаÑтоÑувати Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð· оÑтанньої
msgid "Keep settings?"
msgstr "Зберегти Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ?"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "Ðеможливо додати конфігурацію Ñервера"
@@ -86,6 +90,18 @@ msgstr "УÑпіх"
msgid "Error"
msgstr "Помилка"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,7 +142,7 @@ msgstr "Ви дійÑно бажаєте видалити поточну кон
msgid "Confirm Deletion"
msgstr "Підтвердіть ВидаленнÑ"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -134,7 +150,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -142,14 +158,30 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Фільтр Груп"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "Зберегти"
@@ -222,10 +254,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "Додати Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¡ÐµÑ€Ð²ÐµÑ€Ð°"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "ХоÑÑ‚"
@@ -289,6 +334,14 @@ msgstr "Ðазад"
msgid "Continue"
msgstr "Продовжити"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Додатково"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ur/core.po b/l10n/ur/core.po
index 7324073f7732c5768176e7cb31d3b38d29d23456..e7b1290257489a0006cb7f70b873ff5ec910a21a 100644
--- a/l10n/ur/core.po
+++ b/l10n/ur/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ur\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,207 +63,207 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -290,140 +295,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -455,18 +469,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -667,6 +682,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -792,7 +811,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/ur/files.po b/l10n/ur/files.po
index a041066213a0e7c9d0c0ef268766e40f5b455662..e444fdc157def325b11247be85d7b10a61d92fd2 100644
--- a/l10n/ur/files.po
+++ b/l10n/ur/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -338,68 +342,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/ur/files_encryption.po b/l10n/ur/files_encryption.po
index f8e7504486bf04e0fb327b81c2479ef13400eba1..99bceb54362dce1df3953cdcfbf0a7e11ada2663 100644
--- a/l10n/ur/files_encryption.po
+++ b/l10n/ur/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ur/files_external.po b/l10n/ur/files_external.po
index ce1b8346767568b8c77e8c104f489c505f8f74ce..04178fa6c1abec5d0a55d45f0523f0b7092d90f7 100644
--- a/l10n/ur/files_external.po
+++ b/l10n/ur/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ur/files_sharing.po b/l10n/ur/files_sharing.po
index 2d8c2829a06beb6475f6ab64150770f43189692d..3ac187a15a695f17ed88e2e3990304c426e1c150 100644
--- a/l10n/ur/files_sharing.po
+++ b/l10n/ur/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: ur\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/ur/files_trashbin.po b/l10n/ur/files_trashbin.po
index 01c3eab2d42e86b4c6bca83246d1604ef253cd45..be56090b43fc1b7a61366e001e4845ed70ebb890 100644
--- a/l10n/ur/files_trashbin.po
+++ b/l10n/ur/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/ur/lib.po b/l10n/ur/lib.po
index 299690f1580594791ca2b71194a7a4fbb3084281..3c0090653be38786588e58444eb482b759985239 100644
--- a/l10n/ur/lib.po
+++ b/l10n/ur/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ur\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/ur/settings.po b/l10n/ur/settings.po
index 56b4ba0d041f5b941f681f185c49e6edf9df06fe..0079b16fcf668d0b1f0705b3f956774c4393690b 100644
--- a/l10n/ur/settings.po
+++ b/l10n/ur/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/ur/user_ldap.po b/l10n/ur/user_ldap.po
index 1483a29d7a1c45365d03003e08a02e1cfddd01e1..6ef05a32f04ef15097a23da618368a0bdb592ed1 100644
--- a/l10n/ur/user_ldap.po
+++ b/l10n/ur/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index 2303d335124a32fa27dd921a5cd17f1cd2da04b0..c5da982cc683d5b1c4d0007bb7362495a9d87dc9 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# leostandards100 <mrshah_300@yahoo.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -17,38 +18,43 @@ msgstr ""
"Language: ur_PK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
-msgstr ""
+msgstr "ختم Ûونے Ú©ÛŒ تاریخ ماضی میں ÛÛ’."
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
#: ajax/update.php:10
msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "بØالی موڈ چالو ÛÛ’"
#: ajax/update.php:13
msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "بØالی موڈ بند ÛÛ’"
#: ajax/update.php:16
msgid "Updated database"
+msgstr "اپ ڈیٹ Ûوئ ڈیٹا بیس"
+
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
msgstr ""
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "کوئی تصویر یا Ùائل ÙراÛÙ… Ù†Ûیں"
#: avatar/controller.php:81
msgid "Unknown filetype"
-msgstr ""
+msgstr "غیر معررو٠قسم Ú©ÛŒ Ùائل"
#: avatar/controller.php:85
msgid "Invalid image"
-msgstr ""
+msgstr "غلط تصویر"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
@@ -56,388 +62,397 @@ msgstr ""
#: avatar/controller.php:135
msgid "No crop data provided"
-msgstr ""
+msgstr "کوئی کروپ ڈیٹا ميسر Ù†Ûیں "
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
-msgstr ""
+msgstr "اتوار"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
-msgstr ""
+msgstr "سوموار"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
-msgstr ""
+msgstr "منگل"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
-msgstr ""
+msgstr "بدھ"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
-msgstr ""
+msgstr "جمعرات"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
-msgstr ""
+msgstr "جمعÛ"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
-msgstr ""
+msgstr "ÛÙتÛ"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "جنوری"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Ùرورئ"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "مارچ"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "اپریل"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "مئی"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "جون"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "جولائی"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "اگست"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "ستمبر"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "اکتوبر"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "نومبر"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "دسمبر"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
-msgstr "سیٹینگز"
+msgstr "ترتیبات"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
-msgstr ""
+msgstr "Ù…ØÙوظ Ú¾Ùˆ رÛا ÛÛ’ ..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
-msgstr ""
+msgstr "سیکنڈز Ù¾ÛÙ„Û’"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n منٹس Ù¾ÛÙ„Û’"
+msgstr[1] "%n منٹس Ù¾ÛÙ„Û’"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
-msgstr ""
+msgstr "آج"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
-msgstr ""
+msgstr "Ú©Ù„"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
-msgstr ""
+msgstr "Ù¾Ú†Ú¾Ù„Û’ Ù…Ûنیے"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
msgstr[1] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
-msgstr ""
+msgstr "پچھلے سال"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
-msgstr ""
+msgstr "سالوں Ù¾ÛÙ„Û’"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "منتخب کریں"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Ûاں"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Ù†Ûیں"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "منتخب کریں"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "اوکے"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{گنتی} Ùائل متصادم "
+msgstr[1] "{گنتی} Ùائل متصادم "
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
-msgstr ""
+msgstr "اایک Ùائل متصادم ÛÛ’"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
-msgstr ""
+msgstr "جدید Ùائلیں"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
-msgstr ""
+msgstr "Ù¾ÛÙ„Û’ سے موجودجدید Ùائلیں"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
-msgstr ""
+msgstr "آپ کون سی Ùائلیں رکھنا چاÛتے Ûیں ØŸ"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "منسوخ کریں"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
-msgstr ""
+msgstr "جاری"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
-msgstr ""
+msgstr "(سب منتخب شدÛ)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
-msgstr ""
+msgstr "({گنتی} منتخب شدÛ)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
#: js/setup.js:84
msgid "Very weak password"
-msgstr ""
+msgstr "بÛت کمزور پاسورڈ"
#: js/setup.js:85
msgid "Weak password"
-msgstr ""
+msgstr "کمزور پاسورڈ"
#: js/setup.js:86
msgid "So-so password"
-msgstr ""
+msgstr "نص نص پاسورڈ"
#: js/setup.js:87
msgid "Good password"
-msgstr ""
+msgstr "اچھا پاسورڈ"
#: js/setup.js:88
msgid "Strong password"
-msgstr ""
+msgstr "مضبوط پاسورڈ"
#: js/share.js:51 js/share.js:66 js/share.js:106
msgid "Shared"
-msgstr ""
+msgstr "اشتراک شدÛ"
#: js/share.js:109
msgid "Share"
-msgstr ""
+msgstr "اشتراک"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
-msgstr "ایرر"
+msgstr "خرابی"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
-msgstr "شئیرنگ کے دوران ایرر"
+msgstr "اشتراک کے دوران خرابی "
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
-msgstr "شئیرنگ ختم کرنے کے دوران ایرر"
+msgstr "اشترک ختم کرنے کے دوران خرابی"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
-msgstr "اختیارات کو تبدیل کرنے کے دوران ایرر"
+msgstr "اختیارات کو تبدیل کرنے کے دوران خرابی "
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "آپ اور Ú¯Ø±ÙˆÛ Ø³Û’ مشترق Ø´Ø¯Û {Ú¯Ø±ÙˆÛ } سے {مالک}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "اشتراک Ø´Ø¯Û Ø¢Ù¾ سے{مالک}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
-msgstr ""
+msgstr "صار٠یا Ù…Ø¬Ù…ÙˆØ¹Û Ú©Û’ ساتھ اشتراک کریں ..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
+msgstr "اشتراک لنک"
+
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
msgstr ""
-#: js/share.js:223
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr "ÚˆÛŒÙالٹ میں عوامی لنک ختم ÛÙˆ جائے گا {دن} دن"
+
+#: js/share.js:248
msgid "Password protect"
-msgstr "پاسورڈ سے Ù…ØÙوظ کریں"
+msgstr "Ù…ØÙوظ پاسورڈ"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "پاسورڈ"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr "عوامی لنک کے لئےپاس ورڈ منتخب کریں"
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
-msgstr ""
+msgstr "پبلک اپ لوڈ کرنے کی اجازت دیں"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
-msgstr ""
+msgstr "Ø´Øص Ú©Û’ لیے ای میل لنک"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
-msgstr ""
+msgstr "بھجیں"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "تاریخ معیاد سیٹ کریں"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "تاریخ معیاد"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
-msgstr ""
+msgstr "ای میل کے زریعے ارسال کریں"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
-msgstr "کوئی لوگ Ù†Ûیں ملے۔"
+msgstr "کوئ شخص موجود Ù†Ûیں "
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
-msgstr ""
+msgstr "مجموعÛ"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
-msgstr "Ø¯ÙˆØ¨Ø§Ø±Û Ø´Ø¦ÛŒØ± کرنے Ú©ÛŒ اجازت Ù†Ûیں"
+msgstr "Ø¯ÙˆØ¨Ø§Ø±Û Ø§Ø´ØªØ±Ø§Ú© Ú©ÛŒ اجازت Ù†Ûیں"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "شراکت میں {آئٹم}اور {مستخدم}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "شئیرنگ ختم کریں"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
-msgstr ""
+msgstr "ای میل کے ذریعے مطلع کریں"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
-msgstr "ایڈٹ کر سکے"
+msgstr "تبدیل کر سکے ھیں"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "اسیس کنٹرول"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "نیا بنائیں"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "اپ ڈیٹ"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "ختم کریں"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "شئیر کریں"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "پاسورڈ سے Ù…ØÙوظ کیا گیا ÛÛ’"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "خرابی غیر تصØÛŒØ ØªØ§Ø±ÛŒØ® معیاد"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
-msgstr ""
+msgstr "خرابی تصØÛŒØ ØªØ§Ø±ÛŒØ® معیاد"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
-msgstr ""
+msgstr "ارسال ÛÙˆ رÛا Ú¾Û’"
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
-msgstr ""
+msgstr "ارسال Ø´Ø¯Û Ø§ÛŒ میل "
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
-msgstr ""
+msgstr "انتباÛ"
#: js/tags.js:4
msgid "The object type is not specified."
-msgstr ""
+msgstr "اس چیز Ú©ÛŒ قسم Ú©ÛŒ وضاØت Ù†Ûیں"
#: js/tags.js:13
msgid "Enter new"
-msgstr ""
+msgstr "جدید درج کریں"
#: js/tags.js:27
msgid "Delete"
-msgstr ""
+msgstr "Øذ٠کریں"
#: js/tags.js:31
msgid "Add"
@@ -445,7 +460,7 @@ msgstr "شامل کریں"
#: js/tags.js:39
msgid "Edit tags"
-msgstr ""
+msgstr "ترمیم ٹیگز"
#: js/tags.js:57
msgid "Error loading dialog template: {error}"
@@ -455,20 +470,21 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
-msgid "Please reload the page."
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
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>."
+#: js/update.js:43
+msgid "Please reload the page."
+msgstr "Ø¨Ø±Ø§Û Ù…Ûربانی صÙØÛ Ø¯ÙˆØ¨Ø§Ø±Û Ù„ÙˆÚˆ کریں."
+
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "اپ ڈیٹ کامیاب تھی۔ اپ Ú©Ùˆ اون کلوڈ سے منسلک کیا جا رÛا ÛÛ’"
#: lostpassword/controller.php:70
#, php-format
@@ -479,7 +495,7 @@ msgstr ""
msgid ""
"A problem has occurred whilst sending the email, please contact your "
"administrator."
-msgstr ""
+msgstr "ای میل بھیجنے Ú©Û’ دوران ایک Ù…Ø³Ø¦Ù„Û Ù¾ÛŒØ´ آیا ÛÛ’ , Ø¨Ø±Ø§Û Ù…Ûربانی اپنےایڈمنسٹریٹر سے Ø±Ø§Ø¨Ø·Û Ú©Ø±ÛŒÚº."
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -490,11 +506,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> اگر آپ اسکو معقول وقت Ú©Û’ اندر وصول Ù†Ûیں کرتے ØŒ آپ سپیم/جنک Ú©Û’ Ùولڈرز دیکھیں .<br> اگر ÙˆÛ ÙˆÛاں Ù†Ûیں ÛÛ’ تو اپنے مقامی منتظم سے Ú©Ûیں Û”"
#: lostpassword/templates/lostpassword.php:15
msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "گذارش ناکام!<br>کيا Ù¾ Ù†Û’ يقينی بنايا Ú©Û Ø¢Ù¾ Ú©ÛŒ ای میل / صار٠کا نام درست تھا؟"
#: lostpassword/templates/lostpassword.php:18
msgid "You will receive a link to reset your password via Email."
@@ -515,11 +531,11 @@ msgstr ""
#: lostpassword/templates/lostpassword.php:27
msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "جی Ûاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاÛتا ÛÙˆÚº"
#: lostpassword/templates/lostpassword.php:30
msgid "Reset"
-msgstr ""
+msgstr "ری سیٹ"
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
@@ -551,11 +567,11 @@ msgstr ""
#: strings.php:5
msgid "Personal"
-msgstr "ذاتی"
+msgstr "شخصی"
#: strings.php:6
msgid "Users"
-msgstr "یوزرز"
+msgstr "صارÙین"
#: strings.php:7 templates/layout.user.php:116
msgid "Apps"
@@ -599,11 +615,11 @@ msgstr ""
#: templates/403.php:12
msgid "Access forbidden"
-msgstr "Ù¾ÛÙ†Ú† Ú©ÛŒ اجازت Ù†Ûیں"
+msgstr "رسائ منقطع ÛÛ’"
#: templates/404.php:15
msgid "Cloud not found"
-msgstr "Ù†Ûیں مل سکا"
+msgstr "کلوڈ موجود Ù†ÛÛÚº"
#: templates/altmail.php:2
#, php-format
@@ -622,39 +638,39 @@ msgstr ""
#: templates/altmail.php:7 templates/mail.php:20
msgid "Cheers!"
-msgstr ""
+msgstr "واÛ!"
#: templates/installation.php:25 templates/installation.php:32
#: templates/installation.php:39
msgid "Security Warning"
-msgstr ""
+msgstr "ØÙاظتی انتباÛ"
#: templates/installation.php:26
msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "آپ کا Ù¾ÛŒ ایچ Ù¾ÛŒ ورین نل بائٹ Ú©Û’ Øملے Ú©Û’ خطرے سے دوچار ÛÛ’ (CVE-2006-7243)"
#: templates/installation.php:27
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr " Ø¨Ø±Ø§Û Ù…Ûربانی %s Ú©Ùˆ بØÙاظت استعمال کرنے Ú©Û’ Ù¾ÛŒ ایچ Ù¾ÛŒ Ú©ÛŒ تنصیب اپڈیٹ کریں"
#: templates/installation.php:33
msgid ""
"No secure random number generator is available, please enable the PHP "
"OpenSSL extension."
-msgstr ""
+msgstr "کوئ Ù…ØÙوظ بے ترتیب نمبر جنریٹر موجود Ù†Ûیں Ù…Ûربانی کر Ú©Û’ Ù¾ÛŒ ایچ Ù¾ÛŒ اوپن ایس ایس ایل ایکسٹنشن چالو کریں."
#: templates/installation.php:34
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
-msgstr ""
+msgstr "ایک Ù…ØÙوظ بے ترتیب نمبر جنریٹر Ú©Û’ بغیر ایک ØÙ…Ù„Û Ø¢ÙˆØ± پاس ورڈ ری سیٹ ٹوکن Ú©ÛŒ پیشن گوئی کرنے Ú©Û’ قابل اور اپ Ú©Û’ Øساب پر Ù‚Ø¨Ø¶Û Ú©Ø± سکتا ÛÛ’"
#: templates/installation.php:40
msgid ""
"Your data directory and files are probably accessible from the internet "
"because the .htaccess file does not work."
-msgstr ""
+msgstr "آپ Ú©ÛŒ ڈیٹا ڈائریکٹری اور Ùائلیں امکان Ûےانٹرنیٹ سے قابل رسائی Ûیں Ú©ÛŒÙˆÙ†Ú©Û htaccess. Ùائل کام Ù†Ûیں کرتا ÛÛ’"
#: templates/installation.php:42
#, php-format
@@ -667,9 +683,13 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "پاسورڈ"
+
#: templates/installation.php:70
msgid "Storage & database"
-msgstr ""
+msgstr "Ø°Ø®ÛŒØ±Û Ø§ÙˆØ± ڈیٹا بیس"
#: templates/installation.php:77
msgid "Data folder"
@@ -709,7 +729,7 @@ msgstr "سیٹ اپ ختم کریں"
#: templates/installation.php:150
msgid "Finishing …"
-msgstr ""
+msgstr "تکمیل ..."
#: templates/layout.user.php:40
msgid ""
@@ -721,7 +741,7 @@ msgstr ""
#: templates/layout.user.php:44
#, php-format
msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s دستیاب ÛÛ’. اپ ڈیٹ کرنے Ú©Û’ بارے میں مزید معلومات Øاصل کریں."
#: templates/layout.user.php:74 templates/singleuser.user.php:8
msgid "Log out"
@@ -729,17 +749,17 @@ msgstr "لاگ آؤٹ"
#: templates/login.php:9
msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "آٹومیٹک لاگ ان مسترد"
#: templates/login.php:10
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
-msgstr ""
+msgstr "آپ Ù†Û’ Øال ÛÛŒ میں اپنا پاس ورڈ تبدیل Ù†Ûیں کیا تو، آپ Ú©Û’ اکاؤنٹ سے Ø³Ù…Ø¬Ú¾ÙˆØªÛ ÛÙˆ سکتا ÛÛ’"
#: templates/login.php:12
msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "Ø¨Ø±Ø§Û Ù…Ûربانی پھر سے اکاونٹ Ù…ØÙوظ کرنے Ú©Û’ لیے اپنا پاس ورڈ تبدیل کریں."
#: templates/login.php:17
msgid "Server side authentication failed!"
@@ -763,7 +783,7 @@ msgstr "لاگ ان"
#: templates/login.php:60
msgid "Alternative Logins"
-msgstr ""
+msgstr "متبادل لاگ ان "
#: templates/mail.php:15
#, php-format
@@ -788,11 +808,30 @@ msgstr ""
#: templates/singleuser.user.php:7 templates/update.user.php:6
msgid "Thank you for your patience."
-msgstr ""
+msgstr "آپ Ú©Û’ صبر کا شکریÛ"
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index 038e9cf097a197548997aa2b731a8764d626618f..4ba7cc4d550405a865289af10608ce3939f01fa8 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,120 +177,120 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
-msgstr ""
+msgstr "تقسیم"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "ایرر"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
-msgstr ""
+msgstr "اسم"
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
msgstr[1] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -296,12 +300,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -336,70 +340,77 @@ msgstr ""
#: templates/admin.php:25
msgid "Save"
+msgstr "ØÙظ"
+
+#: templates/appnavigation.php:12
+msgid "WebDAV"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
-msgstr ""
+msgstr "ڈاؤن لوڈ،"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
-msgstr ""
+msgstr "Øذ٠کریں"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/ur_PK/files_encryption.po b/l10n/ur_PK/files_encryption.po
index 7530d0584f7cd518eb10dd51676b8c21888ed4f6..33c437bf83e953b5b0e9bc7f711ec072af41cb5d 100644
--- a/l10n/ur_PK/files_encryption.po
+++ b/l10n/ur_PK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/ur_PK/files_external.po b/l10n/ur_PK/files_external.po
index 4b691dc6ce8b7e4fc030e74434a89e85b791093e..baf57f37f3e4ef46851cfb232378dc4b2139f850 100644
--- a/l10n/ur_PK/files_external.po
+++ b/l10n/ur_PK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 16:17+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ""
#: appinfo/app.php:36
msgid "Location"
-msgstr ""
+msgstr "مقام"
#: appinfo/app.php:39
msgid "Amazon S3"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -155,7 +155,7 @@ msgstr ""
#: appinfo/app.php:114 appinfo/app.php:123
msgid "Share"
-msgstr ""
+msgstr "تقسیم"
#: appinfo/app.php:119
msgid "SMB / CIFS using OC login"
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "یو ار ایل"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -273,7 +277,7 @@ msgstr "یوزرز"
#: templates/settings.php:118 templates/settings.php:119
#: templates/settings.php:158 templates/settings.php:159
msgid "Delete"
-msgstr ""
+msgstr "Øذ٠کریں"
#: templates/settings.php:132
msgid "Enable User External Storage"
diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po
index 3b23bdb9fb44b5b72a25f0d0c7a1be2cbaac0d40..aab9aee67a42e157144d02b83c83a7c413e8be72 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: ur_PK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "پاسورڈ"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -59,13 +91,13 @@ msgstr ""
#: templates/public.php:21
msgid "Download"
-msgstr ""
+msgstr "ڈاؤن لوڈ،"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/ur_PK/files_trashbin.po b/l10n/ur_PK/files_trashbin.po
index 9ad17869f31585181be505b3a3f52c18ca5411ab..9666a1109850fd5280990be21e1a19e7b480d3ea 100644
--- a/l10n/ur_PK/files_trashbin.po
+++ b/l10n/ur_PK/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# leostandards100 <mrshah_300@yahoo.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 18:22+0000\n"
+"Last-Translator: leostandards100 <mrshah_300@yahoo.com>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,45 +21,41 @@ msgstr ""
#: ajax/delete.php:59
#, php-format
msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "ØØ°Ù Ù†Ûیں ÛÙˆ سکتا %s مستقل طور پر"
#: ajax/undelete.php:64
#, php-format
msgid "Couldn't restore %s"
-msgstr ""
+msgstr "بØال Ù†ÛÙŠÚº کيا جا سکتا %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
-msgstr ""
+msgstr "ØØ°Ù Ø´Ø¯Û Ùائليں"
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "بØال"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "ایرر"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
-msgstr ""
+msgstr "بØال شدÛ"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr " ÛŒÛاں Ú©Ú†Ú¾ بھی Ù†Ûیں .آپکی ردی Ú©ÛŒ ٹوکری خالی ÛÛ’."
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
-msgstr ""
+msgstr "اسم"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
-msgstr ""
+msgstr "ØØ°Ù Ø´Ø¯Û "
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
-msgstr ""
+msgstr "Øذ٠کریں"
diff --git a/l10n/ur_PK/files_versions.po b/l10n/ur_PK/files_versions.po
index 1c1c879f126c3f1a6e72a79787aa109abc0f6329..098dbf608351262be14e9efa55ba1c8fd270117c 100644
--- a/l10n/ur_PK/files_versions.po
+++ b/l10n/ur_PK/files_versions.po
@@ -6,10 +6,10 @@
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:56+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-18 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 18:22+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,22 +22,22 @@ msgstr ""
msgid "Could not revert: %s"
msgstr ""
-#: js/versions.js:7
+#: js/versions.js:39
msgid "Versions"
msgstr ""
-#: js/versions.js:53
+#: js/versions.js:61
msgid "Failed to revert {file} to revision {timestamp}."
msgstr ""
-#: js/versions.js:79
+#: js/versions.js:88
msgid "More versions..."
msgstr ""
-#: js/versions.js:116
+#: js/versions.js:126
msgid "No other versions available"
msgstr ""
-#: js/versions.js:149
+#: js/versions.js:156
msgid "Restore"
-msgstr ""
+msgstr "بØال"
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index 4b47baf081c8424c62aa1890ac90ea17859b300f..cc66c05ab663b767c1ffe508a97bd4ccb32c7322 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: ur_PK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -66,33 +66,33 @@ msgstr ""
#: private/avatar.php:66
msgid "Unknown filetype"
-msgstr ""
+msgstr "غیر معررو٠قسم Ú©ÛŒ Ùائل"
#: private/avatar.php:71
msgid "Invalid image"
-msgstr ""
+msgstr "غلط تصویر"
#: private/defaults.php:35
msgid "web services under your control"
msgstr "آپ کے اختیار میں ویب سروسیز"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,140 +278,151 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
#: private/template/functions.php:134
msgid "seconds ago"
-msgstr ""
+msgstr "سیکنڈز Ù¾ÛÙ„Û’"
#: private/template/functions.php:135
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n منٹس Ù¾ÛÙ„Û’"
#: private/template/functions.php:136
msgid "%n hour ago"
@@ -421,11 +432,11 @@ msgstr[1] ""
#: private/template/functions.php:137
msgid "today"
-msgstr ""
+msgstr "آج"
#: private/template/functions.php:138
msgid "yesterday"
-msgstr ""
+msgstr "Ú©Ù„"
#: private/template/functions.php:140
msgid "%n day go"
@@ -435,7 +446,7 @@ msgstr[1] ""
#: private/template/functions.php:142
msgid "last month"
-msgstr ""
+msgstr "Ù¾Ú†Ú¾Ù„Û’ Ù…Ûنیے"
#: private/template/functions.php:143
msgid "%n month ago"
@@ -445,11 +456,11 @@ msgstr[1] ""
#: private/template/functions.php:145
msgid "last year"
-msgstr ""
+msgstr "پچھلے سال"
#: private/template/functions.php:146
msgid "years ago"
-msgstr ""
+msgstr "سالوں Ù¾ÛÙ„Û’"
#: private/user/manager.php:232
msgid ""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index 51d234993353401e8f59420b9cfcbe505828831a..c1d514c09465664f8298a5752d6f2bc99c20e98d 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -41,21 +41,21 @@ msgstr ""
#: admin/controller.php:99
msgid "Email sent"
-msgstr ""
+msgstr "ارسال Ø´Ø¯Û Ø§ÛŒ میل "
#: admin/controller.php:101
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,13 +124,23 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
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"
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
-msgstr ""
+msgstr "بÛت کمزور پاسورڈ"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
-msgstr ""
+msgstr "کمزور پاسورڈ"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
-msgstr ""
+msgstr "نص نص پاسورڈ"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
-msgstr ""
+msgstr "اچھا پاسورڈ"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
-msgstr ""
+msgstr "مضبوط پاسورڈ"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -276,7 +304,7 @@ msgstr ""
#: js/users.js:127 templates/users.php:168
msgid "Delete"
-msgstr ""
+msgstr "Øذ٠کریں"
#: js/users.js:310
msgid "add group"
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -348,7 +376,7 @@ msgstr ""
#: templates/admin.php:47 templates/admin.php:61
msgid "Security Warning"
-msgstr ""
+msgstr "ØÙاظتی انتباÛ"
#: templates/admin.php:50
#, php-format
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
-msgstr ""
+msgstr "مزید"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
-msgstr ""
+msgstr "Ú©Ù…"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
@@ -835,7 +887,7 @@ msgstr ""
#: templates/users.php:64 templates/users.php:161
msgid "Other"
-msgstr ""
+msgstr "دیگر"
#: templates/users.php:85
msgid "Username"
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 28fab0f59abb18fbe37658791b706714b8a1630d..ca193980a19610b2c24e7a931eb8bf2792a6d89d 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
msgid "Error"
msgstr "ایرر"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,31 +142,47 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
-msgstr ""
+msgstr "ØÙظ"
#: templates/part.settingcontrols.php:4
msgid "Test Configuration"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -285,8 +330,16 @@ msgstr ""
#: templates/part.wizardcontrols.php:8
msgid "Continue"
+msgstr "جاری"
+
+#: templates/settings.php:7
+msgid "Expert"
msgstr ""
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "ایڈوانسڈ"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/uz/core.po b/l10n/uz/core.po
index f673c079f65895b9604d70b20aa7edf38533e6aa..8428aeb1ea4839ee585ed8bd84e254754c1f23b4 100644
--- a/l10n/uz/core.po
+++ b/l10n/uz/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: uz\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,202 +63,202 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr ""
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr ""
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr ""
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr ""
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr ""
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr ""
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr ""
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr ""
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr ""
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr ""
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr ""
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr ""
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr ""
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr ""
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr ""
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr ""
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr ""
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr ""
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr ""
-#: js/js.js:489
+#: js/js.js:487
msgid "Settings"
msgstr ""
-#: js/js.js:589
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1246
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1247
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1248
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1249
+#: js/js.js:1214
msgid "today"
msgstr ""
-#: js/js.js:1250
+#: js/js.js:1215
msgid "yesterday"
msgstr ""
-#: js/js.js:1251
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1252
+#: js/js.js:1217
msgid "last month"
msgstr ""
-#: js/js.js:1253
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1254
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1255
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
msgstr ""
-#: js/oc-dialogs.js:177
-msgid "Yes"
+#: js/oc-dialogs.js:184
+msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:187
-msgid "No"
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,140 +290,149 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr ""
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr ""
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr ""
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr ""
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr ""
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr ""
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr ""
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
+#: js/share.js:250
+msgid "Choose a password for the public link"
msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr ""
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr ""
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr ""
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr ""
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr ""
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr ""
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr ""
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr ""
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr ""
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr ""
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr ""
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr ""
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr ""
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -450,18 +464,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
@@ -662,6 +677,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -787,7 +806,26 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
msgstr ""
#: templates/update.user.php:3
diff --git a/l10n/uz/files.po b/l10n/uz/files.po
index 9b8841d71cc2be047ce1b5e626c3088f5f366f93..fcf0fa4ea2619a0dac20c8c998fc544da0d9ad46 100644
--- a/l10n/uz/files.po
+++ b/l10n/uz/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr ""
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,117 +177,117 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr ""
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1419
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1119
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1221 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1222 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr ""
-#: js/filelist.js:1223 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1232 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1238 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1327 js/filelist.js:1366
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -293,12 +297,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -335,68 +339,75 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/uz/files_encryption.po b/l10n/uz/files_encryption.po
index 12d51b25dd0f2028dfc436311be460e87ecae2ee..1a6198476b510ae9f3dc685de80592b09ede4ff9 100644
--- a/l10n/uz/files_encryption.po
+++ b/l10n/uz/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr ""
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/uz/files_external.po b/l10n/uz/files_external.po
index 9d030e62a551e7198b223ea102809d5df5fb7308..dbb9e945789c18f5e0f8dae0d5c164ab1c635e0b 100644
--- a/l10n/uz/files_external.po
+++ b/l10n/uz/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-29 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 05:55+0000\n"
+"POT-Creation-Date: 2014-05-16 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -82,8 +82,8 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
+#: appinfo/app.php:151
+msgid "Host"
msgstr ""
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
@@ -165,6 +165,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/uz/files_sharing.po b/l10n/uz/files_sharing.po
index 1360047e70e5a2090a5d75cba60d3243e4e34c65..d2b6f98238cbe4c5bcd35ad52d5a00effeb87682 100644
--- a/l10n/uz/files_sharing.po
+++ b/l10n/uz/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-03 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 05:55+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: uz\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr ""
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/uz/files_trashbin.po b/l10n/uz/files_trashbin.po
index 63c93aa2793bdbcc800594d215325417e8cb65ec..d6e4b7c8c74f35648f8a43d59d21606dc1d1cf91 100644
--- a/l10n/uz/files_trashbin.po
+++ b/l10n/uz/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,19 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:23
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr ""
-#: lib/trashbin.php:852 lib/trashbin.php:854
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
@@ -43,22 +47,14 @@ msgstr ""
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:20
+#: templates/index.php:18
msgid "Name"
msgstr ""
-#: templates/index.php:23 templates/index.php:25
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:31
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:34 templates/index.php:35
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr ""
-
-#: templates/part.breadcrumb.php:8
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/uz/lib.po b/l10n/uz/lib.po
index f21ea467fcff2c4d679d74519f39054db0cfab79..13960a380f2874b989dfc5a330ebbc09118babae 100644
--- a/l10n/uz/lib.po
+++ b/l10n/uz/lib.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: uz\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/uz/settings.po b/l10n/uz/settings.po
index e4130ccd539d2a65c89460a0628af523af59fd30..7c2a7303e11a75c99029cae15fff7154864e45ce 100644
--- a/l10n/uz/settings.po
+++ b/l10n/uz/settings.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-26 01:54-0400\n"
-"PO-Revision-Date: 2014-04-26 05:54+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr ""
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr ""
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
diff --git a/l10n/uz/user_ldap.po b/l10n/uz/user_ldap.po
index d76bcd178b786eb60f03803be5a77d5cd0576466..567171e3d173ef5bc114a771491fa7ea18357203 100644
--- a/l10n/uz/user_ldap.po
+++ b/l10n/uz/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,66 +90,94 @@ msgstr ""
msgid "Error"
msgstr ""
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:847
+#: js/settings.js:789
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:856
+#: js/settings.js:798
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
msgstr ""
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
msgid "Select object classes"
msgstr ""
-#: js/settings.js:879
+#: js/settings.js:821
msgid "Select attributes"
msgstr ""
-#: js/settings.js:906
+#: js/settings.js:848
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:913
+#: js/settings.js:855
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:922
+#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:923
+#: js/settings.js:865
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr ""
@@ -218,10 +250,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -285,6 +330,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index cf63ab90b6deee7846d8e3f82112ee72d7e917d1..ee6063a65fb006c9b0ba043c802aa0f9712082d5 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "Không thể gá»i thÆ° cho ngÆ°á»i dùng: %s"
@@ -42,6 +42,11 @@ msgstr "Tắt chế độ bảo trì"
msgid "Updated database"
msgstr "CÆ¡ sở dữ liệu đã được cáºp nháºt"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "Không có hình ảnh hoặc táºp tin được cung cấp"
@@ -62,202 +67,202 @@ msgstr "Ảnh cá nhân tạm thá»i không có giá trị, hãy thá» lại"
msgid "No crop data provided"
msgstr "Không có dữ liệu nguồn được cung cấp"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "Chủ nháºt"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "Thứ 2"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "Thứ 3"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "Thứ 4"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "Thứ 5"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "Thứ "
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "Thứ 7"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "Tháng 1"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "Tháng 2"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "Tháng 3"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "Tháng 4"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "Tháng 5"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "Tháng 6"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "Tháng 7"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "Tháng 8"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "Tháng 9"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "Tháng 10"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "Tháng 11"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "Tháng 12"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "Cà i đặt"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "Äang lÆ°u..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "và i giây trước"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n phút trước"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n giá» trÆ°á»›c"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "hôm nay"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "hôm qua"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n ngà y trước"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "tháng trước"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n tháng trước"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "năm trước"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "năm trước"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "Chá»n"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "Lá»—i khi tải mẫu táºp tin picker: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Có"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "Không"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "Chá»n"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "Lá»—i khi tải mẫu táºp tin picker: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "Äồng ý"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "Lỗi khi tải mẫu thông điệp: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} táºp tin xung Ä‘á»™t"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "Má»™t táºp tin xung Ä‘á»™t"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "File má»›i"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "Bạn muốn tiếp tục vá»›i những táºp tin nà o?"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Nếu bạn chá»n cả hai phiên bản, táºp tin được sao chép sẽ được đánh thêm số và o tên của nó."
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "Hủy"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "Tiếp tục"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(Tất cả các lá»±a chá»n)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "({count} được chá»n)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "Lá»—i khi tải táºp tin mẫu đã tồn tại"
@@ -289,140 +294,149 @@ msgstr "Äược chia sẻ"
msgid "Share"
msgstr "Chia sẻ"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "Lá»—i"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "Lỗi trong quá trình chia sẻ"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "Lỗi trong quá trình gỡ chia sẻ"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "Lá»—i trong quá trình phân quyá»n"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "Äã được chia sẽ vá»›i bạn và nhóm {group} bởi {owner}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "Äã được chia sẽ bởi {owner}"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "Chia sẻ vá»›i ngÆ°á»i dùng hoặc nhóm"
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "Chia sẻ liên kết"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "Máºt khẩu bảo vệ"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "Máºt khẩu"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "Cho phép công khai táºp tin tải lên"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "Liên kết email tới cá nhân"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "Gởi"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "Äặt ngà y kết thúc"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "Ngà y kết thúc"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "Chia sẻ thông qua email"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "Không tìm thấy ngÆ°á»i nà o"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "nhóm"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "Chia sẻ lại không được cho phép"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "Äã được chia sẽ trong {item} vá»›i {user}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "BỠchia sẻ"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "Thông báo qua email"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "có thể chỉnh sá»a"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "quản lý truy cáºp"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "tạo"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "cáºp nháºt"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "xóa"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "chia sẻ"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "Máºt khẩu bảo vệ"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "Lá»—i không thiết láºp ngà y kết thúc"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "Lỗi cấu hình ngà y kết thúc"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "Äang gởi ..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Email đã được gá»i"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "Cảnh báo"
@@ -454,18 +468,19 @@ msgstr "Lỗi khi tải mẫu hội thoại: {error}"
msgid "No tags selected for deletion."
msgstr "Không có thẻ nà o được chá»n để xóa"
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
msgstr "Vui lòng tải lại trang."
-#: 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 "Cáºp nháºt không thà nh công . Vui lòng thông báo đến <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\"> Cá»™ng đồng ownCloud </a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
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."
@@ -666,6 +681,10 @@ msgstr "Äể biết thêm thông tin và cách cấu hình đúng vui lòng xem
msgid "Create an <strong>admin account</strong>"
msgstr "Tạo một <strong>tà i khoản quản trị</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "Máºt khẩu"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -791,8 +810,27 @@ msgstr "Cảm ơn sự kiên nhẫn của bạn."
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Cáºp nháºt ownCloud lên phiên bản %s, có thể sẽ mất thá»i gian"
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 63ee2d4391364b3b69dbfae3f5f07985f07a706f..9b9f340f6d8762f01bbe9b409ff7c17226fd7246 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr "Không thể di chuyển %s - Äã có tên táºp tin nà y trên hệ th
msgid "Could not move %s"
msgstr "Không thể di chuyển %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "Tên file không được rỗng"
@@ -40,18 +40,18 @@ msgstr "Tên file không được rỗng"
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -127,44 +127,48 @@ msgstr "Không tìm thấy thư mục tạm"
msgid "Failed to write to disk"
msgstr "Không thể ghi "
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "Không đủ không gian lưu trữ"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "Tải lên thất bại. Không thể tìm thấy táºp tin được tải lên"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "Tải lên thất bại. Không thể có được thông tin táºp tin."
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "Thư mục không hợp lệ"
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "Táºp tin"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "không thể tải {filename} lên do nó là má»™t thÆ° mục hoặc có kÃch thÆ°á»›c bằng 0 byte"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "Hủy tải lên"
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "Không thể nháºn được kết quả từ máy chủ."
@@ -177,117 +181,117 @@ msgstr "Táºp tin tải lên Ä‘ang được xá» lý. Nếu bạn rá»i khá»i t
msgid "URL cannot be empty"
msgstr "URL không thể để trống"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} đã tồn tại"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "Không thể tạo file"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "Không thể tạo thư mục"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "Chia sẻ"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "Xóa vĩnh vễn"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "Sá»a tên"
-#: js/filelist.js:221
+#: js/filelist.js:299
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/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "Äang chá»"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "Lá»—i di chuyển táºp tin"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "Lá»—i"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "Không thể đổi tên file"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "Lỗi xóa file,"
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "Tên"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "KÃch cỡ"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "Thay đổi"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n thư mục"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n táºp tin"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Äang tải lên %n táºp tin"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
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:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Your storage is almost full ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "Ứng dụng mã hóa đã được kÃch hoạt nhÆ°ng bạn chÆ°a khởi tạo khóa. Vui lòng đăng xuất ra và đăng nháºp lại"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -297,12 +301,12 @@ msgstr "Mã hóa đã bị vô hiệu nhÆ°ng những táºp tin của bạn vẫn
msgid "{dirs} and {files}"
msgstr "{dirs} và {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s không thể đổi tên"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -339,68 +343,75 @@ msgstr "KÃch thÆ°á»›c tối Ä‘a cho các táºp tin ZIP"
msgid "Save"
msgstr "LÆ°u"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr "Tạo mới"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "File text má»›i"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "Táºp tin văn bản"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "Tạo thư mục"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "Thư mục"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "Từ liên kết"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "File đã bị xóa"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "Hủy upload"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "Bạn không có quyá»n upload hoặc tạo files ở đây"
-#: templates/index.php:56
+#: templates/list.php:53
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/list.php:68
msgid "Download"
msgstr "Tải vá»"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "Xóa"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "Táºp tin tải lên quá lá»›n"
-#: templates/index.php:100
+#: templates/list.php:97
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:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "Táºp tin Ä‘ang được quét ,vui lòng chá»."
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "Hiện tại đang quét"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index 9494193386489dca6160c5d4dedc5091bbbe3a70..824ee79accc5973daecafe3835386c0e7807564b 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -78,7 +78,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -93,7 +93,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -113,91 +113,91 @@ msgstr ""
msgid "personal settings"
msgstr "Thiết láºp cá nhân"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "Mã hóa"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "Báºt"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "Tắt"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "Äổi Máºt khẩu"
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "Máºt khẩu khóa cá nhân không còn phù hợp vá»›i máºt khẩu đăng nháºp:"
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "Thiết láºp máºt khẩu khóa cá nhân cÅ© đến máºt khẩu đăng nháºp hiện tại."
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "Nếu bạn không nhá»› máºt khẩu cÅ©, bạn có thể yêu cầu quản trị viên khôi phục táºp tin của bạn."
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "Máºt khẩu đăng nháºp cÅ©"
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "Máºt khẩu đăng nháºp hiện tại"
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "Cáºp nháºt máºt khẩu khóa cá nhân"
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "KÃch hoạt khôi phục máºt khẩu:"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "Tùy chá»n nà y sẽ cho phép bạn tái truy cáºp đến các táºp tin mã hóa trong trÆ°á»ng hợp mất máºt khẩu"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "Äã cáºp nháºt thiết láºp khôi phục táºp tin "
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "Không thể cáºp nháºt khôi phục táºp tin"
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index d97ecc737f65aa1dfd2575fd5e608fc14d09165a..d24db3d05e1a81a659705be830d568f1830a495a 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "Máy chủ"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,6 +166,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -198,29 +202,29 @@ msgstr "Lỗi cấu hình lưu trữ Google Drive"
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index 7f7c2788a4554ee750a7a09ae61fbdc85d0c30fd..295d4839d0d9b133bba7d68affb8b98b104cc647 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "Äược chia sẽ bởi {owner}"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "Máºt khẩu"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "Tải vá»"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index d1d916d36739d49ac4c0f435f2a3a0460feeed2a..006a9abbbf026041624d988603b146e449105246 100644
--- a/l10n/vi/files_trashbin.po
+++ b/l10n/vi/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "Không thể xóa %s vĩnh viễn"
msgid "Couldn't restore %s"
msgstr "Không thể khôi phục %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "File đã bị xóa"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "Khôi phục"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "Lá»—i"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "File đã xóa"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "khôi phục"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "Không có gì ở đây. Thùng rác của bạn rỗng!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "Tên"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "Khôi phục"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "Äã xóa"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "Xóa"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index c67d278d24959e5343efd37646de42106e2f8063..f19311a5242b6871b061bcdbdeb29561633b89e4 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr "Hình ảnh không hợp lệ"
msgid "web services under your control"
msgstr "dịch vụ web dưới sự kiểm soát của bạn"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "Tải vỠZIP đã bị tắt."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Táºp tin cần phải được tải vá» từng ngÆ°á»i má»™t."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Trở lại táºp tin"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Táºp tin được chá»n quá lá»›n để tạo táºp tin ZIP."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s đã chia sẻ »%s« với bạn"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "không thể tìm thấy mục \"%s\""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 6abb7f79ae8f4ceba78ceb861688791ae99331b5..92f2a8cef0125a9d44d78ffc30e83d78f4e91782 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "Email đã được gá»i"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "Mã hóa"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -99,6 +99,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "LÆ°u email"
@@ -115,6 +125,16 @@ msgstr "Không thể xóa nhóm"
msgid "Unable to delete user"
msgstr "Không thể xóa ngÆ°á»i dùng"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "Ngôn ngữ đã được thay đổi"
@@ -170,7 +190,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -226,34 +246,42 @@ msgstr "Cáºp nháºt"
msgid "Updated"
msgstr "Äã cáºp nháºt"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "đã xóa"
@@ -266,8 +294,8 @@ msgstr "lùi lại"
msgid "Unable to remove user"
msgstr "Không thể xóa ngÆ°á»i "
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "Nhóm"
@@ -299,7 +327,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__Ngôn ngữ___"
@@ -367,7 +395,7 @@ msgid ""
"root."
msgstr "ThÆ° mục và các táºp tin của bạn có thể được truy cáºp từ Internet. Táºp tin .htaccess không là m việc. Chúng tôi Ä‘á» nghị bạn cấu hình ebserver ,phân quyá»n lại thÆ° mục dữ liệu và cấp quyá»n truy cáºp hoặc di chuyển thÆ° mục dữ liệu bên ngoà i tà i liệu gốc máy chủ web."
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -382,53 +410,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -437,198 +477,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "Thực thi tác vụ mỗi khi trang được tải"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "Chia sẻ"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "Báºt chia sẻ API"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "Cho phép các ứng dụng sỠdụng chia sẻ API"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "Cho phép liên kết"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "Cho phép ngÆ°á»i dùng chia sẻ công khai các mục bằng các liên kết"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "Cho phép ngÆ°á»i dùng chia sẻ công khai các mục bằng các liên kết"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "Cho phép chia sẻ lại"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "Cho phép ngÆ°á»i dùng chia sẻ lại những mục đã được chia sẻ"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "Cho phép ngÆ°á»i dùng chia sẻ vá»›i bất cứ ai"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "Chỉ cho phép ngÆ°á»i dùng chia sẻ vá»›i những ngÆ°á»i dùng trong nhóm của há»"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "Äịa chỉ máy chủ"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "Cổng"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "Giấy chứng nháºn"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "Log"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "hơn"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "Ãt"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "Phiên bản"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -781,29 +829,33 @@ msgstr "Ngôn ngữ"
msgid "Help translate"
msgstr "Há»— trợ dịch thuáºt"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr ""
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr ""
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr ""
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "Tên đăng nháºp"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index f6971979cf3bfdb78cafea63d649537e95414f8a..2f9dbcc93247fa665896ffc0c4375f562eae844d 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr "Thà nh công"
msgid "Error"
msgstr "Lá»—i"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,26 +142,42 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Bá»™ lá»c nhóm"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "LÆ°u"
@@ -218,10 +250,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "Máy chủ"
@@ -285,6 +330,14 @@ msgstr "Trở lại"
msgid "Continue"
msgstr "Tiếp tục"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Nâng cao"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 0b66ae1b48f02492d0f54352e652fee60dc4649e..8725e58af3bc384175bae13c677db1239d0880ad 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -4,6 +4,7 @@
#
# Translators:
# hanfeng <appweb.cn@gmail.com>, 2013
+# jsgang <jsgang9@gmail.com>, 2014
# smartree <smartree@gmail.com>, 2014
# Xuetian Weng <wengxt@gmail.com>, 2013-2014
# min zhang <zm1990s@gmail.com>, 2013
@@ -12,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2014-04-30 20:40+0000\n"
-"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -22,11 +23,11 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr "过期日期已过。"
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "å‘é€å¤±è´¥ï¼Œç”¨æˆ·å¦‚下: %s "
@@ -43,6 +44,11 @@ msgstr "å…³é—维护模å¼"
msgid "Updated database"
msgstr "æ•°æ®åº“已更新"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "没有æ供图片或文件"
@@ -63,202 +69,202 @@ msgstr "没有临时概览页图片å¯ç”¨ï¼Œè¯·é‡è¯•"
msgid "No crop data provided"
msgstr "没有æ供相应数æ®"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "星期日"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "星期一"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "星期二"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "星期三"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "星期四"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "星期五"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "星期å…"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "一月"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "二月"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "三月"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "四月"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "五月"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "å…月"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "七月"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "八月"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "ä¹æœˆ"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "å月"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "å一月"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "å二月"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "设置"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "ä¿å˜ä¸"
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "秒å‰"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分钟å‰"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n å°æ—¶å‰"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "今天"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 天å‰"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "上月"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 月å‰"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "去年"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "å¹´å‰"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "选择(&C)..."
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "åŠ è½½æ–‡ä»¶åˆ†æ‹£æ¨¡æ¿å‡ºé”™: {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "å¦"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "选择(&C)..."
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "åŠ è½½æ–‡ä»¶åˆ†æ‹£æ¨¡æ¿å‡ºé”™: {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "好"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "åŠ è½½æ¶ˆæ¯æ¨¡æ¿å‡ºé”™: {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} 个文件冲çª"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "1个文件冲çª"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "新文件"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr "å·²ç»å˜åœ¨çš„文件"
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "想è¦ä¿ç•™å“ªä¸€ä¸ªæ–‡ä»¶å‘¢ï¼Ÿ"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "如果åŒæ—¶é€‰æ‹©äº†è¿žä¸ªç‰ˆæœ¬ï¼Œå¤åˆ¶çš„文件åå°†ä¼šæ·»åŠ ä¸Šä¸€ä¸ªæ•°å—。"
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "å–消"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "继ç»"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "(选ä¸å…¨éƒ¨)"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "(选择了{count}个)"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "åŠ è½½æ–‡ä»¶å˜åœ¨æ€§æ¨¡æ¿å¤±è´¥"
@@ -290,140 +296,149 @@ msgstr "已共享"
msgid "Share"
msgstr "分享"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "错误"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "共享时出错"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "å–消共享时出错"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "修改æƒé™æ—¶å‡ºé”™"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} å…±äº«ç»™æ‚¨åŠ {group} 组"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "{owner} 与您共享"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "分享给其他用户或组 ..."
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "分享链接"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr "è¿™ä¸ªå…±äº«é“¾æŽ¥å°†åœ¨åˆ›å»ºåŽ {days} 天失效"
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr "默认共享链接失效天数为 {days} "
+
+#: js/share.js:248
msgid "Password protect"
msgstr "密ç ä¿æŠ¤"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "密ç "
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr "为共享链接设置密ç "
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "å…è®¸å…¬å¼€ä¸Šä¼ "
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "å‘é€é“¾æŽ¥åˆ°ä¸ªäºº"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "å‘é€"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "设置过期日期"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "过期日期"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "通过Email共享"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "未找到æ¤äºº"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "组"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "ä¸å…许二次共享"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "在 {item} 与 {user} 共享。"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "å–消共享"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "以邮件通知"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "å¯ä»¥ä¿®æ”¹"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "访问控制"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "创建"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "æ›´æ–°"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "åˆ é™¤"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "共享"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "密ç å·²å—ä¿æŠ¤"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "å–消设置过期日期时出错"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "设置过期日期时出错"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "æ£åœ¨å‘é€..."
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "邮件已å‘é€"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "è¦å‘Š"
@@ -455,18 +470,19 @@ msgstr "åŠ è½½å¯¹è¯æ¡†æ¨¡æ¿å‡ºé”™: {error}"
msgid "No tags selected for deletion."
msgstr "请选择è¦åˆ é™¤çš„æ ‡ç¾ã€‚"
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "æ›´æ–°ä¸æˆåŠŸã€‚请汇报将æ¤é—®é¢˜æ±‡æŠ¥ç»™ <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社区</a>。"
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "æ›´æ–°æˆåŠŸã€‚æ£åœ¨é‡å®šå‘至 ownCloud。"
@@ -667,6 +683,10 @@ msgstr "关于如何é…ç½®æœåŠ¡å™¨ï¼Œè¯·å‚è§ <a href=\"%s\" target=\"_blank\"
msgid "Create an <strong>admin account</strong>"
msgstr "创建<strong>管ç†å‘˜è´¦å·</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "密ç "
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr "å˜å‚¨ & æ•°æ®åº“"
@@ -792,8 +812,27 @@ msgstr "æ„Ÿè°¢è®©ä½ ä¹…ç‰äº†ã€‚"
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "æ›´æ–° ownCloud 到版本 %s，这å¯èƒ½éœ€è¦ä¸€äº›æ—¶é—´ã€‚"
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 4cb44db60081f29c26cd4285581d7d72cda522da..e1a042f86fc2698783b6699c2a305308cdf6dca8 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
-"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -32,7 +32,7 @@ msgstr "æ— æ³•ç§»åŠ¨ %s - åŒå文件已å˜åœ¨"
msgid "Could not move %s"
msgstr "æ— æ³•ç§»åŠ¨ %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "文件åä¸èƒ½ä¸ºç©ºã€‚"
@@ -41,18 +41,18 @@ msgstr "文件åä¸èƒ½ä¸ºç©ºã€‚"
msgid "\"%s\" is an invalid file name."
msgstr "“%sâ€ æ˜¯ä¸€ä¸ªæ— æ•ˆçš„æ–‡ä»¶å。"
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "æ— æ•ˆå称，'\\', '/', '<', '>', ':', '\"', '|', '?' å’Œ '*' ä¸è¢«å…许使用。"
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "ç›®æ ‡æ–‡ä»¶å¤¹å·²ç»è¢«ç§»åŠ¨æˆ–åˆ é™¤ã€‚"
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -128,44 +128,48 @@ msgstr "缺少临时目录"
msgid "Failed to write to disk"
msgstr "写入ç£ç›˜å¤±è´¥"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "没有足够的å˜å‚¨ç©ºé—´"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "ä¸Šä¼ å¤±è´¥ã€‚ä¸èƒ½å‘çŽ°ä¸Šä¼ çš„æ–‡ä»¶"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "ä¸Šä¼ å¤±è´¥ã€‚ä¸èƒ½èŽ·å–文件信æ¯ã€‚"
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "æ— æ•ˆæ–‡ä»¶å¤¹ã€‚"
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "文件"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "ä¸èƒ½ä¸Šä¼ 文件 {filename} ，由于它是一个目录或者为0å—节"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr "æ€»æ–‡ä»¶å¤§å° {size1} è¶…è¿‡ä¸Šä¼ é™åˆ¶ {size2}"
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr "没有足够的å¯ç”¨ç©ºé—´ï¼Œæ‚¨æ£åœ¨ä¸Šä¼ {size1} 的文件但是åªæœ‰ {size2} å¯ç”¨ã€‚"
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "ä¸Šä¼ å·²å–消"
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "ä¸èƒ½ä»ŽæœåŠ¡å™¨å¾—到结果"
@@ -178,117 +182,117 @@ msgstr "文件æ£åœ¨ä¸Šä¼ ä¸ã€‚现在离开æ¤é¡µä¼šå¯¼è‡´ä¸Šä¼ 动作被å–消
msgid "URL cannot be empty"
msgstr "URLä¸èƒ½ä¸ºç©º"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} å·²å˜åœ¨"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "ä¸èƒ½åˆ›å»ºæ–‡ä»¶"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "ä¸èƒ½åˆ›å»ºæ–‡ä»¶å¤¹"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr "获å–URL出错"
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "分享"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "æ°¸ä¹…åˆ é™¤"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "é‡å‘½å"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "下载æ£åœ¨å‡†å¤‡ä¸ã€‚如果文件较大å¯èƒ½ä¼šèŠ±è´¹ä¸€äº›æ—¶é—´ã€‚"
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "ç‰å¾…"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr "移动文件出错。"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "移动文件错误"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "错误"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "ä¸èƒ½é‡å‘½å文件"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr "åˆ é™¤æ–‡ä»¶å‡ºé”™ã€‚"
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "å称"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "大å°"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "修改日期"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n 文件夹"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n个文件"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "ä¸Šä¼ %n 个文件"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr "“{name}â€æ˜¯ä¸€ä¸ªæ— 效的文件å。"
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "您的å˜å‚¨ç©ºé—´å·²æ»¡ï¼Œæ–‡ä»¶å°†æ— 法更新或åŒæ¥ï¼"
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "您的å˜å‚¨ç©ºé—´å³å°†ç”¨å®Œ ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "åŠ å¯†åº”ç”¨è¢«å¯ç”¨äº†ï¼Œä½†æ˜¯ä½ çš„åŠ å¯†å¯†é’¥æ²¡æœ‰åˆå§‹åŒ–，请é‡æ–°ç™»å‡ºç™»å½•ç³»ç»Ÿä¸€æ¬¡ã€‚"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "æ— æ•ˆçš„ç§æœ‰å¯†é’¥ã€‚请到您的个人é…置里去更新ç§æœ‰å¯†é’¥ï¼Œæ¥æ¢å¤å¯¹åŠ 密文件的访问。"
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -298,12 +302,12 @@ msgstr "åŠ å¯†æ˜¯è¢«ç¦ç”¨çš„ï¼Œä½†æ˜¯æ‚¨çš„æ–‡ä»¶è¿˜æ˜¯è¢«åŠ å¯†äº†ã€‚è¯·åˆ°æ‚¨
msgid "{dirs} and {files}"
msgstr "{dirs} 和 {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "%s ä¸èƒ½è¢«é‡å‘½å"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr "ä¸Šä¼ (最大 %s)"
@@ -340,68 +344,75 @@ msgstr "ZIP 文件的最大输入大å°"
msgid "Save"
msgstr "ä¿å˜"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "ä½¿ç”¨è¿™ä¸ªåœ°å€ <a href=\"%s\" target=\"_blank\">通过 WebDAV 访问您的文件</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "新建"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr "创建文本文件"
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "文本文件"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "æ·»åŠ æ–‡ä»¶å¤¹"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "文件夹"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "æ¥è‡ªé“¾æŽ¥"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "å·²åˆ é™¤æ–‡ä»¶"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "å–æ¶ˆä¸Šä¼ "
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "您没有æƒé™æ¥ä¸Šä¼ 湖州哦和创建文件"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "è¿™é‡Œè¿˜ä»€ä¹ˆéƒ½æ²¡æœ‰ã€‚ä¸Šä¼ äº›ä¸œè¥¿å§ï¼"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "下载"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "åˆ é™¤"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "ä¸Šä¼ æ–‡ä»¶è¿‡å¤§"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "您æ£å°è¯•ä¸Šä¼ 的文件超过了æ¤æœåŠ¡å™¨å¯ä»¥ä¸Šä¼ 的最大容é‡é™åˆ¶"
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "文件æ£åœ¨è¢«æ‰«æ，请ç¨å€™ã€‚"
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "当å‰æ‰«æ"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index ebd97ad4d8a297aa68f59091dd141ab026c7086a..4eeb796cd2f06135ccd7148cf04305860f29372c 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -79,7 +79,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -94,7 +94,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -114,91 +114,91 @@ msgstr ""
msgid "personal settings"
msgstr "个人设置"
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "åŠ å¯†"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr "å¯ç”¨æ¢å¤å¯†é’¥ï¼ˆå…è®¸ä½ åœ¨å¯†ç 丢失åŽæ¢å¤æ–‡ä»¶ï¼‰ï¼š"
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr "æ¢å¤å¯†é’¥å¯†ç "
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr "å¼€å¯"
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr "ç¦ç”¨"
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr "更改æ¢å¤å¯†é’¥å¯†ç "
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr "旧的æ¢å¤å¯†é’¥å¯†ç "
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr "æ–°çš„æ¢å¤å¯†é’¥å¯†ç "
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr "修改密ç "
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr "您的ç§é’¥å¯†ç ä¸å†åŒ¹é…您的登录密ç ："
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr "讲您旧的ç§é’¥å¯†ç 改为当å‰ç™»å½•å¯†ç 。"
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr "如果您记ä¸ä½æ—§çš„密ç ，您å¯ä»¥è¯·æ±‚管ç†å‘˜æ¢å¤æ‚¨çš„文件。"
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr "旧登录密ç "
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr "当å‰ç™»å½•å¯†ç "
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr "æ›´æ–°ç§é’¥å¯†ç "
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr "å¯ç”¨å¯†ç æ¢å¤ï¼š"
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr "å¯ç”¨è¯¥é¡¹å°†å…è®¸ä½ åœ¨å¯†ç 丢失åŽå–å›žæ‚¨çš„åŠ å¯†æ–‡ä»¶"
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr "文件æ¢å¤è®¾ç½®å·²æ›´æ–°"
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr "ä¸èƒ½æ›´æ–°æ–‡ä»¶æ¢å¤"
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 137e173cc9946215a608fc8dc9bd8402651b93ae..bbdc427b00c4a9fb52161d669c63739d8bd7edd3 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
-"PO-Revision-Date: 2014-05-04 19:56+0000\n"
-"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"Last-Translator: I Robot\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"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "主机"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,13 +166,17 @@ msgstr "SMB / CIFS 使用 OC 登录信æ¯"
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr "安全 https://"
#: appinfo/app.php:144
msgid "Remote subfolder"
-msgstr ""
+msgstr "远程å文件夹"
#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
msgid "Access granted"
@@ -198,29 +202,29 @@ msgstr "é…ç½®Google Driveå˜å‚¨æ—¶å‡ºé”™"
msgid "Saved"
msgstr "å·²ä¿å˜"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr "<b>注æ„：</b>"
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr "和"
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 0ca8d095142b8f175fbaa1f9947cc98b6fcc81fc..3ab878c84ae2cd6b0f5f78209db834e3bc0014bd 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -5,12 +5,13 @@
# Translators:
# Martin Liu <liuzh66@gmail.com>, 2014
# waterone <suiy02@gmail.com>, 2013
+# Xuetian Weng <wengxt@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -19,10 +20,34 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "由{owner}共享"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "这是一个密ç ä¿æŠ¤çš„共享"
@@ -35,6 +60,14 @@ msgstr "用户å或密ç 错误ï¼è¯·é‡è¯•"
msgid "Password"
msgstr "密ç "
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "抱æ‰ï¼Œæ¤é“¾æŽ¥å·²å¤±æ•ˆ"
@@ -63,11 +96,11 @@ msgstr "欲知详情，请è”ç³»å‘ç»™ä½ é“¾æŽ¥çš„äººã€‚"
msgid "Download"
msgstr "下载"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
-msgstr ""
+msgstr "下载 %s"
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr "直接链接"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 996e495d97f7cfe5244404a852733f214e586f53..53e914c6cdb2d98a1daf35d906c7ed94310096c7 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "æ— æ³•å½»åº•åˆ é™¤æ–‡ä»¶%s"
msgid "Couldn't restore %s"
msgstr "æ— æ³•æ¢å¤%s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "å·²åˆ é™¤æ–‡ä»¶"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "æ¢å¤"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "错误"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "å·²åˆ é™¤æ–‡ä»¶"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "å·²æ¢å¤"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "这里没有东西. ä½ çš„å›žæ”¶ç«™æ˜¯ç©ºçš„!"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "å称"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "æ¢å¤"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "å·²åˆ é™¤"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "åˆ é™¤"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 71f4a9a22a084c29ec9c750b12687c1c827014cc..909cb532f9d12849304c68764a0d2c814411b8d4 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-05 01:55-0400\n"
-"PO-Revision-Date: 2014-05-04 19:53+0000\n"
-"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -22,11 +22,11 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:713
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr "您æ£åœ¨è®¿é—®æ¥è‡ªä¸ä¿¡ä»»åŸŸåçš„æœåŠ¡å™¨ã€‚"
-#: base.php:714
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -81,23 +81,23 @@ msgstr "æ— æ•ˆçš„å›¾åƒ"
msgid "web services under your control"
msgstr "您控制的webæœåŠ¡"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP 下载已ç»å…³é—"
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "需è¦é€ä¸€ä¸‹è½½æ–‡ä»¶"
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "回到文件"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "é€‰æ‹©çš„æ–‡ä»¶å¤ªå¤§ï¼Œæ— æ³•ç”Ÿæˆ zip 文件。"
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -294,116 +294,127 @@ msgstr "您的WebæœåŠ¡å™¨å°šæœªæ£ç¡®è®¾ç½®ä»¥å…许文件åŒæ¥, å› ä¸ºWebDAV
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "请认真检查<a href='%s'>安装指å—</a>."
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s å‘您分享了 »%s«"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr "共享 %s å¤±è´¥ï¼Œå› ä¸ºæ–‡ä»¶ä¸å˜åœ¨ã€‚"
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr "共享 %s å¤±è´¥ï¼Œå› ä¸ºç”¨æˆ· %s 是对象的拥有者"
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr "共享 %s å¤±è´¥ï¼Œå› ä¸ºç”¨æˆ· %s ä¸å˜åœ¨"
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr "共享 %s å¤±è´¥ï¼Œå› ä¸ºç”¨æˆ· %s ä¸æ˜¯ %s 所属的任何组的用户"
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr "共享 %s å¤±è´¥ï¼Œå› ä¸ºå®ƒå·²ç»å…±äº«ç»™ %s"
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr "共享 %s å¤±è´¥ï¼Œå› ä¸º %s 组ä¸å˜åœ¨"
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr "共享 %s å¤±è´¥ï¼Œå› ä¸º %s ä¸æ˜¯ %s 组的æˆå‘˜"
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr "共享 %s å¤±è´¥ï¼Œå› ä¸ºä¸å…许用链接共享"
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr "%s ä¸æ˜¯ %s çš„åˆæ³•å…±äº«ç±»åž‹"
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr "设置 %s æƒé™å¤±è´¥ï¼Œå› 为æƒé™è¶…出了 %s 已有æƒé™ã€‚"
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "设置 %s çš„æƒé™å¤±è´¥ï¼Œå› 为未找到到对应项"
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr "共享åŽç«¯ %s 必须实现 OCP\\Share_Backend 接å£"
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr "未找到共享åŽç«¯ %s"
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr "%s 的共享åŽç«¯æœªæ‰¾åˆ°"
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr "共享 %s å¤±è´¥ï¼Œå› ä¸ºç”¨æˆ· %s ä¸æ˜¯åŽŸå§‹å…±äº«è€…"
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr "共享 %s å¤±è´¥ï¼Œå› ä¸ºæƒé™è¶…过了 %s 已有æƒé™"
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr "共享 %s å¤±è´¥ï¼Œå› ä¸ºä¸å…许二次共享"
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr "共享 %s å¤±è´¥ï¼Œå› ä¸º %s 使用的共享åŽç«¯æœªæ‰¾åˆ°å®ƒçš„æ¥æº"
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr "共享 %s å¤±è´¥ï¼Œå› ä¸ºæœªåœ¨æ–‡ä»¶ç¼“å˜ä¸æ‰¾åˆ°æ–‡ä»¶ã€‚"
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "æ— æ³•æ‰¾åˆ°åˆ†ç±» \"%s\""
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index d40eab2056e2493eecb4d9b81732c9cf5f6011d9..1517e8f6a91b5df1509070878a2a259f22f496c4 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -8,15 +8,15 @@
# m13253 <m13253@hotmail.com>, 2013
# waterone <suiy02@gmail.com>, 2013-2014
# modokwang <modokwang@gmail.com>, 2013
-# Xuetian Weng <wengxt@gmail.com>, 2013
+# Xuetian Weng <wengxt@gmail.com>, 2013-2014
# min zhang <zm1990s@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2014-04-30 22:51+0000\n"
-"Last-Translator: waterone <suiy02@gmail.com>\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -27,24 +27,24 @@ msgstr ""
#: admin/controller.php:66
#, php-format
msgid "Invalid value supplied for %s"
-msgstr ""
+msgstr "%s èŽ·å¾—äº†æ— æ•ˆå€¼"
#: admin/controller.php:73
msgid "Saved"
-msgstr ""
+msgstr "å·²ä¿å˜"
#: admin/controller.php:90
msgid "test email settings"
-msgstr ""
+msgstr "测试电å邮件设置"
#: admin/controller.php:91
msgid "If you received this email, the settings seem to be correct."
-msgstr ""
+msgstr "如果您收到了这å°é‚®ä»¶ï¼Œçœ‹èµ·æ¥è®¾ç½®æ²¡æœ‰é—®é¢˜ã€‚"
#: admin/controller.php:94
msgid ""
"A problem occurred while sending the e-mail. Please revisit your settings."
-msgstr ""
+msgstr "å‘é€ç”µå邮件时å‘生了问题。请检查您的设置。"
#: admin/controller.php:99
msgid "Email sent"
@@ -52,19 +52,19 @@ msgstr "邮件已å‘é€"
#: admin/controller.php:101
msgid "You need to set your user email before being able to send test emails."
-msgstr ""
+msgstr "在å‘é€æµ‹è¯•é‚®ä»¶é’±æ‚¨éœ€è¦è®¾ç½®æ‚¨çš„用户电å邮件"
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
-msgstr ""
+msgstr "å‘é€æ¨¡å¼"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "åŠ å¯†"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
-msgstr ""
+msgstr "认è¯æ–¹æ³•"
#: ajax/apps/ocs.php:20
msgid "Unable to load list from App Store"
@@ -93,16 +93,26 @@ msgstr "æ— æ³•æ·»åŠ ç»„"
#: ajax/decryptall.php:31
msgid "Files decrypted successfully"
-msgstr ""
+msgstr "文件解密æˆåŠŸ"
#: ajax/decryptall.php:33
msgid ""
"Couldn't decrypt your files, please check your owncloud.log or ask your "
"administrator"
-msgstr ""
+msgstr "æ— æ³•è§£å¯†æ‚¨çš„æ–‡ä»¶ï¼Œè¯·æ£€æŸ¥æ‚¨çš„ owncloud.log 或询问管ç†å‘˜"
#: ajax/decryptall.php:36
msgid "Couldn't decrypt your files, check your password and try again"
+msgstr "æ— æ³•è§£å¯†æ‚¨çš„æ–‡ä»¶ï¼Œè¯·æ£€æŸ¥å¯†ç 并é‡è¯•ã€‚"
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
msgstr ""
#: ajax/lostpassword.php:12
@@ -121,6 +131,16 @@ msgstr "æ— æ³•åˆ é™¤ç»„"
msgid "Unable to delete user"
msgstr "æ— æ³•åˆ é™¤ç”¨æˆ·"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "è¯è¨€å·²ä¿®æ”¹"
@@ -159,26 +179,26 @@ msgstr "没有满足的用户"
msgid ""
"Please provide an admin recovery password, otherwise all user data will be "
"lost"
-msgstr ""
+msgstr "请æ供管ç†å‘˜æ¢å¤å¯†ç ，å¦åˆ™æ‰€æœ‰ç”¨æˆ·çš„æ•°æ®éƒ½å°†é—失。"
#: changepassword/controller.php:73
msgid ""
"Wrong admin recovery password. Please check the password and try again."
-msgstr ""
+msgstr "错误的管ç†å‘˜æ¢å¤å¯†ç 。请检查密ç 并é‡è¯•ã€‚"
#: changepassword/controller.php:81
msgid ""
"Back-end doesn't support password change, but the users encryption key was "
"successfully updated."
-msgstr ""
+msgstr "åŽç«¯ä¸æ”¯æŒä¿®æ”¹å¯†ç ï¼Œä½†æ˜¯ç”¨æˆ·çš„åŠ å¯†å¯†ç å·²æˆåŠŸæ›´æ–°ã€‚"
#: changepassword/controller.php:86 changepassword/controller.php:97
msgid "Unable to change password"
msgstr "ä¸èƒ½æ›´æ”¹å¯†ç "
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
-msgstr ""
+msgstr "æ£åœ¨å‘é€..."
#: js/apps.js:45 templates/help.php:4
msgid "User Documentation"
@@ -186,7 +206,7 @@ msgstr "用户文档"
#: js/apps.js:50
msgid "Admin Documentation"
-msgstr ""
+msgstr "管ç†å‘˜æ–‡æ¡£"
#: js/apps.js:67
msgid "Update to {appversion}"
@@ -232,34 +252,42 @@ msgstr "æ›´æ–°"
msgid "Updated"
msgstr "已更新"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
-msgstr ""
+msgstr "选择头åƒ"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "éžå¸¸å¼±çš„密ç "
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "弱密ç "
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "一般强度的密ç "
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "较强的密ç "
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "强密ç "
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "æ£åœ¨è§£å¯†æ–‡ä»¶... 请ç¨ç‰ï¼Œå¯èƒ½éœ€è¦ä¸€äº›æ—¶é—´ã€‚"
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "å·²ç»åˆ 除"
@@ -272,8 +300,8 @@ msgstr "撤销"
msgid "Unable to remove user"
msgstr "æ— æ³•ç§»é™¤ç”¨æˆ·"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "组"
@@ -305,7 +333,7 @@ msgstr "å¿…é¡»æä¾›åˆæ³•çš„密ç "
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "è¦å‘Šï¼šç”¨æˆ· \"{user}\" 的家目录已å˜åœ¨"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "简体ä¸æ–‡"
@@ -339,19 +367,19 @@ msgstr "登录"
#: templates/admin.php:18
msgid "Plain"
-msgstr ""
+msgstr "Plain"
#: templates/admin.php:19
msgid "NT LAN Manager"
-msgstr ""
+msgstr "NT LAN 管ç†å™¨"
#: templates/admin.php:24
msgid "SSL"
-msgstr ""
+msgstr "SSL"
#: templates/admin.php:25
msgid "TLS"
-msgstr ""
+msgstr "TLS"
#: templates/admin.php:47 templates/admin.php:61
msgid "Security Warning"
@@ -362,7 +390,7 @@ msgstr "安全è¦å‘Š"
msgid ""
"You are accessing %s via HTTP. We strongly suggest you configure your server"
" to require using HTTPS instead."
-msgstr ""
+msgstr "您æ£é€šè¿‡ HTTP 访问 %s。我们强烈建议您é…ç½®ä½ çš„æœåŠ¡å™¨æ¥è¦æ±‚使用 HTTPS。"
#: templates/admin.php:64
msgid ""
@@ -373,7 +401,7 @@ msgid ""
"root."
msgstr "您的数æ®æ–‡ä»¶å¤¹å’Œæ–‡ä»¶å¯ç”±äº’è”网访问。OwnCloudæ供的.htaccess文件未生效。我们强烈建议您é…ç½®æœåŠ¡å™¨ï¼Œä»¥ä½¿æ•°æ®æ–‡ä»¶å¤¹ä¸å¯è¢«è®¿é—®ï¼Œæˆ–者将数æ®æ–‡ä»¶å¤¹ç§»åˆ°webæœåŠ¡å™¨ä»¥å¤–。"
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "设置è¦å‘Š"
@@ -388,53 +416,65 @@ msgstr "您的WebæœåŠ¡å™¨å°šæœªæ£ç¡®è®¾ç½®ä»¥å…许文件åŒæ¥, å› ä¸ºWebDAV
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "请认真检查<a href='%s'>安装指å—</a>."
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "模å—'文件信æ¯'丢失"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "PHP模å—'文件信æ¯'丢失. 我们强烈建议å¯ç”¨æ¤æ¨¡å—以便mime类型检测å–得最佳结果."
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "您的 PHP 版本ä¸æ˜¯æœ€æ–°ç‰ˆ"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
-msgstr ""
+msgstr "您的 PHP 版本已过期。强烈建议更新至 5.3.8 æˆ–è€…æ›´æ–°ç‰ˆæœ¬å› ä¸ºè€ç‰ˆæœ¬å˜åœ¨å·²çŸ¥é—®é¢˜ã€‚本次安装å¯èƒ½å¹¶æœªæ£å¸¸å·¥ä½œã€‚"
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "æœ¬åœ°åŒ–æ— æ³•å·¥ä½œ"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
-msgstr ""
+msgstr "系统è¯ç³»æ— æ³•è®¾ç½®ä¸ºæ”¯æŒ UTF-8 çš„è¯ç³»ã€‚"
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
-msgstr ""
+msgstr "è¿™æ„味ç€ä¸€äº›æ–‡ä»¶åä¸çš„特定å—符å¯èƒ½æœ‰é—®é¢˜ã€‚"
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
-msgstr ""
+msgstr "强烈建议在您的系统上安装需è¦çš„软件包æ¥æ”¯æŒä»¥ä¸‹è¯ç³»ä¹‹ä¸€ï¼š%s。"
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "å› ç‰¹ç½‘è¿žæŽ¥æ— æ³•å·¥ä½œ"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -443,198 +483,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "æ¤æœåŠ¡å™¨ä¸Šæ²¡æœ‰å¯ç”¨çš„å› ç‰¹ç½‘è¿žæŽ¥. è¿™æ„味ç€æŸäº›ç‰¹æ€§å°†æ— 法工作，例如挂载外部å˜å‚¨å™¨, æ醒更新或安装第三方应用ç‰. 从远程访问文件和å‘é€æ醒电å邮件也å¯èƒ½æ— 法工作. å¦‚æžœä½ æƒ³è¦ownCloud的所有特性, 我们建议å¯ç”¨æ¤æœåŠ¡å™¨çš„å› ç‰¹ç½‘è¿žæŽ¥."
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "计划任务"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
-msgstr ""
+msgstr "上次定时任务执行于 %s。"
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
-msgstr ""
+msgstr "上次定时任务执行于 %s。这是在一个å°æ—¶ä¹‹å‰æ‰§è¡Œçš„，å¯èƒ½å‡ºäº†ä»€ä¹ˆé—®é¢˜ã€‚"
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
-msgstr ""
+msgstr "定时任务还未被执行ï¼"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "æ¯ä¸ªé¡µé¢åŠ è½½åŽæ‰§è¡Œä¸€ä¸ªä»»åŠ¡"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
-msgstr ""
+msgstr "cron.php 已注册于一个 webcron æœåŠ¡æ¥é€šè¿‡ http æ¯ 15 分钟执行 cron.php。"
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "使用系统 cron æœåŠ¡æ¯15分钟调用一次 cron.php 文件。"
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "共享"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "å¯ç”¨å…±äº«API"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "å…许应用软件使用共享API"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "å…许链接"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "å…许用户使用连接公开共享项目"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "å…è®¸å…¬å¼€ä¸Šä¼ "
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "用户å¯è®©å…¶ä»–äººä¸Šä¼ åˆ°ä»–çš„å…¬å¼€å…±äº«æ–‡ä»¶å¤¹"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr "设置默认过期日期"
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr "过期于"
+
+#: templates/admin.php:250
+msgid "days"
+msgstr "天"
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr "强制过期日期"
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "å…许用户使用连接公开共享项目"
-#: templates/admin.php:235
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "å…许å†æ¬¡å…±äº«"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "å…许用户将共享给他们的项目å†æ¬¡å…±äº«"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "å…许用户å‘任何人共享"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "å…许用户åªå‘åŒç»„用户共享"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "å…许邮件通知"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
+msgstr "å…许用户å‘é€å…±äº«æ–‡ä»¶çš„邮件通知"
-#: templates/admin.php:263
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "安全"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "强制使用 HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "å¼ºåˆ¶å®¢æˆ·ç«¯é€šè¿‡åŠ å¯†è¿žæŽ¥è¿žæŽ¥åˆ°%s。"
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "请ç»ç”±HTTPS连接到这个%s 实例æ¥å¯ç”¨æˆ–ç¦ç”¨å¼ºåˆ¶SSL."
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
-msgstr ""
+msgstr "电å邮件æœåŠ¡å™¨"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
-msgstr ""
+msgstr "这被用于å‘é€é€šçŸ¥ã€‚"
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
+msgstr "æ¥è‡ªåœ°å€"
+
+#: templates/admin.php:375
+msgid "mail"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:396
msgid "Authentication required"
-msgstr ""
+msgstr "需è¦è®¤è¯"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "æœåŠ¡å™¨åœ°å€"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "端å£"
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "å‡è¯"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
-msgstr ""
+msgstr "SMTP 用户å"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
-msgstr ""
+msgstr "SMTP 密ç "
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
-msgstr ""
+msgstr "测试电å邮件设置"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
-msgstr ""
+msgstr "å‘é€é‚®ä»¶"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "日志"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "日志级别"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "更多"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "æ›´å°‘"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "版本"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -658,7 +706,7 @@ msgstr "选择一个应用"
#: templates/apps.php:43
msgid "Documentation:"
-msgstr ""
+msgstr "文档："
#: templates/apps.php:49
msgid "See application page at apps.owncloud.com"
@@ -666,7 +714,7 @@ msgstr "查看在 app.owncloud.com 的应用程åºé¡µé¢"
#: templates/apps.php:51
msgid "See application website"
-msgstr ""
+msgstr "å‚è§åº”用程åºç½‘ç«™"
#: templates/apps.php:53
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
@@ -745,7 +793,7 @@ msgstr "您的电å邮件"
msgid ""
"Fill in an email address to enable password recovery and receive "
"notifications"
-msgstr ""
+msgstr "填入电å邮件地å€ä»Žè€Œå¯ç”¨å¯†ç æ¢å¤å’ŒæŽ¥æ”¶é€šçŸ¥"
#: templates/personal.php:89
msgid "Profile picture"
@@ -765,7 +813,7 @@ msgstr "移除图片"
#: templates/personal.php:98
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "png 或 jpg。æ£æ–¹å½¢æ¯”较ç†æƒ³ä½†ä½ 也å¯ä»¥ä¹‹åŽå¯¹å…¶è¿›è¡Œè£å‰ªã€‚"
#: templates/personal.php:100
msgid "Your avatar is provided by your original account."
@@ -777,7 +825,7 @@ msgstr "å–消"
#: templates/personal.php:105
msgid "Choose as profile image"
-msgstr ""
+msgstr "用作头åƒ"
#: templates/personal.php:111 templates/personal.php:112
msgid "Language"
@@ -787,29 +835,33 @@ msgstr "è¯è¨€"
msgid "Help translate"
msgstr "帮助翻译"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "ä½¿ç”¨è¿™ä¸ªåœ°å€ <a href=\"%s\" target=\"_blank\">通过 WebDAV 访问您的文件</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
-msgstr ""
+msgstr "åŠ å¯† app ä¸å†è¢«å¯ç”¨ï¼Œè¯·è§£å¯†æ‚¨æ‰€æœ‰çš„文件"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "登录密ç "
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "解密所有文件"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "登录å称"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index e9a23772fba637e13eef4171f3a44f4514622e61..78ba1fc9a5eda7174bdaed5517412f444bc9e1e4 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -72,6 +72,10 @@ msgstr "从近期的æœåŠ¡å™¨é…ç½®ä¸å¯¼å…¥è®¾ç½®ï¼Ÿ"
msgid "Keep settings?"
msgstr "ä¿ç•™è®¾ç½®å—？"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "æ— æ³•æ·»åŠ æœåŠ¡å™¨é…ç½®"
@@ -88,6 +92,18 @@ msgstr "æˆåŠŸ"
msgid "Error"
msgstr "错误"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -128,26 +144,42 @@ msgstr "您真的想è¦åˆ 除当å‰æœåŠ¡å™¨é…ç½®å—？"
msgid "Confirm Deletion"
msgstr "ç¡®è®¤åˆ é™¤"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "组过滤"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "ä¿å˜"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "æ·»åŠ æœåŠ¡å™¨é…ç½®"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "主机"
@@ -287,6 +332,14 @@ msgstr "返回"
msgid "Continue"
msgstr "继ç»"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "高级"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 9d6fe43036d4ed515d0cbab7eb0d1e24266924d9..da19861be0327ff837aceda1e1d83a48252113d6 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
msgid "Updated database"
msgstr ""
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr ""
@@ -58,202 +63,202 @@ msgstr ""
msgid "No crop data provided"
msgstr ""
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "星期日"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "星期一"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "星期二"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "星期三"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "星期四"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "星期五"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "星期å…"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "一月"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "二月"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "三月"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "四月"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "五月"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "å…月"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "七月"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "八月"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "ä¹æœˆ"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "å月"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "å一月"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "å二月"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "è¨å®š"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr ""
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr ""
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] ""
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] ""
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "今日"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "昨日"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] ""
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "å‰ä¸€æœˆ"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] ""
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr ""
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "Yes"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "å–消"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr ""
@@ -285,140 +290,149 @@ msgstr "已分享"
msgid "Share"
msgstr "分享"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "錯誤"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "分享時發生錯誤"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "å–消分享時發生錯誤"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "更改權é™æ™‚發生錯誤"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner}èˆ‡ä½ åŠç¾¤çµ„的分享"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "{owner}èˆ‡ä½ çš„åˆ†äº«"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr ""
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr ""
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "密碼ä¿è·"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "密碼"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr ""
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr ""
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "傳é€"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "è¨å®šåˆ†äº«æœŸé™"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "分享期é™"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "以電郵分享"
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "找ä¸åˆ°"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr ""
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr ""
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr ""
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "å–消分享"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr ""
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr ""
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr ""
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "新增"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "æ›´æ–°"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "刪除"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "分享"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "密碼ä¿è·"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "傳é€ä¸"
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "郵件已傳"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr ""
@@ -450,18 +464,19 @@ msgstr ""
msgid "No tags selected for deletion."
msgstr ""
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "æ›´æ–°æˆåŠŸ, æ£"
@@ -662,6 +677,10 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "建立管ç†å“¡å¸³æˆ¶"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "密碼"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -787,8 +806,27 @@ msgstr ""
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud (ver. %s)æ›´æ–°ä¸, è«‹è€å¿ƒç‰ä¾¯"
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 42b19a917a74e4000f0aab49fb31c9902abb5540..a978c804696bdde145fab0735ccf2e244add03e9 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
msgid "Could not move %s"
msgstr ""
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr ""
@@ -36,18 +36,18 @@ msgstr ""
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -123,44 +123,48 @@ msgstr ""
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "文件"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr ""
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr ""
@@ -173,117 +177,117 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr ""
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr ""
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr ""
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "分享"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "錯誤"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "å稱"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "大å°"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr ""
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr ""
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr ""
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -293,12 +297,12 @@ msgstr ""
msgid "{dirs} and {files}"
msgstr ""
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -335,68 +339,75 @@ msgstr ""
msgid "Save"
msgstr "儲å˜"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "新文件夾"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr ""
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "下載"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "刪除"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
-msgid "Current scanning"
+#: templates/list.php:105
+msgid "Currently scanning"
msgstr ""
diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po
index e70443ec44500e48dabf106d1b05b6f7b1489634..17eaff41cb215d871cd4f231858fa90e025a5d4d 100644
--- a/l10n/zh_HK/files_encryption.po
+++ b/l10n/zh_HK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
msgstr ""
@@ -91,7 +91,7 @@ msgid ""
" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -111,91 +111,91 @@ msgstr ""
msgid "personal settings"
msgstr ""
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
msgstr "åŠ å¯†"
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
msgstr ""
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
msgid "Recovery key password"
msgstr ""
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
msgid "Repeat Recovery key password"
msgstr ""
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
msgid "Enabled"
msgstr ""
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
msgid "Disabled"
msgstr ""
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
msgid "Change recovery key password:"
msgstr ""
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
msgid "Old Recovery key password"
msgstr ""
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
msgid "New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
msgid "Repeat New Recovery key password"
msgstr ""
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
msgid "Change Password"
msgstr ""
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
msgid "Your private key password no longer match your log-in password:"
msgstr ""
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
msgid "Set your old private key password to your current log-in password."
msgstr ""
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
msgstr ""
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
msgid "Old log-in password"
msgstr ""
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
msgid "Current log-in password"
msgstr ""
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
msgid "Update Private Key Password"
msgstr ""
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
msgid "Enable password recovery:"
msgstr ""
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
msgstr ""
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
msgid "File recovery settings updated"
msgstr ""
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
msgid "Could not update file recovery"
msgstr ""
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index dfca5569a7f87f1f87a0129e690dd0a41e421f79..bd5cd05763aba0907df3bf3f7f2e23e437282b78 100644
--- a/l10n/zh_HK/files_external.po
+++ b/l10n/zh_HK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-23 13:42+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -21,155 +21,159 @@ msgstr ""
msgid "Local"
msgstr ""
-#: appinfo/app.php:36
+#: appinfo/app.php:37
msgid "Location"
msgstr ""
-#: appinfo/app.php:39
+#: appinfo/app.php:40
msgid "Amazon S3"
msgstr ""
-#: appinfo/app.php:41
+#: appinfo/app.php:43
msgid "Key"
msgstr ""
-#: appinfo/app.php:42
+#: appinfo/app.php:44
msgid "Secret"
msgstr ""
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
msgid "Bucket"
msgstr ""
-#: appinfo/app.php:47
+#: appinfo/app.php:49
msgid "Amazon S3 and compliant"
msgstr ""
-#: appinfo/app.php:49
+#: appinfo/app.php:52
msgid "Access Key"
msgstr ""
-#: appinfo/app.php:50
+#: appinfo/app.php:53
msgid "Secret Key"
msgstr ""
-#: appinfo/app.php:52
+#: appinfo/app.php:55
msgid "Hostname (optional)"
msgstr ""
-#: appinfo/app.php:53
+#: appinfo/app.php:56
msgid "Port (optional)"
msgstr ""
-#: appinfo/app.php:54
+#: appinfo/app.php:57
msgid "Region (optional)"
msgstr ""
-#: appinfo/app.php:55
+#: appinfo/app.php:58
msgid "Enable SSL"
msgstr ""
-#: appinfo/app.php:56
+#: appinfo/app.php:59
msgid "Enable Path Style"
msgstr ""
-#: appinfo/app.php:63
+#: appinfo/app.php:67
msgid "App key"
msgstr ""
-#: appinfo/app.php:64
+#: appinfo/app.php:68
msgid "App secret"
msgstr ""
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "網å€"
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
+msgid "Host"
+msgstr ""
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
msgid "Username"
msgstr "用戶å稱"
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
msgid "Password"
msgstr "密碼"
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
msgid "Root"
msgstr ""
-#: appinfo/app.php:77
+#: appinfo/app.php:82
msgid "Secure ftps://"
msgstr ""
-#: appinfo/app.php:84
+#: appinfo/app.php:90
msgid "Client ID"
msgstr ""
-#: appinfo/app.php:85
+#: appinfo/app.php:91
msgid "Client secret"
msgstr ""
-#: appinfo/app.php:92
+#: appinfo/app.php:98
msgid "OpenStack Object Storage"
msgstr ""
-#: appinfo/app.php:94
+#: appinfo/app.php:101
msgid "Username (required)"
msgstr ""
-#: appinfo/app.php:95
+#: appinfo/app.php:102
msgid "Bucket (required)"
msgstr ""
-#: appinfo/app.php:96
+#: appinfo/app.php:103
msgid "Region (optional for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:97
+#: appinfo/app.php:104
msgid "API Key (required for Rackspace Cloud Files)"
msgstr ""
-#: appinfo/app.php:98
+#: appinfo/app.php:105
msgid "Tenantname (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:99
+#: appinfo/app.php:106
msgid "Password (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:100
+#: appinfo/app.php:107
msgid "Service Name (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:101
+#: appinfo/app.php:108
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
msgstr ""
-#: appinfo/app.php:102
+#: appinfo/app.php:109
msgid "Timeout of HTTP requests in seconds (optional)"
msgstr ""
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
msgid "Share"
msgstr "分享"
-#: appinfo/app.php:119
+#: appinfo/app.php:127
msgid "SMB / CIFS using OC login"
msgstr ""
-#: appinfo/app.php:122
+#: appinfo/app.php:131
msgid "Username as share"
msgstr ""
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:141 appinfo/app.php:152
+msgid "URL"
+msgstr "網å€"
+
+#: appinfo/app.php:145 appinfo/app.php:156
msgid "Secure https://"
msgstr ""
-#: appinfo/app.php:144
+#: appinfo/app.php:155
msgid "Remote subfolder"
msgstr ""
@@ -197,29 +201,29 @@ msgstr ""
msgid "Saved"
msgstr ""
-#: lib/config.php:598
+#: lib/config.php:674
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:684
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:706
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:708
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:710
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -244,7 +248,7 @@ msgstr ""
#: templates/settings.php:11
msgid "Options"
-msgstr ""
+msgstr "é¸é …"
#: templates/settings.php:12
msgid "Available for"
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index e63c3f364cb43d3c19e1d4bd01cf5453bac9f6ba..5b227c97a6df06876ec070bc2757148025c1a9b8 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,34 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr ""
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr ""
@@ -33,6 +57,14 @@ msgstr ""
msgid "Password"
msgstr "密碼"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr ""
@@ -61,11 +93,11 @@ msgstr ""
msgid "Download"
msgstr "下載"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index 11f240157a9d9eaa45df9314ec5c1bd7ae328521..ab51b1e7d5bee06795143dd15edf77ae60a3fb71 100644
--- a/l10n/zh_HK/files_trashbin.po
+++ b/l10n/zh_HK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -27,38 +27,34 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr ""
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "錯誤"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr ""
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "å稱"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "刪除"
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index 943a8c24fca0207cf2ca5e82bb86a61d5d9ff79e..cba27b0c8e48f94f69e580f298e30063f9bc7292 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -76,23 +76,23 @@ msgstr ""
msgid "web services under your control"
msgstr ""
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr ""
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr ""
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr ""
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr ""
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -278,127 +278,138 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr ""
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr ""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index 851aae924f4208341461cc500af818a03f18d651..1aebf6caa778a033af7d0c888039c5f29dff22fc 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "郵件已傳"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr ""
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "åŠ å¯†"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr ""
@@ -98,6 +98,16 @@ msgstr ""
msgid "Couldn't decrypt your files, check your password and try again"
msgstr ""
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
@@ -114,6 +124,16 @@ msgstr ""
msgid "Unable to delete user"
msgstr ""
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr ""
@@ -169,7 +189,7 @@ msgstr ""
msgid "Unable to change password"
msgstr ""
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr ""
@@ -225,34 +245,42 @@ msgstr "æ›´æ–°"
msgid "Updated"
msgstr ""
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr ""
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr ""
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr ""
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr ""
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr ""
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr ""
@@ -265,8 +293,8 @@ msgstr ""
msgid "Unable to remove user"
msgstr ""
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "群組"
@@ -298,7 +326,7 @@ msgstr ""
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr ""
@@ -366,7 +394,7 @@ msgid ""
"root."
msgstr ""
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr ""
@@ -381,53 +409,65 @@ msgstr ""
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr ""
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:108
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:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr ""
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr ""
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr ""
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -436,198 +476,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr ""
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr ""
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr ""
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr ""
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr ""
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr ""
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
+#: templates/admin.php:238
+msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
+#: templates/admin.php:245
+msgid "Set default expiration date"
msgstr ""
-#: templates/admin.php:235
-msgid "Allow resharing"
+#: templates/admin.php:247
+msgid "Expire after "
msgstr ""
-#: templates/admin.php:236
-msgid "Allow users to share items shared with them again"
+#: templates/admin.php:250
+msgid "days"
msgstr ""
-#: templates/admin.php:243
-msgid "Allow users to share with anyone"
+#: templates/admin.php:253
+msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:246
-msgid "Allow users to only share with users in their groups"
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:253
-msgid "Allow mail notification"
+#: templates/admin.php:264
+msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:254
-msgid "Allow users to send mail notification for shared files"
+#: templates/admin.php:265
+msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:262
-msgid "Set default expiration date"
+#: templates/admin.php:272
+msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:275
+msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
+#: templates/admin.php:282
+msgid "Allow mail notification"
msgstr ""
-#: templates/admin.php:269
-msgid "Enforce expiration date"
+#: templates/admin.php:283
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr ""
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr ""
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr ""
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr ""
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr ""
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "é€£æŽ¥åŸ "
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr ""
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr ""
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr ""
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr ""
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr ""
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr ""
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr ""
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr ""
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr ""
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -780,27 +828,31 @@ msgstr ""
msgid "Help translate"
msgstr ""
-#: templates/personal.php:137
-msgid "WebDAV"
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
+#: templates/personal.php:156
+msgid "Log-in password"
msgstr ""
-#: templates/personal.php:151
-msgid "The encryption app is no longer enabled, please decrypt all your files"
+#: templates/personal.php:161
+msgid "Decrypt all Files"
msgstr ""
-#: templates/personal.php:157
-msgid "Log-in password"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
msgstr ""
-#: templates/personal.php:162
-msgid "Decrypt all Files"
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
msgstr ""
#: templates/users.php:19
@@ -809,7 +861,7 @@ msgstr ""
#: templates/users.php:28
msgid "Create"
-msgstr ""
+msgstr "新增"
#: templates/users.php:34
msgid "Admin Recovery Password"
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index bf006d7a13b364cf098ecf2e9f74268318dbbab9..64ef5f92694ae9d6f47191fbe24928f0c9a64e29 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Keep settings?"
msgstr ""
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr ""
@@ -86,6 +90,18 @@ msgstr "æˆåŠŸ"
msgid "Error"
msgstr "錯誤"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -126,26 +142,42 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "儲å˜"
@@ -218,10 +250,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr ""
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr ""
@@ -285,6 +330,14 @@ msgstr ""
msgid "Continue"
msgstr ""
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "進階"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index d9de54c4ddcdd0b5ad93d5dc1145cad8b9789b04..e8c50cddfb3b31153cfb5822f06a10ed97aa08e4 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:02+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:87
+#: ajax/share.php:88
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "無法寄é€éƒµä»¶çµ¦é€™äº›ä½¿ç”¨è€…：%s"
@@ -40,6 +40,11 @@ msgstr "å·²åœç”¨ç¶è·æ¨¡å¼"
msgid "Updated database"
msgstr "已更新資料庫"
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
#: avatar/controller.php:62
msgid "No image or file provided"
msgstr "未æ供圖片或檔案"
@@ -60,202 +65,202 @@ msgstr "沒有臨時用的大é 貼，請å†è©¦ä¸€æ¬¡"
msgid "No crop data provided"
msgstr "未è¨å®šå‰ªè£"
-#: js/config.php:36
+#: js/config.php:43
msgid "Sunday"
msgstr "週日"
-#: js/config.php:37
+#: js/config.php:44
msgid "Monday"
msgstr "週一"
-#: js/config.php:38
+#: js/config.php:45
msgid "Tuesday"
msgstr "週二"
-#: js/config.php:39
+#: js/config.php:46
msgid "Wednesday"
msgstr "週三"
-#: js/config.php:40
+#: js/config.php:47
msgid "Thursday"
msgstr "週四"
-#: js/config.php:41
+#: js/config.php:48
msgid "Friday"
msgstr "週五"
-#: js/config.php:42
+#: js/config.php:49
msgid "Saturday"
msgstr "週å…"
-#: js/config.php:47
+#: js/config.php:54
msgid "January"
msgstr "一月"
-#: js/config.php:48
+#: js/config.php:55
msgid "February"
msgstr "二月"
-#: js/config.php:49
+#: js/config.php:56
msgid "March"
msgstr "三月"
-#: js/config.php:50
+#: js/config.php:57
msgid "April"
msgstr "四月"
-#: js/config.php:51
+#: js/config.php:58
msgid "May"
msgstr "五月"
-#: js/config.php:52
+#: js/config.php:59
msgid "June"
msgstr "å…月"
-#: js/config.php:53
+#: js/config.php:60
msgid "July"
msgstr "七月"
-#: js/config.php:54
+#: js/config.php:61
msgid "August"
msgstr "八月"
-#: js/config.php:55
+#: js/config.php:62
msgid "September"
msgstr "ä¹æœˆ"
-#: js/config.php:56
+#: js/config.php:63
msgid "October"
msgstr "å月"
-#: js/config.php:57
+#: js/config.php:64
msgid "November"
msgstr "å一月"
-#: js/config.php:58
+#: js/config.php:65
msgid "December"
msgstr "å二月"
-#: js/js.js:483
+#: js/js.js:487
msgid "Settings"
msgstr "è¨å®š"
-#: js/js.js:583
+#: js/js.js:587
msgid "Saving..."
msgstr "儲å˜ä¸..."
-#: js/js.js:1240
+#: js/js.js:1211
msgid "seconds ago"
msgstr "幾秒å‰"
-#: js/js.js:1241
+#: js/js.js:1212
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分é˜å‰"
-#: js/js.js:1242
+#: js/js.js:1213
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n å°æ™‚å‰"
-#: js/js.js:1243
+#: js/js.js:1214
msgid "today"
msgstr "今天"
-#: js/js.js:1244
+#: js/js.js:1215
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:1245
+#: js/js.js:1216
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 天å‰"
-#: js/js.js:1246
+#: js/js.js:1217
msgid "last month"
msgstr "上個月"
-#: js/js.js:1247
+#: js/js.js:1218
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 個月å‰"
-#: js/js.js:1248
+#: js/js.js:1219
msgid "last year"
msgstr "去年"
-#: js/js.js:1249
+#: js/js.js:1220
msgid "years ago"
msgstr "幾年å‰"
-#: js/oc-dialogs.js:125
-msgid "Choose"
-msgstr "é¸æ“‡"
-
-#: js/oc-dialogs.js:151
-msgid "Error loading file picker template: {error}"
-msgstr "載入檔案é¸æ“‡å™¨æ¨£æ¿å‡ºéŒ¯ï¼š {error}"
-
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:187
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
msgid "No"
msgstr "å¦"
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr "é¸æ“‡"
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr "載入檔案é¸æ“‡å™¨æ¨£æ¿å‡ºéŒ¯ï¼š {error}"
+
+#: js/oc-dialogs.js:263
msgid "Ok"
msgstr "好"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:283
msgid "Error loading message template: {error}"
msgstr "載入訊æ¯æ¨£æ¿å‡ºéŒ¯ï¼š {error}"
-#: js/oc-dialogs.js:352
+#: js/oc-dialogs.js:411
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} 個檔案è¡çª"
-#: js/oc-dialogs.js:366
+#: js/oc-dialogs.js:425
msgid "One file conflict"
msgstr "一個檔案è¡çª"
-#: js/oc-dialogs.js:372
+#: js/oc-dialogs.js:431
msgid "New Files"
msgstr "新檔案"
-#: js/oc-dialogs.js:373
+#: js/oc-dialogs.js:432
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:375
+#: js/oc-dialogs.js:434
msgid "Which files do you want to keep?"
msgstr "您è¦ä¿ç•™å“ªä¸€å€‹æª”案？"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:435
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "如果您åŒæ™‚é¸æ“‡å…©å€‹ç‰ˆæœ¬ï¼Œè¢«è¤‡è£½çš„那個檔案å稱後é¢æœƒåŠ 上編號"
-#: js/oc-dialogs.js:384
+#: js/oc-dialogs.js:443
msgid "Cancel"
msgstr "å–消"
-#: js/oc-dialogs.js:394
+#: js/oc-dialogs.js:453
msgid "Continue"
msgstr "繼續"
-#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
msgid "(all selected)"
msgstr "（已全é¸ï¼‰"
-#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
msgid "({count} selected)"
msgstr "ï¼ˆå·²é¸ {count} é …ï¼‰"
-#: js/oc-dialogs.js:466
+#: js/oc-dialogs.js:525
msgid "Error loading file exists template"
msgstr "載入檔案å˜åœ¨æ¨£æ¿å‡ºéŒ¯"
@@ -287,140 +292,149 @@ msgstr "已分享"
msgid "Share"
msgstr "分享"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
#: templates/installation.php:10
msgid "Error"
msgstr "錯誤"
-#: js/share.js:160 js/share.js:790
+#: js/share.js:175 js/share.js:863
msgid "Error while sharing"
msgstr "分享時發生錯誤"
-#: js/share.js:171
+#: js/share.js:186
msgid "Error while unsharing"
msgstr "å–消分享時發生錯誤"
-#: js/share.js:178
+#: js/share.js:193
msgid "Error while changing permissions"
msgstr "修改權é™æ™‚發生錯誤"
-#: js/share.js:188
+#: js/share.js:203
msgid "Shared with you and the group {group} by {owner}"
msgstr "由 {owner} 分享給您和 {group}"
-#: js/share.js:190
+#: js/share.js:205
msgid "Shared with you by {owner}"
msgstr "{owner} 已經和您分享"
-#: js/share.js:214
+#: js/share.js:229
msgid "Share with user or group …"
msgstr "與用戶或群組分享"
-#: js/share.js:220
+#: js/share.js:235
msgid "Share link"
msgstr "分享連çµ"
-#: js/share.js:223
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
msgid "Password protect"
msgstr "密碼ä¿è·"
-#: js/share.js:225 templates/installation.php:60 templates/login.php:40
-msgid "Password"
-msgstr "密碼"
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
-#: js/share.js:230
+#: js/share.js:256
msgid "Allow Public Upload"
msgstr "å…許任何人上傳"
-#: js/share.js:234
+#: js/share.js:260
msgid "Email link to person"
msgstr "å°‡é€£çµ email 給別人"
-#: js/share.js:235
+#: js/share.js:261
msgid "Send"
msgstr "寄出"
-#: js/share.js:240
+#: js/share.js:266
msgid "Set expiration date"
msgstr "指定到期日"
-#: js/share.js:241
+#: js/share.js:267
msgid "Expiration date"
msgstr "到期日"
-#: js/share.js:277
+#: js/share.js:304
msgid "Share via email:"
msgstr "é€éŽé›»å郵件分享："
-#: js/share.js:280
+#: js/share.js:307
msgid "No people found"
msgstr "沒有找到任何人"
-#: js/share.js:324 js/share.js:385
+#: js/share.js:355 js/share.js:416
msgid "group"
msgstr "群組"
-#: js/share.js:357
+#: js/share.js:388
msgid "Resharing is not allowed"
msgstr "ä¸å…許é‡æ–°åˆ†äº«"
-#: js/share.js:401
+#: js/share.js:432
msgid "Shared in {item} with {user}"
msgstr "已和 {user} 分享 {item}"
-#: js/share.js:423
+#: js/share.js:454
msgid "Unshare"
msgstr "å–消分享"
-#: js/share.js:431
+#: js/share.js:462
msgid "notify by email"
msgstr "以 email 通知"
-#: js/share.js:434
+#: js/share.js:465
msgid "can edit"
msgstr "å¯ç·¨è¼¯"
-#: js/share.js:436
+#: js/share.js:467
msgid "access control"
msgstr "å˜å–控制"
-#: js/share.js:439
+#: js/share.js:470
msgid "create"
msgstr "建立"
-#: js/share.js:442
+#: js/share.js:473
msgid "update"
msgstr "æ›´æ–°"
-#: js/share.js:445
+#: js/share.js:476
msgid "delete"
msgstr "刪除"
-#: js/share.js:448
+#: js/share.js:479
msgid "share"
msgstr "分享"
-#: js/share.js:721
+#: js/share.js:781
msgid "Password protected"
msgstr "å—密碼ä¿è·"
-#: js/share.js:734
+#: js/share.js:800
msgid "Error unsetting expiration date"
msgstr "å–消到期日è¨å®šå¤±æ•—"
-#: js/share.js:752
+#: js/share.js:821
msgid "Error setting expiration date"
msgstr "è¨å®šåˆ°æœŸæ—¥ç™¼ç”ŸéŒ¯èª¤"
-#: js/share.js:777
+#: js/share.js:850
msgid "Sending ..."
msgstr "æ£åœ¨å‚³é€â€¦"
-#: js/share.js:788
+#: js/share.js:861
msgid "Email sent"
msgstr "Email 已寄出"
-#: js/share.js:812
+#: js/share.js:885
msgid "Warning"
msgstr "è¦å‘Š"
@@ -452,18 +466,19 @@ msgstr "載入å°è©±æ¨£æ¿å‡ºéŒ¯ï¼š{error}"
msgid "No tags selected for deletion."
msgstr "沒有é¸æ“‡è¦åˆªé™¤çš„標籤"
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
msgid "Please reload the page."
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 "å‡ç´šå¤±æ•—，請將æ¤å•é¡Œå›žå ± <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社群</a>。"
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
-#: js/update.js:21
+#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "å‡ç´šæˆåŠŸï¼Œæ£å°‡æ‚¨é‡æ–°å°Žå‘至 ownCloud 。"
@@ -664,6 +679,10 @@ msgstr "è«‹åƒè€ƒ<a href=\"%s\" target=\"_blank\">說明文件</a>以çžè§£å¦‚
msgid "Create an <strong>admin account</strong>"
msgstr "建立一個<strong>管ç†è€…帳號</strong>"
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr "密碼"
+
#: templates/installation.php:70
msgid "Storage & database"
msgstr ""
@@ -789,8 +808,27 @@ msgstr "æ„Ÿè¬æ‚¨çš„è€å¿ƒ"
#: templates/update.admin.php:3
#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "æ£åœ¨å°‡ ownCloud å‡ç´šè‡³ç‰ˆæœ¬ %s ，這å¯èƒ½éœ€è¦ä¸€é»žæ™‚間。"
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 46c2ea23c8171358768ca194bf3758aa57f53754..f04bf5cffc82a9f48903c6bb45eabd29c1f1b779 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:11+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr "無法移動 %s ，åŒå的檔案已經å˜åœ¨"
msgid "Could not move %s"
msgstr "無法移動 %s"
-#: ajax/newfile.php:58 js/files.js:96
+#: ajax/newfile.php:58 js/files.js:103
msgid "File name cannot be empty."
msgstr "檔åä¸èƒ½ç‚ºç©º"
@@ -38,18 +38,18 @@ msgstr "檔åä¸èƒ½ç‚ºç©º"
msgid "\"%s\" is an invalid file name."
msgstr ""
-#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:103
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
msgstr "檔åä¸åˆæ³•ï¼Œä¸å…許 \\ / < > : \" | ? * å—å…ƒ"
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
-#: lib/app.php:60
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:69
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
@@ -125,44 +125,48 @@ msgstr "找ä¸åˆ°æš«å˜è³‡æ–™å¤¾"
msgid "Failed to write to disk"
msgstr "寫入硬碟失敗"
-#: ajax/upload.php:107
+#: ajax/upload.php:109
msgid "Not enough storage available"
msgstr "儲å˜ç©ºé–“ä¸è¶³"
-#: ajax/upload.php:169
+#: ajax/upload.php:171
msgid "Upload failed. Could not find uploaded file"
msgstr "上傳失敗，找ä¸åˆ°ä¸Šå‚³çš„檔案"
-#: ajax/upload.php:179
+#: ajax/upload.php:181
msgid "Upload failed. Could not get file info."
msgstr "上傳失敗，無法å–得檔案資訊"
-#: ajax/upload.php:194
+#: ajax/upload.php:196
msgid "Invalid directory."
msgstr "無效的資料夾"
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
msgstr "檔案"
-#: js/file-upload.js:254
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
msgstr "å› ç‚º {filename} 是個目錄或是大å°ç‚ºé›¶ï¼Œæ‰€ä»¥ç„¡æ³•ä¸Šå‚³"
-#: js/file-upload.js:266
+#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:276
+#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
msgstr ""
-#: js/file-upload.js:353
+#: js/file-upload.js:358
msgid "Upload cancelled."
msgstr "上傳已å–消"
-#: js/file-upload.js:398
+#: js/file-upload.js:404
msgid "Could not get result from server."
msgstr "無法從伺æœå™¨å–回çµæžœ"
@@ -175,117 +179,117 @@ msgstr "檔案上傳ä¸ï¼Œé›¢é–‹æ¤é é¢å°‡æœƒå–消上傳。"
msgid "URL cannot be empty"
msgstr "URL ä¸èƒ½ç•™ç©º"
-#: js/file-upload.js:559 js/filelist.js:963
+#: js/file-upload.js:559 js/filelist.js:1176
msgid "{new_name} already exists"
msgstr "{new_name} 已經å˜åœ¨"
-#: js/file-upload.js:611
+#: js/file-upload.js:614
msgid "Could not create file"
msgstr "無法建立檔案"
-#: js/file-upload.js:624
+#: js/file-upload.js:630
msgid "Could not create folder"
msgstr "無法建立資料夾"
-#: js/file-upload.js:664
+#: js/file-upload.js:677
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:160
+#: js/fileactions.js:168
msgid "Share"
msgstr "分享"
-#: js/fileactions.js:173
+#: js/fileactions.js:181
msgid "Delete permanently"
msgstr "永久刪除"
-#: js/fileactions.js:234
+#: js/fileactions.js:221
msgid "Rename"
msgstr "é‡æ–°å‘½å"
-#: js/filelist.js:221
+#: js/filelist.js:299
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "æ£åœ¨æº–備您的下載，若您的檔案較大，將會需è¦æ›´å¤šæ™‚間。"
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:602 js/filelist.js:1671
msgid "Pending"
msgstr "ç‰å€™ä¸"
-#: js/filelist.js:916
+#: js/filelist.js:1127
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error moving file"
msgstr "移動檔案失敗"
-#: js/filelist.js:924
+#: js/filelist.js:1135
msgid "Error"
msgstr "錯誤"
-#: js/filelist.js:988
+#: js/filelist.js:1213
msgid "Could not rename file"
msgstr "無法é‡æ–°å‘½å"
-#: js/filelist.js:1122
+#: js/filelist.js:1334
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1437 templates/list.php:62
msgid "Name"
msgstr "å稱"
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1438 templates/list.php:75
msgid "Size"
msgstr "大å°"
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1439 templates/list.php:78
msgid "Modified"
msgstr "修改時間"
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n 個資料夾"
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n 個檔案"
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1579 js/filelist.js:1618
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n 個檔案æ£åœ¨ä¸Šå‚³"
-#: js/files.js:94
+#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
msgstr ""
-#: js/files.js:115
+#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "您的儲å˜ç©ºé–“已滿，沒有辦法å†æ›´æ–°æˆ–是åŒæ¥æª”案ï¼"
-#: js/files.js:119
+#: js/files.js:126
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "您的儲å˜ç©ºé–“å¿«è¦æ»¿äº† ({usedSpacePercent}%)"
-#: js/files.js:133
+#: js/files.js:140
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
msgstr "æª”æ¡ˆåŠ å¯†å·²å•“ç”¨ï¼Œä½†æ˜¯æ‚¨çš„é‡‘é‘°å°šæœªåˆå§‹åŒ–，請é‡æ–°ç™»å…¥ä¸€æ¬¡"
-#: js/files.js:137
+#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
msgstr "ç„¡æ•ˆçš„æª”æ¡ˆåŠ å¯†ç§é‘°ï¼Œè«‹åœ¨å€‹äººè¨å®šä¸æ›´æ–°æ‚¨çš„ç§é‘°å¯†èªžä»¥å˜å–åŠ å¯†çš„æª”æ¡ˆã€‚"
-#: js/files.js:141
+#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
@@ -295,12 +299,12 @@ msgstr "åŠ å¯†å·²ç¶“è¢«åœç”¨ï¼Œä½†æ˜¯æ‚¨çš„èˆŠæª”æ¡ˆé‚„æ˜¯è™•æ–¼å·²åŠ å¯†çš„ç‹€
msgid "{dirs} and {files}"
msgstr "{dirs} 和 {files}"
-#: lib/app.php:86
+#: lib/app.php:103
#, php-format
msgid "%s could not be renamed"
msgstr "無法é‡æ–°å‘½å %s"
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -337,68 +341,75 @@ msgstr "ZIP 壓縮å‰çš„原始大å°é™åˆ¶"
msgid "Save"
msgstr "儲å˜"
-#: templates/index.php:5
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr "使用這個地å€<a href=\"%s\" target=\"_blank\">來é€éŽ WebDAV å˜å–檔案</a>"
+
+#: templates/list.php:5
msgid "New"
msgstr "新增"
-#: templates/index.php:8
+#: templates/list.php:8
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/list.php:9
msgid "Text file"
msgstr "æ–‡å—檔"
-#: templates/index.php:12
+#: templates/list.php:12
msgid "New folder"
msgstr "新資料夾"
-#: templates/index.php:13
+#: templates/list.php:13
msgid "Folder"
msgstr "資料夾"
-#: templates/index.php:16
+#: templates/list.php:16
msgid "From link"
msgstr "從連çµ"
-#: templates/index.php:40
-msgid "Deleted files"
-msgstr "回收桶"
-
-#: templates/index.php:45
+#: templates/list.php:42
msgid "Cancel upload"
msgstr "å–消上傳"
-#: templates/index.php:51
+#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
msgstr "您沒有權é™åœ¨é€™è£¡ä¸Šå‚³æˆ–建立檔案"
-#: templates/index.php:56
+#: templates/list.php:53
msgid "Nothing in here. Upload something!"
msgstr "這裡還沒有æ±è¥¿ï¼Œä¸Šå‚³ä¸€äº›å§ï¼"
-#: templates/index.php:73
+#: templates/list.php:68
msgid "Download"
msgstr "下載"
-#: templates/index.php:84 templates/index.php:85
+#: templates/list.php:80 templates/list.php:81
msgid "Delete"
msgstr "刪除"
-#: templates/index.php:98
+#: templates/list.php:95
msgid "Upload too large"
msgstr "上傳éŽå¤§"
-#: templates/index.php:100
+#: templates/list.php:97
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "您試圖上傳的檔案大å°è¶…éŽä¼ºæœå™¨çš„é™åˆ¶ã€‚"
-#: templates/index.php:105
+#: templates/list.php:102
msgid "Files are being scanned, please wait."
msgstr "æ£åœ¨æŽƒæ檔案，請ç¨ç‰ã€‚"
-#: templates/index.php:108
-msgid "Current scanning"
-msgstr "æ£åœ¨æŽƒæ"
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index 06803008ac12c12140f24808b025fcdc07a23391..67911abc23f7ed69c17d0853ed7ffff10e3740be 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 12:31+0000\n"
-"Last-Translator: akong <akong@aspa.idv.tw>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -79,9 +79,9 @@ msgstr "無法解密這個檔案，也許這是分享的檔案。請詢å•æª”案
#: files/error.php:22 files/error.php:27
msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr "未知錯誤請檢查您的系統è¨å®šæˆ–是è¯çµ¡æ‚¨çš„管ç†å“¡"
+msgstr ""
#: hooks/hooks.php:64
msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
" the encryption app has been disabled."
msgstr "請確èªå·²å®‰è£ PHP 5.3.3 æˆ–æ˜¯æ›´æ–°çš„ç‰ˆæœ¬ä»¥åŠ OpenSSL 也一併安è£åœ¨ PHP extension 裡é¢ä¸¦å•Ÿç”¨åŠè¨ç½®å®Œæˆã€‚ç¾åœ¨ï¼ŒåŠ 密功能是åœç”¨çš„。"
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
msgid "Following users are not set up for encryption:"
msgstr "以下的使用者無法è¨å®šåŠ 密:"
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index 4e1e0cb035eba5cd6b96f79ba809d7834233323b..4b4b1a3b14e625283b4981d299076acd1c722d51 100644
--- a/l10n/zh_TW/files_external.po
+++ b/l10n/zh_TW/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-16 06:13+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -83,9 +83,9 @@ msgid "App secret"
msgstr ""
#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:131 appinfo/app.php:141 appinfo/app.php:151
-msgid "URL"
-msgstr "URL"
+#: appinfo/app.php:151
+msgid "Host"
+msgstr "主機"
#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
#: appinfo/app.php:142 appinfo/app.php:152
@@ -166,6 +166,10 @@ msgstr ""
msgid "Username as share"
msgstr ""
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr "URL"
+
#: appinfo/app.php:135 appinfo/app.php:145
msgid "Secure https://"
msgstr ""
@@ -198,29 +202,29 @@ msgstr "è¨å®š Google Drive 儲å˜æ™‚發生錯誤"
msgid "Saved"
msgstr "已儲å˜"
-#: lib/config.php:598
+#: lib/config.php:589
msgid "<b>Note:</b> "
msgstr ""
-#: lib/config.php:608
+#: lib/config.php:599
msgid " and "
msgstr ""
-#: lib/config.php:630
+#: lib/config.php:621
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:632
+#: lib/config.php:623
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:634
+#: lib/config.php:625
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index d0ea6e1af98f89128a0c8db7f236092e19869d6a..25ca681847c8f6869459fcc8780ec13d9e67b32e 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:55-0400\n"
-"PO-Revision-Date: 2014-05-03 06:12+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,34 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/share.js:33
+#: appinfo/app.php:32 js/app.js:32
+msgid "Shared with you"
+msgstr ""
+
+#: appinfo/app.php:41 js/app.js:51
+msgid "Shared with others"
+msgstr ""
+
+#: js/app.js:33
+msgid "No files have been shared with you yet."
+msgstr ""
+
+#: js/app.js:52
+msgid "You haven't shared any files yet."
+msgstr ""
+
+#: js/share.js:47 js/share.js:55
msgid "Shared by {owner}"
msgstr "由 {owner} 分享"
+#: js/sharedfilelist.js:116
+msgid "Shared by"
+msgstr ""
+
+#: js/sharedfilelist.js:220
+msgid "link"
+msgstr ""
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
msgstr "這個分享有密碼ä¿è·"
@@ -34,6 +58,14 @@ msgstr "請檢查您的密碼並å†è©¦ä¸€æ¬¡"
msgid "Password"
msgstr "密碼"
+#: templates/list.php:16
+msgid "Name"
+msgstr ""
+
+#: templates/list.php:20
+msgid "Share time"
+msgstr ""
+
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
msgstr "抱æ‰ï¼Œæ¤é€£çµå·²ç¶“失效"
@@ -62,11 +94,11 @@ msgstr "è«‹è©¢å•å‘Šè¨´æ‚¨æ¤é€£çµçš„人以çžè§£æ›´å¤š"
msgid "Download"
msgstr "下載"
-#: templates/public.php:53
+#: templates/public.php:52
#, php-format
msgid "Download %s"
msgstr ""
-#: templates/public.php:57
+#: templates/public.php:56
msgid "Direct link"
msgstr ""
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index be5b92f2b3619a5873621d3428e78801c4a71e81..3e7ee1c770b9a5dcd28f0d1662d21f366b5bc89f 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-17 01:54-0400\n"
+"PO-Revision-Date: 2014-05-17 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -28,38 +28,34 @@ msgstr "無法永久刪除 %s"
msgid "Couldn't restore %s"
msgstr "無法還原 %s"
-#: js/filelist.js:3
+#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
msgstr "回收桶"
-#: js/trash.js:33 js/trash.js:124 js/trash.js:173
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr "還原"
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
msgid "Error"
msgstr "錯誤"
-#: js/trash.js:264
-msgid "Deleted Files"
-msgstr "已刪除的檔案"
-
-#: lib/trashbin.php:859 lib/trashbin.php:861
+#: lib/trashbin.php:861 lib/trashbin.php:863
msgid "restored"
msgstr "已還原"
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr "您的回收桶是空的ï¼"
-#: templates/index.php:19
+#: templates/index.php:18
msgid "Name"
msgstr "å稱"
-#: templates/index.php:22 templates/index.php:24
-msgid "Restore"
-msgstr "還原"
-
-#: templates/index.php:30
+#: templates/index.php:29
msgid "Deleted"
msgstr "已刪除"
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:32 templates/index.php:33
msgid "Delete"
msgstr "刪除"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 4a14da3d3dc84d3d56100f18b1cb5475a302e4af..d51999d8f58d893bd9f1181562db3974838b066c 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: base.php:723
+#: base.php:695
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:696
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -78,23 +78,23 @@ msgstr "無效的圖片"
msgid "web services under your control"
msgstr "由您控制的網路æœå‹™"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP 下載已關閉。"
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "檔案需è¦é€ä¸€ä¸‹è¼‰ã€‚"
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "回到檔案列表"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "é¸æ“‡çš„檔案太大以致於無法產生壓縮檔。"
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -280,127 +280,138 @@ msgstr "è¨å®šç®¡ç†å“¡å¸³è™Ÿã€‚"
msgid "Set an admin password."
msgstr "è¨å®šç®¡ç†å“¡å¯†ç¢¼ã€‚"
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "您的網é 伺æœå™¨å°šæœªè¢«æ£ç¢ºè¨å®šä¾†é€²è¡Œæª”案åŒæ¥ï¼Œå› 為您的 WebDAV ç•Œé¢ä¼¼ä¹Žç„¡æ³•ä½¿ç”¨ã€‚"
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "è«‹åƒè€ƒ<a href='%s'>安è£æŒ‡å—</a>。"
-#: private/share/mailnotifications.php:72
-#: private/share/mailnotifications.php:118
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
#, php-format
msgid "%s shared »%s« with you"
msgstr "%s 與您分享了 %s"
-#: private/share/share.php:498
+#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
msgstr ""
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
#, php-format
msgid "Sharing %s failed, because the user %s is the item owner"
msgstr ""
-#: private/share/share.php:529
+#: private/share/share.php:532
#, php-format
msgid "Sharing %s failed, because the user %s does not exist"
msgstr ""
-#: private/share/share.php:538
+#: private/share/share.php:541
#, php-format
msgid ""
"Sharing %s failed, because the user %s is not a member of any groups that %s"
" is a member of"
msgstr ""
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
#, php-format
msgid "Sharing %s failed, because this item is already shared with %s"
msgstr ""
-#: private/share/share.php:559
+#: private/share/share.php:562
#, php-format
msgid "Sharing %s failed, because the group %s does not exist"
msgstr ""
-#: private/share/share.php:566
+#: private/share/share.php:569
#, php-format
msgid "Sharing %s failed, because %s is not a member of the group %s"
msgstr ""
-#: private/share/share.php:629
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
#, php-format
msgid "Sharing %s failed, because sharing with links is not allowed"
msgstr ""
-#: private/share/share.php:636
+#: private/share/share.php:648
#, php-format
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:787
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:848
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:959
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:966
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:972
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1388
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1397
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1413
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1425
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1439
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "找ä¸åˆ°åˆ†é¡žï¼š\"%s\""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 2bcab9da34e669622d428e9850a4b985edfb0aa3..1bf7cb99ea1c3d4976cc4bd537902b5022b5d7d7 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-31 01:54-0400\n"
+"PO-Revision-Date: 2014-05-31 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -49,15 +49,15 @@ msgstr "Email 已寄出"
msgid "You need to set your user email before being able to send test emails."
msgstr "在準備è¦å¯„出測試郵件時您需è¦è¨å®šæ‚¨çš„使用者郵件。"
-#: admin/controller.php:116 templates/admin.php:316
+#: admin/controller.php:116 templates/admin.php:346
msgid "Send mode"
msgstr "寄é€æ¨¡å¼"
-#: admin/controller.php:118 templates/admin.php:329 templates/personal.php:149
+#: admin/controller.php:118 templates/admin.php:359 templates/personal.php:144
msgid "Encryption"
msgstr "åŠ å¯†"
-#: admin/controller.php:120 templates/admin.php:353
+#: admin/controller.php:120 templates/admin.php:383
msgid "Authentication method"
msgstr "é©—è‰æ–¹å¼"
@@ -100,6 +100,16 @@ msgstr "無法解密您的檔案，請檢查您的 owncloud.log 或是詢å•æ‚¨
msgid "Couldn't decrypt your files, check your password and try again"
msgstr "無法解密您的檔案，確èªæ‚¨çš„密碼並å†é‡è©¦ä¸€æ¬¡"
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "Email已儲å˜"
@@ -116,6 +126,16 @@ msgstr "群組刪除錯誤"
msgid "Unable to delete user"
msgstr "使用者刪除錯誤"
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
#: ajax/setlanguage.php:15
msgid "Language changed"
msgstr "語言已變更"
@@ -171,7 +191,7 @@ msgstr "後端ä¸æ”¯æ´è®Šæ›´å¯†ç¢¼ï¼Œä½†æˆåŠŸæ›´æ–°ä½¿ç”¨è€…çš„åŠ å¯†é‡‘é‘°"
msgid "Unable to change password"
msgstr "無法修改密碼"
-#: js/admin.js:73
+#: js/admin.js:126
msgid "Sending..."
msgstr "寄é€ä¸..."
@@ -227,34 +247,42 @@ msgstr "æ›´æ–°"
msgid "Updated"
msgstr "已更新"
-#: js/personal.js:243
+#: js/personal.js:256
msgid "Select a profile picture"
msgstr "é¸æ“‡å¤§é è²¼"
-#: js/personal.js:274
+#: js/personal.js:287
msgid "Very weak password"
msgstr "éžå¸¸å¼±çš„密碼"
-#: js/personal.js:275
+#: js/personal.js:288
msgid "Weak password"
msgstr "弱的密碼"
-#: js/personal.js:276
+#: js/personal.js:289
msgid "So-so password"
msgstr "普通的密碼"
-#: js/personal.js:277
+#: js/personal.js:290
msgid "Good password"
msgstr "好的密碼"
-#: js/personal.js:278
+#: js/personal.js:291
msgid "Strong password"
msgstr "很強的密碼"
-#: js/personal.js:313
+#: js/personal.js:310
msgid "Decrypting files... Please wait, this can take some time."
msgstr "檔案解密ä¸ï¼Œè«‹ç¨å€™ã€‚"
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
#: js/users.js:47
msgid "deleted"
msgstr "已刪除"
@@ -267,8 +295,8 @@ msgstr "復原"
msgid "Unable to remove user"
msgstr "無法刪除用戶"
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:295 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
msgid "Groups"
msgstr "群組"
@@ -300,7 +328,7 @@ msgstr "一定è¦æ供一個有效的密碼"
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "è¦å‘Šï¼šä½¿ç”¨è€… {user} 的家目錄已經å˜åœ¨"
-#: personal.php:48 personal.php:49
+#: personal.php:50 personal.php:51
msgid "__language_name__"
msgstr "__language_name__"
@@ -368,7 +396,7 @@ msgid ""
"root."
msgstr "您的資料目錄 (Data Directory) 和檔案å¯èƒ½å¯ä»¥ç”±ç¶²éš›ç¶²è·¯ä¸Šé¢å…¬é–‹å˜å–。Owncloud 所æ供的 .htaccess è¨å®šæª”並未生效，我們強烈建è°æ‚¨è¨å®šæ‚¨çš„網é 伺æœå™¨ä»¥é˜²æ¢è³‡æ–™ç›®éŒ„被公開å˜å–，或將您的資料目錄移出網é 伺æœå™¨çš„ document root 。"
-#: templates/admin.php:75
+#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
msgstr "è¨å®šè¦å‘Š"
@@ -383,53 +411,65 @@ msgstr "您的網é 伺æœå™¨å°šæœªè¢«æ£ç¢ºè¨å®šä¾†é€²è¡Œæª”案åŒæ¥ï¼Œå› 為
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "è«‹åƒè€ƒ<a href='%s'>安è£æŒ‡å—</a>。"
-#: templates/admin.php:90
+#: templates/admin.php:93
+msgid ""
+"PHP is apparently setup to strip inline doc blocks. This will make several "
+"core apps inaccessible."
+msgstr ""
+
+#: templates/admin.php:94
+msgid ""
+"This is probably caused by a cache/accelerator such as Zend OPcache or "
+"eAccelerator."
+msgstr ""
+
+#: templates/admin.php:105
msgid "Module 'fileinfo' missing"
msgstr "éºå¤± 'fileinfo' 模組"
-#: templates/admin.php:93
+#: templates/admin.php:108
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "未åµæ¸¬åˆ° PHP 模組 'fileinfo'。我們強烈建è°å•Ÿç”¨é€™å€‹æ¨¡çµ„以å–得最好的 mime-type 支æ´ã€‚"
-#: templates/admin.php:104
+#: templates/admin.php:119
msgid "Your PHP version is outdated"
msgstr "您的 PHP 版本已éŽæœŸ"
-#: templates/admin.php:107
+#: templates/admin.php:122
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr "您的 PHP 版本已éŽæœŸã€‚我們強烈建è°æ›´æ–°åˆ° 5.3.8 æˆ–æ›´æ–°çš„ç‰ˆæœ¬ï¼Œå› ç‚ºèˆŠçš„ç‰ˆæœ¬å·²çŸ¥æœƒæ¯€æ。這個å¯èƒ½æœƒåœ¨å®‰è£å¾Œç„¡æ³•ä½¿ç”¨ã€‚"
-#: templates/admin.php:118
+#: templates/admin.php:133
msgid "Locale not working"
msgstr "語系無法é‹ä½œ"
-#: templates/admin.php:123
+#: templates/admin.php:138
msgid "System locale can not be set to a one which supports UTF-8."
msgstr "系統語系無法è¨å®šåªæ”¯æ´ UTF-8"
-#: templates/admin.php:127
+#: templates/admin.php:142
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr "這個æ„æ€æ˜¯æŒ‡åœ¨æª”åä¸ä½¿ç”¨ä¸€äº›å—å…ƒå¯èƒ½æœƒæœ‰å•é¡Œ"
-#: templates/admin.php:131
+#: templates/admin.php:146
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr "我們強烈建è°åœ¨æ‚¨çš„系統上安è£å¿…è¦çš„套件來支æ´ä»¥ä¸‹çš„語系: %s"
-#: templates/admin.php:143
+#: templates/admin.php:158
msgid "Internet connection not working"
msgstr "無網際網路å˜å–"
-#: templates/admin.php:146
+#: templates/admin.php:161
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -438,198 +478,206 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "這臺 ownCloud 伺æœå™¨æ²’æœ‰é€£æŽ¥åˆ°ç¶²éš›ç¶²è·¯ï¼Œå› æ¤æœ‰äº›åŠŸèƒ½åƒæ˜¯æŽ›è¼‰å¤–部儲å˜ç©ºé–“ã€æ›´æ–° ownCloud 或應用程å¼çš„通知沒有辦法é‹ä½œã€‚é€éŽç¶²éš›ç¶²è·¯å˜å–檔案還有電å郵件通知å¯èƒ½ä¹Ÿç„¡æ³•é‹ä½œã€‚å¦‚æžœæƒ³è¦ ownCloud 完整的功能，建è°æ‚¨å°‡é€™è‡ºä¼ºæœå™¨é€£æŽ¥è‡³ç¶²éš›ç¶²è·¯ã€‚"
-#: templates/admin.php:160
+#: templates/admin.php:175
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:167
+#: templates/admin.php:182
#, php-format
msgid "Last cron was executed at %s."
msgstr "最後的排程已執行於 %s。"
-#: templates/admin.php:170
+#: templates/admin.php:185
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
msgstr "最後的排程已執行於 %s。ç¾åœ¨éŽäº†å¥½å¹¾å€‹å°æ™‚，看起來是有錯誤。"
-#: templates/admin.php:174
+#: templates/admin.php:189
msgid "Cron was not executed yet!"
msgstr "排程沒有執行!"
-#: templates/admin.php:184
+#: templates/admin.php:199
msgid "Execute one task with each page loaded"
msgstr "當é é¢è¼‰å…¥æ™‚，執行"
-#: templates/admin.php:192
+#: templates/admin.php:207
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr "已經與 webcron æœå‹™è¨»å†Šå¥½ï¼Œå°‡æœƒæ¯15分é˜å‘¼å« cron.php"
-#: templates/admin.php:200
+#: templates/admin.php:215
msgid "Use systems cron service to call the cron.php file every 15 minutes."
msgstr "使用系統的 cron æœå‹™æ¯15分é˜å‘¼å« cron.php 一次"
-#: templates/admin.php:205
+#: templates/admin.php:220
msgid "Sharing"
msgstr "分享"
-#: templates/admin.php:211
+#: templates/admin.php:226
msgid "Enable Share API"
msgstr "啟用分享 API"
-#: templates/admin.php:212
+#: templates/admin.php:227
msgid "Allow apps to use the Share API"
msgstr "å…許 apps 使用分享 API"
-#: templates/admin.php:219
+#: templates/admin.php:234
msgid "Allow links"
msgstr "å…許連çµ"
-#: templates/admin.php:220
-msgid "Allow users to share items to the public with links"
-msgstr "å…許使用者以çµé€£å…¬é–‹åˆ†äº«æª”案"
+#: templates/admin.php:238
+msgid "Enforce password protection"
+msgstr ""
-#: templates/admin.php:227
+#: templates/admin.php:241
msgid "Allow public uploads"
msgstr "å…許任何人上傳"
-#: templates/admin.php:228
-msgid ""
-"Allow users to enable others to upload into their publicly shared folders"
-msgstr "å…許使用者將他們公開分享的資料夾è¨å®šç‚ºã€Œä»»ä½•äººçš†å¯ä¸Šå‚³ã€"
+#: templates/admin.php:245
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:247
+msgid "Expire after "
+msgstr ""
-#: templates/admin.php:235
+#: templates/admin.php:250
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share items to the public with links"
+msgstr "å…許使用者以çµé€£å…¬é–‹åˆ†äº«æª”案"
+
+#: templates/admin.php:264
msgid "Allow resharing"
msgstr "å…許轉貼分享"
-#: templates/admin.php:236
+#: templates/admin.php:265
msgid "Allow users to share items shared with them again"
msgstr "å…許使用者分享其他使用者分享給他的檔案"
-#: templates/admin.php:243
+#: templates/admin.php:272
msgid "Allow users to share with anyone"
msgstr "å…許使用者與任何人分享檔案"
-#: templates/admin.php:246
+#: templates/admin.php:275
msgid "Allow users to only share with users in their groups"
msgstr "僅å…許使用者在群組內分享"
-#: templates/admin.php:253
+#: templates/admin.php:282
msgid "Allow mail notification"
msgstr "å…許郵件通知"
-#: templates/admin.php:254
+#: templates/admin.php:283
msgid "Allow users to send mail notification for shared files"
msgstr "å…許使用者寄é€æœ‰é—œåˆ†äº«æª”案的郵件通知"
-#: templates/admin.php:262
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:263
-msgid "Expire after "
+#: templates/admin.php:290
+msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:266
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:269
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:270
-msgid "Expire shares by default after N days"
+#: templates/admin.php:301
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:278
+#: templates/admin.php:308
msgid "Security"
msgstr "安全性"
-#: templates/admin.php:291
+#: templates/admin.php:321
msgid "Enforce HTTPS"
msgstr "強制啟用 HTTPS"
-#: templates/admin.php:293
+#: templates/admin.php:323
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "å¼·è¿«ç”¨æˆ¶ç«¯ä½¿ç”¨åŠ å¯†é€£ç·šé€£æŽ¥åˆ° %s"
-#: templates/admin.php:299
+#: templates/admin.php:329
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "請使用 HTTPS 連線到 %s 以啓用或åœç”¨å¼·åˆ¶ SSL åŠ å¯†ã€‚"
-#: templates/admin.php:311
+#: templates/admin.php:341
msgid "Email Server"
msgstr "郵件伺æœå™¨"
-#: templates/admin.php:313
+#: templates/admin.php:343
msgid "This is used for sending out notifications."
msgstr "這是使用於寄é€é€šçŸ¥ã€‚"
-#: templates/admin.php:344
+#: templates/admin.php:374
msgid "From address"
msgstr "寄件地å€"
-#: templates/admin.php:366
+#: templates/admin.php:375
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:396
msgid "Authentication required"
msgstr "å¿…é ˆé©—è‰"
-#: templates/admin.php:370
+#: templates/admin.php:400
msgid "Server address"
msgstr "伺æœå™¨ä½å€"
-#: templates/admin.php:374
+#: templates/admin.php:404
msgid "Port"
msgstr "é€£æŽ¥åŸ "
-#: templates/admin.php:379
+#: templates/admin.php:409
msgid "Credentials"
msgstr "èªè‰"
-#: templates/admin.php:380
+#: templates/admin.php:410
msgid "SMTP Username"
msgstr "SMTP 帳號"
-#: templates/admin.php:383
+#: templates/admin.php:413
msgid "SMTP Password"
msgstr "SMTP 密碼"
-#: templates/admin.php:387
+#: templates/admin.php:417
msgid "Test email settings"
msgstr "測試郵件è¨å®š"
-#: templates/admin.php:388
+#: templates/admin.php:418
msgid "Send email"
msgstr "寄é€éƒµä»¶"
-#: templates/admin.php:393
+#: templates/admin.php:423
msgid "Log"
msgstr "紀錄"
-#: templates/admin.php:394
+#: templates/admin.php:424
msgid "Log level"
msgstr "紀錄層級"
-#: templates/admin.php:426
+#: templates/admin.php:456
msgid "More"
msgstr "更多"
-#: templates/admin.php:427
+#: templates/admin.php:457
msgid "Less"
msgstr "æ›´å°‘"
-#: templates/admin.php:433 templates/personal.php:171
+#: templates/admin.php:463 templates/personal.php:196
msgid "Version"
msgstr "版本"
-#: templates/admin.php:437 templates/personal.php:174
+#: templates/admin.php:467 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -782,29 +830,33 @@ msgstr "語言"
msgid "Help translate"
msgstr "幫助翻è¯"
-#: templates/personal.php:137
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: templates/personal.php:139
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr "使用這個地å€<a href=\"%s\" target=\"_blank\">來é€éŽ WebDAV å˜å–檔案</a>"
-
-#: templates/personal.php:151
+#: templates/personal.php:150
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr "åŠ å¯†çš„è»Ÿé«”ä¸èƒ½é•·æ™‚間啟用，請解密所有您的檔案"
-#: templates/personal.php:157
+#: templates/personal.php:156
msgid "Log-in password"
msgstr "登入密碼"
-#: templates/personal.php:162
+#: templates/personal.php:161
msgid "Decrypt all Files"
msgstr "解密所有檔案"
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
#: templates/users.php:19
msgid "Login Name"
msgstr "登入å稱"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 1d3c8c937dc0d6e4760c6561f52da27a04914a70..6f3fc77a3cd4ff031c17c8f461dc3c7870f70e86 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2014-04-29 10:03+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -72,6 +72,10 @@ msgstr "è¦ä½¿ç”¨æœ€è¿‘一次的伺æœå™¨è¨å®šå—Žï¼Ÿ"
msgid "Keep settings?"
msgstr "ç¶æŒè¨å®šå—Žï¼Ÿ"
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
#: js/settings.js:99
msgid "Cannot add server configuration"
msgstr "無法新增伺æœå™¨è¨å®š"
@@ -88,6 +92,18 @@ msgstr "æˆåŠŸ"
msgid "Error"
msgstr "錯誤"
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
#: js/settings.js:780
msgid "Configuration OK"
msgstr ""
@@ -128,26 +144,42 @@ msgstr "您真的è¦åˆªé™¤ç¾åœ¨çš„伺æœå™¨è¨å®šå—Žï¼Ÿ"
msgid "Confirm Deletion"
msgstr "確èªåˆªé™¤"
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Group Filter"
+
#: templates/part.settingcontrols.php:2
msgid "Save"
msgstr "儲å˜"
@@ -220,10 +252,23 @@ msgid ""
"username in the login action. Example: \"uid=%%uid\""
msgstr ""
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
msgstr "新增伺æœå™¨è¨å®š"
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
#: templates/part.wizard-server.php:30
msgid "Host"
msgstr "主機"
@@ -287,6 +332,14 @@ msgstr "返回"
msgid "Continue"
msgstr "繼續"
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "進階"
+
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/lib/autoloader.php b/lib/autoloader.php
index 3451f799e18eb1b2e0dff099d360e7c516fcadef..2ce363850817d653f1a37504c032ef0a83b35fb6 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -147,7 +147,7 @@ class Autoloader {
}
/**
- * @brief Sets the optional low-latency cache for class to path mapping.
+ * Sets the optional low-latency cache for class to path mapping.
* @param \OC\Memcache\Cache $memoryCache Instance of memory cache.
*/
public function setMemoryCache(\OC\Memcache\Cache $memoryCache = null) {
diff --git a/lib/base.php b/lib/base.php
index 1f7d0c0da65c23817490f0807c5b0304639fddd3..882b587a6fd2722b42ca6d3cb7a5f595edc40008 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -175,7 +175,7 @@ class OC {
OC::$SERVERROOT . '/lib/private' . PATH_SEPARATOR .
OC::$SERVERROOT . '/config' . PATH_SEPARATOR .
OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR .
- implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR .
+ implode(PATH_SEPARATOR, $paths) . PATH_SEPARATOR .
get_include_path() . PATH_SEPARATOR .
OC::$SERVERROOT
);
@@ -212,34 +212,6 @@ class OC {
}
}
- /*
- * This function adds some security related headers to all requests served via base.php
- * The implementation of this function has to happen here to ensure that all third-party
- * components (e.g. SabreDAV) also benefit from this headers.
- */
- public static function addSecurityHeaders() {
- header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters
- header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE
-
- // iFrame Restriction Policy
- $xFramePolicy = OC_Config::getValue('xframe_restriction', true);
- if($xFramePolicy) {
- header('X-Frame-Options: Sameorigin'); // Disallow iFraming from other domains
- }
-
- // Content Security Policy
- // If you change the standard policy, please also change it in config.sample.php
- $policy = OC_Config::getValue('custom_csp_policy',
- 'default-src \'self\'; '
- .'script-src \'self\' \'unsafe-eval\'; '
- .'style-src \'self\' \'unsafe-inline\'; '
- .'frame-src *; '
- .'img-src *; '
- .'font-src \'self\' data:; '
- .'media-src *');
- header('Content-Security-Policy:'.$policy);
- }
-
public static function checkSSL() {
// redirect to https site if configured
if (OC_Config::getValue("forcessl", false)) {
@@ -312,11 +284,26 @@ class OC {
public static function checkUpgrade($showTemplate = true) {
if (self::needUpgrade()) {
if ($showTemplate && !OC_Config::getValue('maintenance', false)) {
+ $version = OC_Util::getVersion();
+ $oldTheme = OC_Config::getValue('theme');
OC_Config::setValue('theme', '');
OC_Util::addScript('config'); // needed for web root
OC_Util::addScript('update');
$tmpl = new OC_Template('', 'update.admin', 'guest');
$tmpl->assign('version', OC_Util::getVersionString());
+
+ // get third party apps
+ $apps = OC_App::getEnabledApps();
+ $incompatibleApps = array();
+ foreach ($apps as $appId) {
+ $info = OC_App::getAppInfo($appId);
+ if(!OC_App::isAppCompatible($version, $info)) {
+ $incompatibleApps[] = $info;
+ }
+ }
+ $tmpl->assign('appList', $incompatibleApps);
+ $tmpl->assign('productName', 'ownCloud'); // for now
+ $tmpl->assign('oldTheme', $oldTheme);
$tmpl->printPage();
exit();
} else {
@@ -378,9 +365,17 @@ class OC {
//set the session object to a dummy session so code relying on the session existing still works
self::$session = new \OC\Session\Memory('');
+ // Let the session name be changed in the initSession Hook
+ $sessionName = OC_Util::getInstanceId();
+
try {
- // set the session name to the instance id - which is unique
- self::$session = new \OC\Session\Internal(OC_Util::getInstanceId());
+ // Allow session apps to create a custom session object
+ $useCustomSession = false;
+ OC_Hook::emit('OC', 'initSession', array('session' => &self::$session, 'sessionName' => &$sessionName, 'useCustomSession' => &$useCustomSession));
+ if(!$useCustomSession) {
+ // set the session name to the instance id - which is unique
+ self::$session = new \OC\Session\Internal($sessionName);
+ }
// if session cant be started break with http 500 error
} catch (Exception $e) {
//show the user a detailed error page
@@ -537,6 +532,7 @@ class OC {
self::$server = new \OC\Server();
self::initTemplateEngine();
+ OC_App::loadApps(array('session'));
if (!self::$CLI) {
self::initSession();
} else {
@@ -545,7 +541,7 @@ class OC {
self::checkConfig();
self::checkInstalled();
self::checkSSL();
- self::addSecurityHeaders();
+ OC_Response::addSecurityHeaders();
$errors = OC_Util::checkServer();
if (count($errors) > 0) {
@@ -613,7 +609,7 @@ class OC {
if (!is_null(self::$REQUESTEDFILE)) {
$subdir = OC_App::getAppPath(OC::$REQUESTEDAPP) . '/' . self::$REQUESTEDFILE;
$parent = OC_App::getAppPath(OC::$REQUESTEDAPP);
- if (!OC_Helper::issubdirectory($subdir, $parent)) {
+ if (!OC_Helper::isSubDirectory($subdir, $parent)) {
self::$REQUESTEDFILE = null;
header('HTTP/1.0 404 Not Found');
exit;
@@ -646,7 +642,8 @@ class OC {
public static function registerLogRotate() {
if (OC_Config::getValue('installed', false) && OC_Config::getValue('log_rotate_size', false) && !self::needUpgrade()) {
//don't try to do this before we are properly setup
- \OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue("datadirectory", OC::$SERVERROOT . '/data') . '/owncloud.log');
+ //use custom logfile path if defined, otherwise use default of owncloud.log in data directory
+ \OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue('logfile', OC_Config::getValue("datadirectory", OC::$SERVERROOT . '/data') . '/owncloud.log'));
}
}
@@ -655,8 +652,8 @@ class OC {
*/
public static function registerFilesystemHooks() {
// Check for blacklisted files
- OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted');
- OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted');
+ OC_Hook::connect('OC_Filesystem', 'write', 'OC\Files\Filesystem', 'isBlacklisted');
+ OC_Hook::connect('OC_Filesystem', 'rename', 'OC\Files\Filesystem', 'isBlacklisted');
}
/**
@@ -685,7 +682,7 @@ class OC {
}
/**
- * @brief Handle the request
+ * Handle the request
*/
public static function handleRequest() {
$l = \OC_L10N::get('lib');
@@ -902,30 +899,24 @@ class OC {
if (defined("DEBUG") && DEBUG) {
OC_Log::write('core', 'Trying to login from cookie', OC_Log::DEBUG);
}
- // confirm credentials in cookie
- if (isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username'])) {
- // delete outdated cookies
+
+ if(OC_User::userExists($_COOKIE['oc_username'])) {
self::cleanupLoginTokens($_COOKIE['oc_username']);
- // get stored tokens
- $tokens = OC_Preferences::getKeys($_COOKIE['oc_username'], 'login_token');
- // test cookies token against stored tokens
- 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::generateRandomBytes(32);
- OC_Preferences::setValue($_COOKIE['oc_username'], 'login_token', $token, time());
- OC_User::setMagicInCookie($_COOKIE['oc_username'], $token);
- // login
- OC_User::setUserId($_COOKIE['oc_username']);
+ // verify whether the supplied "remember me" token was valid
+ $granted = OC_User::loginWithCookie(
+ $_COOKIE['oc_username'], $_COOKIE['oc_token']);
+ if($granted === true) {
OC_Util::redirectToDefaultPage();
// doesn't return
}
+ OC_Log::write('core', 'Authentication cookie rejected for user ' .
+ $_COOKIE['oc_username'], OC_Log::WARN);
// if you reach this point you have changed your password
// or you are an attacker
// we can not delete tokens here because users may reach
// this point multiple times after a password change
- OC_Log::write('core', 'Authentication cookie rejected for user ' . $_COOKIE['oc_username'], OC_Log::WARN);
}
+
OC_User::unsetMagicInCookie();
return true;
}
diff --git a/lib/l10n/ast.php b/lib/l10n/ast.php
index 219317c19b994a745970fe3148d3a462056fb35d..5819cf25639ac1fbf21a754ca7d890bac00c8507 100644
--- a/lib/l10n/ast.php
+++ b/lib/l10n/ast.php
@@ -1,18 +1,38 @@
<?php
$TRANSLATIONS = array(
+"You are accessing the server from an untrusted domain." => "Tas accediendo al sirvidor dende un dominiu non confiáu.",
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Nun pue instalase l'aplicación \"%s\" porque nun ye compatible con esta versión d'ownCloud.",
+"Help" => "Ayuda",
"Personal" => "Personal",
"Settings" => "Axustes",
"Users" => "Usuarios",
+"Admin" => "Almin",
"Failed to upgrade \"%s\"." => "Fallu al anovar \"%s\".",
+"Unknown filetype" => "Triba de ficheru desconocida",
"Invalid image" => "Imaxe inválida",
+"web services under your control" => "servicios web baxo'l to control",
+"ZIP download is turned off." => "Tan deshabilitaes les descargues de ZIP.",
+"Files need to be downloaded one by one." => "Los ficheros necesiten descargase ún a ún",
+"Selected files too large to generate zip file." => "Los ficheros esbillaos son milenta grandes pa xenerar un ficheru zip.",
+"App does not provide an info.xml file" => "L'aplicación nun apurre un ficheru info.xml",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Nun pue instalase l'aplicación porque nun ye compatible con esta versión d'ownCloud.",
+"Can't create app folder. Please fix permissions. %s" => "Nun pue crease la carpeta de l'aplicación. Por favor, igua los permisos. %s",
"Application is not enabled" => "L'aplicación nun ta habilitada",
"Authentication error" => "Fallu d'autenticación",
+"Unknown user" => "Usuariu desconocÃu",
"Files" => "Ficheros",
"Text" => "Testu",
"Images" => "Imaxes",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "Yá esiste l'usuariu de MySQL/MariaDB '%s'@'%%'",
+"Oracle connection could not be established" => "Nun pudo afitase la conexón d'Oracle",
"Set an admin username." => "Afitar nome d'usuariu p'almin",
"Set an admin password." => "Afitar contraseña p'almin",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El sirvidor web entá nun ta configurado pa permitir la sincronización de ficheros yá que la interface WebDAV paez nun tar funcionando.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El to sirvidor web entá nun ta configuráu afayadizamente pa permitir la sincronización de ficheros porque la interfaz WebDAV paez tar rota.",
+"%s shared »%s« with you" => "%s compartió »%s« contigo",
+"You need to provide a password to create a public link, only protected links are allowed" => "Necesites apurrir una contraseña pa crear un enllaz públicu, namái tan permitÃos los enllaces protexÃos",
+"Share type %s is not valid for %s" => "La triba de compartición %s nun ye válida pa %s",
+"Sharing backend %s not found" => "Nun s'alcontró'l botón de compartición %s",
+"Sharing backend for %s not found" => "Nun s'alcontró'l botón de partición pa %s",
"Could not find category \"%s\"" => "Nun pudo alcontrase la estaya \"%s.\"",
"seconds ago" => "fai segundos",
"_%n minute ago_::_%n minutes ago_" => array("","fai %n minutos"),
@@ -24,7 +44,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","fai %n meses"),
"last year" => "añu caberu",
"years ago" => "fai años",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Namái tan permitÃos los siguientes caráuteres nun nome d'usuariu: \"a-z\", \"A-Z\", \"0-9\", y \"_.@-\"",
"A valid username must be provided" => "Tien d'apurrise un nome d'usuariu válidu",
-"A valid password must be provided" => "Tien d'apurrise una contraseña válida"
+"A valid password must be provided" => "Tien d'apurrise una contraseña válida",
+"The username is already being used" => "El nome d'usuariu yá ta usándose"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/bn_IN.php b/lib/l10n/bn_IN.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f78e0bce6d7e36688d2913f6affa4c17472a65
--- /dev/null
+++ b/lib/l10n/bn_IN.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@valencia.php b/lib/l10n/ca@valencia.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f78e0bce6d7e36688d2913f6affa4c17472a65
--- /dev/null
+++ b/lib/l10n/ca@valencia.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/cs_CZ.php b/lib/l10n/cs_CZ.php
index 6fef446d8c4fa552667f8a5d6f3a9d9d75567704..94d0fbe069797bbfc171ad8a85a0bbc2af72ef35 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"You are accessing the server from an untrusted domain." => "Přistupujete na server z nedůvěryhodné domény.",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Kontaktujte prosÃm správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. PÅ™Ãklad konfigurace najdete v souboru config/config.sample.php.",
"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",
@@ -65,6 +66,7 @@ $TRANSLATIONS = array(
"Sharing %s failed, because the group %s does not exist" => "SdÃlenà položky %s selhalo, protože skupina %s neexistuje",
"Sharing %s failed, because %s is not a member of the group %s" => "SdÃlenà položky %s selhalo, protože uživatel %s nenà Älenem skupiny %s",
"Sharing %s failed, because sharing with links is not allowed" => "SdÃlenà položky %s selhalo, protože sdÃlenà pomocà linků nenà povoleno",
+"Share type %s is not valid for %s" => "SdÃlenà typu %s nenà korektnà pro %s",
"Setting permissions for %s failed, because the item was not found" => "Nastavenà práv pro %s selhalo, protože položka nebyla nalezena",
"Could not find category \"%s\"" => "Nelze nalézt kategorii \"%s\"",
"seconds ago" => "před pár sekundami",
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 6c518a8b8438ac38227360c6e0e128c9a9382331..1c12d95501e033f586216956b54eb3c067eac0c5 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -59,12 +59,14 @@ $TRANSLATIONS = array(
"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
"%s shared »%s« with you" => "%s teilte »%s« mit Dir",
"Sharing %s failed, because the file does not exist" => "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
+"You are not allowed to share %s" => "Die Freigabe von %s ist Dir nicht erlaubt",
"Sharing %s failed, because the user %s is the item owner" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist",
"Sharing %s failed, because the user %s does not exist" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s nicht existiert",
"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s kein Gruppenmitglied einer der Gruppen von %s ist",
"Sharing %s failed, because this item is already shared with %s" => "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird",
"Sharing %s failed, because the group %s does not exist" => "Freigabe von %s fehlgeschlagen, da die Gruppe %s nicht existiert",
"Sharing %s failed, because %s is not a member of the group %s" => "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist",
+"You need to provide a password to create a public link, only protected links are allowed" => "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren",
"Sharing %s failed, because sharing with links is not allowed" => "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist",
"Share type %s is not valid for %s" => "Freigabetyp %s ist nicht gültig für %s",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten",
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 6e3ec141a21771edd2f3552778f1106038d4ba05..7010cc29fbfaecc7dd1a111cdea8975252640a06 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -59,12 +59,14 @@ $TRANSLATIONS = array(
"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
"%s shared »%s« with you" => "%s hat »%s« mit Ihnen geteilt",
"Sharing %s failed, because the file does not exist" => "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
+"You are not allowed to share %s" => "Die Freigabe von %s ist Ihnen nicht erlaubt",
"Sharing %s failed, because the user %s is the item owner" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist",
"Sharing %s failed, because the user %s does not exist" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s nicht existiert",
"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s kein Gruppenmitglied einer der Gruppen von %s ist",
"Sharing %s failed, because this item is already shared with %s" => "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird",
"Sharing %s failed, because the group %s does not exist" => "Freigabe von %s fehlgeschlagen, da die Gruppe %s nicht existiert",
"Sharing %s failed, because %s is not a member of the group %s" => "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist",
+"You need to provide a password to create a public link, only protected links are allowed" => "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren",
"Sharing %s failed, because sharing with links is not allowed" => "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist",
"Share type %s is not valid for %s" => "Freigabetyp %s ist nicht gültig für %s",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten",
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index 109104e4061db6c9fbed872279ddd16875c28550..546fb6347b5cf513ed9099d9c40d61e6a2412bce 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
+"You are accessing the server from an untrusted domain." => "Η Ï€ÏοσπÎλαση του διακομιστή γίνεται από μη Îμπιστο τομÎα.",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "ΠαÏακαλώ επικοινωνήστε με τον διαχειÏιστή συστημάτων σας. Αν είστε διαχειÏιστής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… στιγμιοτÏπο, Ïυθμίστε το κλειδί \"trusted_domain\" στο αÏχείο config/config.php. Ένα παÏάδειγμα παÏÎχεται στο αÏχείο config/config.sample.php.",
"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Η εφαÏμογή \"%s\" δεν μποÏεί να εγκατασταθεί επειδή δεν είναι συμβατή με αυτή την Îκδοση του ownCloud.",
"No app name specified" => "Δεν Ï€ÏοδιοÏίστηκε όνομα εφαÏμογής",
"Help" => "Βοήθεια",
@@ -56,6 +58,27 @@ $TRANSLATIONS = array(
"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>.",
"%s shared »%s« with you" => "Ο %s διαμοιÏάστηκε μαζί σας το »%s«",
+"Sharing %s failed, because the file does not exist" => "Ο διαμοιÏασμός του %s απÎτυχε, γιατί το αÏχείο δεν υπάÏχει",
+"You are not allowed to share %s" => "Δεν επιτÏÎπεται να διαμοιÏάσετε τον πόÏο %s",
+"Sharing %s failed, because the user %s is the item owner" => "Ο διαμοιÏασμός του %s απÎτυχε, γιατί ο χÏήστης %s είναι ο ιδιοκτήτης του αντικειμÎνου",
+"Sharing %s failed, because the user %s does not exist" => "Ο διαμοιÏασμός του %s απÎτυχε, γιατί ο χÏήστης %s δεν υπάÏχει",
+"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Ο διαμοιÏασμός του %s απÎτυχε, γιατί ο χÏήστης %s δεν είναι μÎλος καμίας ομάδας στην οποία ο χÏήστης %s είναι μÎλος",
+"Sharing %s failed, because this item is already shared with %s" => "Ο διαμοιÏασμός του %s απÎτυχε, γιατί το αντικείμενο είναι διαμοιÏασμÎνο ήδη με τον χÏήστη %s",
+"Sharing %s failed, because the group %s does not exist" => "Ο διαμοιÏασμός του %s απÎτυχε, γιατί η ομάδα χÏηστών %s δεν υπάÏχει",
+"Sharing %s failed, because %s is not a member of the group %s" => "Ο διαμοιÏασμός του %s απÎτυχε, γιατί ο χÏήστης %s δεν είναι μÎλος της ομάδας %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Î ÏÎπει να εισάγετε Îναν κωδικό για να δημιουÏγήσετε Îναν δημόσιο σÏνδεσμο. Μόνο Ï€ÏοστατευμÎνοι σÏνδεσμοι επιτÏÎπονται",
+"Sharing %s failed, because sharing with links is not allowed" => "Ο διαμοιÏασμός του %s απÎτυχε, γιατί δεν επιτÏÎπεται ο διαμοιÏασμός με συνδÎσμους",
+"Share type %s is not valid for %s" => "Ο Ï„Ïπος διαμοιÏÎ±ÏƒÎ¼Î¿Ï %s δεν είναι ÎγκυÏος για το %s",
+"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Ο οÏισμός δικαιωμάτων για το %s απÎτυχε, γιατί τα δικαιώματα υπεÏτεÏοÏν αυτά που είναι οÏισμÎνα για το %s",
+"Setting permissions for %s failed, because the item was not found" => "Ο οÏισμός δικαιωμάτων για το %s απÎτυχε, γιατί το αντικείμενο δεν βÏÎθηκε",
+"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Το σÏστημα διαμοιÏÎ±ÏƒÎ¼Î¿Ï %s Ï€ÏÎπει να υλοποιεί την διεπαφή OCP\\Share_Backend",
+"Sharing backend %s not found" => "Το σÏστημα διαμοιÏÎ±ÏƒÎ¼Î¿Ï %s δεν βÏÎθηκε",
+"Sharing backend for %s not found" => "Το σÏστημα διαμοιÏÎ±ÏƒÎ¼Î¿Ï Î³Î¹Î± το %s δεν βÏÎθηκε",
+"Sharing %s failed, because the user %s is the original sharer" => "Ο διαμοιÏασμός του %s απÎτυχε, γιατί το αντικείμενο είναι διαμοιÏασμÎνο αÏχικά από τον χÏήστη %s",
+"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Ο διαμοιÏασμός του %s απÎτυχε, γιατί τα δικαιώματα υπεÏτεÏοÏν αυτά που είναι οÏισμÎνα για το %s",
+"Sharing %s failed, because resharing is not allowed" => "Ο διαμοιÏασμός του %s απÎτυχε, γιατί δεν επιτÏÎπεται ο επαναδιαμοιÏασμός",
+"Sharing %s failed, because the sharing backend for %s could not find its source" => "Ο διαμοιÏασμός του %s απÎτυχε, γιατί δεν ήταν δυνατό να εντοπίσει την πηγή το σÏστημα διαμοιÏÎ±ÏƒÎ¼Î¿Ï Î³Î¹Î± το %s ",
+"Sharing %s failed, because the file could not be found in the file cache" => "Ο διαμοιÏασμός του %s απÎτυχε, γιατί το αÏχείο δεν βÏÎθηκε στην Ï€ÏοσωÏινή αποθήκευση αÏχείων",
"Could not find category \"%s\"" => "Αδυναμία εÏÏεσης κατηγοÏίας \"%s\"",
"seconds ago" => "δευτεÏόλεπτα Ï€Ïιν",
"_%n minute ago_::_%n minutes ago_" => array("","%n λεπτά Ï€Ïιν"),
@@ -67,7 +90,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","%n μήνες Ï€Ïιν"),
"last year" => "τελευταίο χÏόνο",
"years ago" => "χÏόνια Ï€Ïιν",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Μόνο οι παÏακάτων χαÏακτήÏες επιτÏÎπονται σε Îνα όνομα χÏήστη: \"a-z\", \"A-Z\", \"0-9\" και \"_.@-\"",
"A valid username must be provided" => "Î ÏÎπει να δοθεί ÎγκυÏο όνομα χÏήστη",
-"A valid password must be provided" => "Î ÏÎπει να δοθεί ÎγκυÏο συνθηματικό"
+"A valid password must be provided" => "Î ÏÎπει να δοθεί ÎγκυÏο συνθηματικό",
+"The username is already being used" => "Το όνομα χÏήστη είναι κατειλημμÎνο"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php
index 30245d1dd463f42809dba6d6eb2ed5a23ff0728e..9a5e9bb831f187261344d9e250fc634c2c0c2004 100644
--- a/lib/l10n/en_GB.php
+++ b/lib/l10n/en_GB.php
@@ -59,12 +59,14 @@ $TRANSLATIONS = array(
"Please double check the <a href='%s'>installation guides</a>." => "Please double check the <a href='%s'>installation guides</a>.",
"%s shared »%s« with you" => "%s shared \"%s\" with you",
"Sharing %s failed, because the file does not exist" => "Sharing %s failed, because the file does not exist",
+"You are not allowed to share %s" => "You are not allowed to share %s",
"Sharing %s failed, because the user %s is the item owner" => "Sharing %s failed, because the user %s is the item owner",
"Sharing %s failed, because the user %s does not exist" => "Sharing %s failed, because the user %s does not exist",
"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of",
"Sharing %s failed, because this item is already shared with %s" => "Sharing %s failed, because this item is already shared with %s",
"Sharing %s failed, because the group %s does not exist" => "Sharing %s failed, because the group %s does not exist",
"Sharing %s failed, because %s is not a member of the group %s" => "Sharing %s failed, because %s is not a member of the group %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "You need to provide a password to create a public link, only protected links are allowed",
"Sharing %s failed, because sharing with links is not allowed" => "Sharing %s failed, because sharing with links is not allowed",
"Share type %s is not valid for %s" => "Share type %s is not valid for %s",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Setting permissions for %s failed, because the permissions exceed permissions granted to %s",
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
index faf262567c8d691b37331763c9edb2cb702bf7c8..b8ccfee3f2ef428beeeb7af435944b6c14d0969e 100644
--- a/lib/l10n/eo.php
+++ b/lib/l10n/eo.php
@@ -22,7 +22,10 @@ $TRANSLATIONS = array(
"%s enter the database name." => "%s enigu la nomon de la datumbazo.",
"%s you may not use dots in the database name" => "%s vi ne povas uzi punktojn en la nomo de la datumbazo",
"MS SQL username and/or password not valid: %s" => "La uzantonomo de MS SQL aÅ la pasvorto ne validas: %s",
+"MySQL/MariaDB username and/or password not valid" => "La MySQL/MariaDB-uzantonomo kajaÅ pasvorto ne validas.",
"DB Error: \"%s\"" => "Datumbaza eraro: “%sâ€",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "La MySQL/MariaDB-uzanto '%s'@'localhost' jam ekzistas.",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "La MySQL/MariaDB-uzanto '%s'@'%%' jam ekzistas",
"Oracle connection could not be established" => "Konekto al Oracle ne povas stariÄi",
"Oracle username and/or password not valid" => "La uzantonomo de Oracle aÅ la pasvorto ne validas",
"PostgreSQL username and/or password not valid" => "La uzantonomo de PostgreSQL aÅ la pasvorto ne validas",
@@ -31,6 +34,7 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraÅ ne Äuste agordiÄis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco Åajnas rompita.",
"Please double check the <a href='%s'>installation guides</a>." => "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
"%s shared »%s« with you" => "%s kunhavigis “%s†kun vi",
+"You are not allowed to share %s" => "Vi ne permesatas kunhavigi %s",
"Could not find category \"%s\"" => "Ne troviÄis kategorio “%sâ€",
"seconds ago" => "sekundoj antaÅe",
"_%n minute ago_::_%n minutes ago_" => array("","antaÅ %n minutoj"),
@@ -41,6 +45,10 @@ $TRANSLATIONS = array(
"last month" => "lastamonate",
"_%n month ago_::_%n months ago_" => array("","antaÅ %n monatoj"),
"last year" => "lastajare",
-"years ago" => "jaroj antaÅe"
+"years ago" => "jaroj antaÅe",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Nur la jenaj signoj permesatas en uzantonomo: «a-z», «A-Z», «0-9» kaj «_.@-»",
+"A valid username must be provided" => "Valida uzantonomo devas proviziÄi",
+"A valid password must be provided" => "Valida pasvorto devas proviziÄi",
+"The username is already being used" => "La uzantonomo jam uzatas"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index d1c04b09d381bff1aefa531093366cc0bd79a961..11baff8658779d7d4ee47251b7b0051f0cbe48a1 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -59,12 +59,14 @@ $TRANSLATIONS = array(
"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>.",
"%s shared »%s« with you" => "%s ha compatido »%s« contigo",
"Sharing %s failed, because the file does not exist" => "No se pudo compartir %s porque el archivo no existe",
+"You are not allowed to share %s" => "Usted no está autorizado para compartir %s",
"Sharing %s failed, because the user %s is the item owner" => "Compartiendo %s ha fallado, ya que el usuario %s es el dueño del elemento",
"Sharing %s failed, because the user %s does not exist" => "Compartiendo %s ha fallado, ya que el usuario %s no existe",
"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Compartiendo %s ha fallado, ya que el usuario %s no es miembro de algún grupo que %s es miembro",
"Sharing %s failed, because this item is already shared with %s" => "Compartiendo %s ha fallado, ya que este elemento ya está compartido con %s",
"Sharing %s failed, because the group %s does not exist" => "Compartiendo %s ha fallado, ya que el grupo %s no existe",
"Sharing %s failed, because %s is not a member of the group %s" => "Compartiendo %s ha fallado, ya que %s no es miembro del grupo %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Es necesario definir una contraseña para crear un enlace publico. Solo los enlaces protegidos están permitidos",
"Sharing %s failed, because sharing with links is not allowed" => "Compartiendo %s ha fallado, ya que compartir con enlaces no está permitido",
"Share type %s is not valid for %s" => "Compartir tipo %s no es válido para %s",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Configuración de permisos para %s ha fallado, ya que los permisos superan los permisos dados a %s",
diff --git a/lib/l10n/es_BO.php b/lib/l10n/es_BO.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f78e0bce6d7e36688d2913f6affa4c17472a65
--- /dev/null
+++ b/lib/l10n/es_BO.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/es_CO.php b/lib/l10n/es_CO.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f78e0bce6d7e36688d2913f6affa4c17472a65
--- /dev/null
+++ b/lib/l10n/es_CO.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/es_EC.php b/lib/l10n/es_EC.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f78e0bce6d7e36688d2913f6affa4c17472a65
--- /dev/null
+++ b/lib/l10n/es_EC.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/es_PE.php b/lib/l10n/es_PE.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f78e0bce6d7e36688d2913f6affa4c17472a65
--- /dev/null
+++ b/lib/l10n/es_PE.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/es_PY.php b/lib/l10n/es_PY.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f78e0bce6d7e36688d2913f6affa4c17472a65
--- /dev/null
+++ b/lib/l10n/es_PY.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/es_US.php b/lib/l10n/es_US.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f78e0bce6d7e36688d2913f6affa4c17472a65
--- /dev/null
+++ b/lib/l10n/es_US.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/es_UY.php b/lib/l10n/es_UY.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f78e0bce6d7e36688d2913f6affa4c17472a65
--- /dev/null
+++ b/lib/l10n/es_UY.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 079ff3ba472f9bbd9c05af74a81a9ede4c390c5d..4c18742345c0d2d608d282dca239ca35f6c35bd8 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"You are accessing the server from an untrusted domain." => "Sa kasutad serverit usalduseta asukohast",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Palun võta ühendust oma saidi administraatoriga. Kui sa oled ise administraator, siis seadista failis config/config.php sätet \"trusted_domain\". Näidis seadistused leiad failist config/config.sample.php.",
"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Rakendit \"%s\" ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga.",
"No app name specified" => "Ühegi rakendi nime pole määratletud",
"Help" => "Abiinfo",
@@ -58,6 +59,7 @@ $TRANSLATIONS = array(
"Please double check the <a href='%s'>installation guides</a>." => "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
"%s shared »%s« with you" => "%s jagas sinuga »%s«",
"Sharing %s failed, because the file does not exist" => "%s jagamine ebaõnnestus, kuna faili pole olemas",
+"You are not allowed to share %s" => "Sul pole lubatud %s jagada",
"Sharing %s failed, because the user %s is the item owner" => "%s jagamine ebaõnnestus, kuna kuna kasutaja %s on üksuse omanik",
"Sharing %s failed, because the user %s does not exist" => "%s jagamine ebaõnnestus, kuna kasutajat %s pole olemas",
"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "%s jagamine ebaõnnestus, kuna kasutaja %s pole ühegi grupi liige, millede liige on %s",
diff --git a/lib/l10n/fa.php b/lib/l10n/fa.php
index c1c16cf94b48037de9802fda5cd247e65f4f06b0..11912269ba4deb20a651454411a1f3e57a210732 100644
--- a/lib/l10n/fa.php
+++ b/lib/l10n/fa.php
@@ -5,6 +5,8 @@ $TRANSLATIONS = array(
"Settings" => "تنظیمات",
"Users" => "کاربران",
"Admin" => "مدیر",
+"Unknown filetype" => "نوع Ùایل ناشناخته",
+"Invalid image" => "عکس نامعتبر",
"web services under your control" => "سرویس های تØت وب در کنترل شما",
"ZIP download is turned off." => "دانلود به صورت Ùشرده غیر Ùعال است",
"Files need to be downloaded one by one." => "Ùایل ها باید به صورت یکی یکی دانلود شوند",
@@ -34,13 +36,13 @@ $TRANSLATIONS = array(
"%s shared »%s« with you" => "%s به اشتراک گذاشته شده است »%s« توسط شما",
"Could not find category \"%s\"" => "دسته بندی %s یاÙت نشد",
"seconds ago" => "ثانیه‌ها پیش",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n minute ago_::_%n minutes ago_" => array("%n دقیقه قبل"),
+"_%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" => "سال‌های قبل",
"A valid username must be provided" => "نام کاربری صØÛŒØ Ø¨Ø§ÛŒØ¯ وارد شود",
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index 3bfa3fe89162fa5e38bdc590c592ade6b19dbac4..b91152a53a59ee9c5a4ab2a81bc94dc3c20fcd4e 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"You are accessing the server from an untrusted domain." => "Vous accédez au serveur à partir d'un domaine non-approuvé.",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Veuillez contacter votre administrateur. Si vous être l'administrateur de cette instance, il faut configurer la variable \"trusted_domain\" dans le fichier config/config.php. Un exemple de configuration est fournit dans le fichier config/config.sample.php.",
"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",
@@ -58,19 +59,25 @@ $TRANSLATIONS = array(
"Please double check the <a href='%s'>installation guides</a>." => "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
"%s shared »%s« with you" => "%s partagé »%s« avec vous",
"Sharing %s failed, because the file does not exist" => "Le partage de %s a échoué car le fichier n'existe pas",
+"You are not allowed to share %s" => "Vous n'êtes pas autorisé à partager %s",
"Sharing %s failed, because the user %s is the item owner" => "Le partage de %s a échoué car l'utilisateur %s est le propriétaire de l'objet",
"Sharing %s failed, because the user %s does not exist" => "Le partage de %s a échoué car l'utilisateur %s n'existe pas",
"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Le partage de %s a échoué car l'utilisateur %s n'est membre d'aucun groupe auquel %s appartient",
"Sharing %s failed, because this item is already shared with %s" => "Le partage de %s a échoué car cet objet est déjà partagé avec %s",
"Sharing %s failed, because the group %s does not exist" => "Le partage de %s a échoué car le groupe %s n'existe pas",
"Sharing %s failed, because %s is not a member of the group %s" => "Le partage de %s a échoué car %s n'est pas membre du groupe %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Vous devez fournir un mot de passe pour créer un lien public, seul les liens protégés sont autorisées.",
"Sharing %s failed, because sharing with links is not allowed" => "Le partage de %s a échoué car un partage de lien n'est pas permis",
"Share type %s is not valid for %s" => "Le type de partage %s n'est pas valide pour %s",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Le réglage des permissions pour %s a échoué car les permissions dépassent celle accordée à %s",
"Setting permissions for %s failed, because the item was not found" => "Le réglage des permissions pour %s a échoué car l'objet n'a pas été trouvé",
+"Sharing backend %s must implement the interface OCP\\Share_Backend" => "L'emplacement du partage %s doit implémenter l'interface OCP\\Share_Backend",
+"Sharing backend %s not found" => "Emplacement de partage %s introuvable",
+"Sharing backend for %s not found" => "L'emplacement du partage %s est introuvable",
"Sharing %s failed, because the user %s is the original sharer" => "Le partage de %s a échoué car l'utilisateur %s est déjà l'utilisateur à l'origine du partage.",
"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Le partage de %s a échoué car les permissions dépassent les permissions accordées à %s",
"Sharing %s failed, because resharing is not allowed" => "Le partage de %s a échoué car le repartage n'est pas autorisé",
+"Sharing %s failed, because the sharing backend for %s could not find its source" => "Le partage %s a échoué parce que la source n'a été trouvée pour le partage %s.",
"Sharing %s failed, because the file could not be found in the file cache" => "Le partage de %s a échoué car le fichier n'a pas été trouvé dans les fichiers mis en cache.",
"Could not find category \"%s\"" => "Impossible de trouver la catégorie \"%s\"",
"seconds ago" => "il y a quelques secondes",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 3a437ce442d9b415aee79f7449577a6c2ed5817c..695ba1ee36d17845126cdcfdf855c9adbe093eaf 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -59,12 +59,14 @@ $TRANSLATIONS = array(
"Please double check the <a href='%s'>installation guides</a>." => "Volva comprobar as <a href='%s'>guÃas de instalación</a>",
"%s shared »%s« with you" => "%s compartiu «%s» con vostede",
"Sharing %s failed, because the file does not exist" => "Fallou a compartición de %s, o ficheiro non existe",
+"You are not allowed to share %s" => "Non ten permiso para compartir %s",
"Sharing %s failed, because the user %s is the item owner" => "Fallou a compartición de %s, o propietario do elemento é o usuario %s",
"Sharing %s failed, because the user %s does not exist" => "Fallou a compartición de %s, o usuario %s non existe",
"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Fallou a compartición de %s, o usuario %s non é membro de ningún grupo que sexa membro de %s",
"Sharing %s failed, because this item is already shared with %s" => "Fallou a compartición de %s, este elemento xa está compartido con %s",
"Sharing %s failed, because the group %s does not exist" => "Fallou a compartición de %s, o grupo %s non existe",
"Sharing %s failed, because %s is not a member of the group %s" => "Fallou a compartición de %s, %s non é membro do grupo %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Ten que fornecer un contrasinal para a ligazón pública, só se permiten ligazóns protexidas",
"Sharing %s failed, because sharing with links is not allowed" => "Fallou a compartición de %s, non está permitido compartir con ligazóns",
"Share type %s is not valid for %s" => "Non se admite a compartición do tipo %s para %s",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Non é posÃbel estabelecer permisos para %s, os permisos superan os permisos concedidos a %s",
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index db0f99a8de92278c6e79fc369010cdf6d89cac9d..584d9ec4e7fdece41d319688bb5b02d11b5b073f 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -59,12 +59,14 @@ $TRANSLATIONS = array(
"Please double check the <a href='%s'>installation guides</a>." => "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
"%s shared »%s« with you" => "%s ha condiviso «%s» con te",
"Sharing %s failed, because the file does not exist" => "Condivisione di %s non riuscita, poiché il file non esiste",
+"You are not allowed to share %s" => "Non ti è consentito condividere %s",
"Sharing %s failed, because the user %s is the item owner" => "Condivisione di %s non riuscita, poiché l'utente %s è il proprietario dell'oggetto",
"Sharing %s failed, because the user %s does not exist" => "Condivisione di %s non riuscita, poiché l'utente %s non esiste",
"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Condivisione di %s non riuscita, poiché l'utente %s non appartiene ad alcun gruppo di cui %s è membro",
"Sharing %s failed, because this item is already shared with %s" => "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con %s",
"Sharing %s failed, because the group %s does not exist" => "Condivisione di %s non riuscita, poiché il gruppo %s non esiste",
"Sharing %s failed, because %s is not a member of the group %s" => "Condivisione di %s non riuscita, poiché %s non appartiene al gruppo %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Devi fornire una password per creare un collegamento pubblico, sono consentiti solo i collegamenti protetti",
"Sharing %s failed, because sharing with links is not allowed" => "Condivisione di %s non riuscita, poiché i collegamenti non sono consentiti",
"Share type %s is not valid for %s" => "Il tipo di condivisione %s non è valido per %s",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Impostazione permessi per %s non riuscita, poiché i permessi superano i permessi accordati a %s",
diff --git a/lib/l10n/ja.php b/lib/l10n/ja.php
index ec5352242d5ce69d00e8c79658d368f31194b818..195169c6e1cd58da9325e74ef55a808bd04c8310 100644
--- a/lib/l10n/ja.php
+++ b/lib/l10n/ja.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"You are accessing the server from an untrusted domain." => "ã‚ãªãŸã¯ã‚µãƒ¼ãƒã«ã€ä¿¡ç”¨ãŒä»˜ä¸Žã•ã‚Œã¦ã„ãªã„ドメインã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹ã—ã¦ã„ã¾ã™ã€‚",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "管ç†è€…ã«é€£çµ¡ã—ã¦ãã ã•ã„。ã“ã®ã‚µãƒ¼ãƒãƒ¼ã®ç®¡ç†è€…ã®å ´åˆã¯ã€\"trusted_domain\" ã®è¨å®šã‚’ config/config.php ã«è¨å®šã—ã¦ãã ã•ã„。config/config.sample.php ã«ã‚µãƒ³ãƒ—ルã®è¨å®šæ–¹æ³•ãŒè¨˜è¼‰ã—ã¦ã‚ã‚Šã¾ã™ã€‚",
"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => " \"%s\" アプリã¯ã€ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ownCloudã¨äº’æ›æ€§ãŒãªã„ãŸã‚インストールã§ãã¾ã›ã‚“。",
"No app name specified" => "アプリåãŒæœªæŒ‡å®š",
"Help" => "ヘルプ",
@@ -58,11 +59,25 @@ $TRANSLATIONS = array(
"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>インストールガイド</a>をよã確èªã—ã¦ãã ã•ã„。",
"%s shared »%s« with you" => "%s㌠ã‚ãªãŸã¨ »%s«を共有ã—ã¾ã—ãŸ",
"Sharing %s failed, because the file does not exist" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ãã®ã‚ˆã†ãªãƒ•ã‚¡ã‚¤ãƒ«ã¯å˜åœ¨ã—ãªã„ã‹ã‚‰ã§ã™ã€‚",
+"Sharing %s failed, because the user %s is the item owner" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ユーザー %s ãŒã‚¢ã‚¤ãƒ†ãƒ 所有者ã§ã™ã€‚",
+"Sharing %s failed, because the user %s does not exist" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ユーザー %s ãŒå˜åœ¨ã—ã¾ã›ã‚“。",
+"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ユーザー %s ã¯ã©ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«ã‚‚属ã—ã¦ã„ã¾ã›ã‚“。%s ã¯ã€??ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã™ã€‚",
+"Sharing %s failed, because this item is already shared with %s" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ã“ã®ã‚¢ã‚¤ãƒ†ãƒ ã¯æ—¢ã« %s ã§å…±æœ‰ã•ã‚Œã¦ã„ã¾ã™ã€‚",
+"Sharing %s failed, because the group %s does not exist" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚グループ %s ã¯å˜åœ¨ã—ã¾ã›ã‚“。",
+"Sharing %s failed, because %s is not a member of the group %s" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s ã¯ã€ã‚°ãƒ«ãƒ¼ãƒ— %s ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“。",
+"You need to provide a password to create a public link, only protected links are allowed" => "公開用リンクã®ä½œæˆã«ã¯ãƒ‘スワードã®è¨å®šãŒå¿…è¦ã§ã™",
+"Sharing %s failed, because sharing with links is not allowed" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚リンクã§ã®å…±æœ‰ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。",
+"Share type %s is not valid for %s" => "%s ã®å…±æœ‰æ–¹æ³•ã¯ã€%s ã«ã¯é©ç”¨ã§ãã¾ã›ã‚“。",
+"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "%s ã®æ¨©é™è¨å®šã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s ã«è¨±å¯ã•ã‚Œã¦ã„る権é™ã‚’越ãˆã¦ã„ã¾ã™ã€‚",
+"Setting permissions for %s failed, because the item was not found" => "%s ã®æ¨©é™è¨å®šã«å¤±æ•—ã—ã¾ã—ãŸã€‚アイテムãŒå˜åœ¨ã—ã¾ã›ã‚“。",
+"Sharing backend %s must implement the interface OCP\\Share_Backend" => "%s ã®ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ã®å…±æœ‰ã«ã¯ã€OCP\\Share_Backend　インターフェースを実装ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。",
"Sharing backend %s not found" => "共有ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“",
"Sharing backend for %s not found" => "%s ã®ãŸã‚ã®å…±æœ‰ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“",
"Sharing %s failed, because the user %s is the original sharer" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ユーザ %s ãŒå…ƒã€…ã®å…±æœ‰è€…ã§ã‚ã‚‹ã‹ã‚‰ã§ã™ã€‚",
"Sharing %s failed, because the permissions exceed permissions granted to %s" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s ã«ä»˜ä¸Žã•ã‚Œã¦ã„る許å¯ã‚’超ãˆã¦ã„ã‚‹ã‹ã‚‰ã§ã™ã€‚",
"Sharing %s failed, because resharing is not allowed" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚å†å…±æœ‰ãŒè¨±ã•ã‚Œã¦ã„ãªã„ã‹ã‚‰ã§ã™ã€‚",
+"Sharing %s failed, because the sharing backend for %s could not find its source" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚%s ã®ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰å…±æœ‰ã«å¿…è¦ãªã‚½ãƒ¼ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚",
+"Sharing %s failed, because the file could not be found in the file cache" => "%s ã®å…±æœ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ファイルã‚ャッシュã«ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚",
"Could not find category \"%s\"" => "カテゴリ \"%s\" ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ",
"seconds ago" => "数秒å‰",
"_%n minute ago_::_%n minutes ago_" => array("%n 分å‰"),
@@ -74,6 +89,7 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%nヶ月å‰"),
"last year" => "1å¹´å‰",
"years ago" => "å¹´å‰",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "ユーザーåã§åˆ©ç”¨ã§ãã‚‹æ–‡å—列ã¯ã€æ¬¡ã®ã‚‚ã®ã§ã™ï¼š \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
"A valid username must be provided" => "有効ãªãƒ¦ãƒ¼ã‚¶ãƒ¼åを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™",
"A valid password must be provided" => "有効ãªãƒ‘スワードを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™",
"The username is already being used" => "ユーザåã¯ã™ã§ã«ä½¿ã‚ã‚Œã¦ã„ã¾ã™"
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
index fd9b631f23c550752e96de46d91e2361caf22c1c..2b601e1a807166de2b7b596b148b292aa4dae218 100644
--- a/lib/l10n/nb_NO.php
+++ b/lib/l10n/nb_NO.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
+"You are accessing the server from an untrusted domain." => "Du aksesserer serveren fra et ikke tiltrodd domene.",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Vennligst kontakt administratoren. Hvis du er administrator for denne instansen, konfigurer innstillingen \"trusted_domain\" i config/config.php. En eksempelkonfigurasjon er gitt i config/config.sample.php.",
"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "App \"%s\" kan ikke installeres fordi den ikke er kompatibel med denne versjonen av ownCloud.",
"No app name specified" => "Intet app-navn spesifisert",
"Help" => "Hjelp",
@@ -31,6 +33,7 @@ $TRANSLATIONS = array(
"Application is not enabled" => "Applikasjon er ikke påslått",
"Authentication error" => "Autentikasjonsfeil",
"Token expired. Please reload page." => "Symbol utløpt. Vennligst last inn siden på nytt.",
+"Unknown user" => "Ukjent bruker",
"Files" => "Filer",
"Text" => "Tekst",
"Images" => "Bilder",
@@ -39,8 +42,13 @@ $TRANSLATIONS = array(
"%s you may not use dots in the database name" => "%s du kan ikke bruke punktum i databasenavnet",
"MS SQL username and/or password not valid: %s" => "MS SQL-brukernavn og/eller passord ikke gyldig: %s",
"You need to enter either an existing account or the administrator." => "Du må legge inn enten en eksisterende konto eller administratoren.",
+"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB-brukernavn og/eller -passord ikke gyldig",
"DB Error: \"%s\"" => "Databasefeil: \"%s\"",
"Offending command was: \"%s\"" => "Kommandoen som feilet: \"%s\"",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB-bruker '%s'@'localhost' finnes allerede.",
+"Drop this user from MySQL/MariaDB" => "Fjern denne brukeren fra MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB-bruker '%s'@'%%' finnes allerede",
+"Drop this user from MySQL/MariaDB." => "Fjern denne brukeren fra MySQL/MariaDB.",
"Oracle connection could not be established" => "Klarte ikke å etablere forbindelse til Oracle",
"Oracle username and/or password not valid" => "Oracle-brukernavn og/eller passord er ikke gyldig",
"Offending command was: \"%s\", name: %s, password: %s" => "Kommando som feilet: \"%s\", navn: %s, passord: %s",
@@ -50,6 +58,27 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere.",
"Please double check the <a href='%s'>installation guides</a>." => "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
"%s shared »%s« with you" => "%s delte »%s« med deg",
+"Sharing %s failed, because the file does not exist" => "Deling av %s feilet, fordi filen ikke eksisterer",
+"You are not allowed to share %s" => "Du har ikke lov til å dele %s",
+"Sharing %s failed, because the user %s is the item owner" => "Deling av %s feilet, fordi brukeren %s er eier av elementet",
+"Sharing %s failed, because the user %s does not exist" => "Deling av %s feilet, fordi brukeren %s ikke finnes",
+"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Deling av %s feilet, fordi brukeren %s ikke er medlem av noen grupper som %s er medlem av",
+"Sharing %s failed, because this item is already shared with %s" => "Deling av %s feilet, fordi dette elementet allerede er delt med %s",
+"Sharing %s failed, because the group %s does not exist" => "Deling av %s feilet, fordi gruppen %s ikke finnes",
+"Sharing %s failed, because %s is not a member of the group %s" => "Deling av %s feilet, fordi %s ikke er medlem av gruppen %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Du må oppgi et passord for å lage en offentlig lenke. Bare beskyttede lenker er tillatt",
+"Sharing %s failed, because sharing with links is not allowed" => "Deling av %s feilet, fordi deling med lenker ikke er tillatt",
+"Share type %s is not valid for %s" => "Delingstype %s er ikke gyldig for %s",
+"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Setting av tillatelser for %s feilet, fordi tillatelsene gikk ut over tillatelsene som er gitt til %s",
+"Setting permissions for %s failed, because the item was not found" => "Setting av tillatelser for %s feilet, fordi elementet ikke ble funnet",
+"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Delings-server %s må implementere grensesnittet OCP\\Share_Backend",
+"Sharing backend %s not found" => "Delings-server %s ikke funnet",
+"Sharing backend for %s not found" => "Delings-server for %s ikke funnet",
+"Sharing %s failed, because the user %s is the original sharer" => "Deling av %s feilet, fordi brukeren %s er den opprinnelige eieren",
+"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Deling av %s feilet, fordi tillatelsene går utover tillatelsene som er gitt til %s",
+"Sharing %s failed, because resharing is not allowed" => "Deling av %s feilet, fordi videre-deling ikke er tillatt",
+"Sharing %s failed, because the sharing backend for %s could not find its source" => "Deling av %s feilet, fordi delings-serveren for %s ikke kunne finne kilden",
+"Sharing %s failed, because the file could not be found in the file cache" => "Deling av %s feilet, fordi filen ikke ble funnet i fil-mellomlageret",
"Could not find category \"%s\"" => "Kunne ikke finne kategori \"%s\"",
"seconds ago" => "sekunder siden",
"_%n minute ago_::_%n minutes ago_" => array("","%n minutter siden"),
@@ -61,7 +90,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","%n dager siden"),
"last year" => "forrige år",
"years ago" => "Ã¥r siden",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Bare disse tegnene tillates i et brukernavn: \"a-z\", \"A-Z\", \"0-9\" og \"_.@-\"",
"A valid username must be provided" => "Oppgi et gyldig brukernavn",
-"A valid password must be provided" => "Oppgi et gyldig passord"
+"A valid password must be provided" => "Oppgi et gyldig passord",
+"The username is already being used" => "Brukernavnet er allerede i bruk"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index 736de5877c09a55e5c158c88289c54399fff3530..4abd1d5a1b1f192038e1d52d11741893ddbb739f 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -59,12 +59,14 @@ $TRANSLATIONS = array(
"Please double check the <a href='%s'>installation guides</a>." => "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
"%s shared »%s« with you" => "%s deelde »%s« met jou",
"Sharing %s failed, because the file does not exist" => "Delen van %s is mislukt, omdat het bestand niet bestaat",
+"You are not allowed to share %s" => "U bent niet bevoegd om %s te delen",
"Sharing %s failed, because the user %s is the item owner" => "Delen van %s is mislukt, omdat de gebruiker %s de eigenaar is",
"Sharing %s failed, because the user %s does not exist" => "Delen van %s is mislukt, omdat gebruiker %s niet bestaat",
"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Delen van %s is mislukt, omdat gebruiker %s geen lid is van een groep waar %s lid van is",
"Sharing %s failed, because this item is already shared with %s" => "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s",
"Sharing %s failed, because the group %s does not exist" => "Delen van %s is mislukt, omdat groep %s niet bestaat",
"Sharing %s failed, because %s is not a member of the group %s" => "Delen van %s is mislukt, omdat %s geen lid is van groep %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "U moet een wachtwoord verstrekken om een openbare koppeling te maken, alleen beschermde links zijn toegestaan",
"Sharing %s failed, because sharing with links is not allowed" => "Delen van %s is mislukt, omdat het delen met links niet is toegestaan",
"Share type %s is not valid for %s" => "Delen van type %s is niet geldig voor %s",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Instellen van de permissies voor %s is mislukt, omdat de permissies hoger zijn dan de aan %s toegekende permissies",
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index 59fc613dfded3e2dbeacfe05bfe32b28d8ae1dfe..90e98707806a8a9592dfc13f86fa650d5dd36d2c 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -59,12 +59,14 @@ $TRANSLATIONS = array(
"Please double check the <a href='%s'>installation guides</a>." => "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>.",
"%s shared »%s« with you" => "%s Współdzielone »%s« z tobą",
"Sharing %s failed, because the file does not exist" => "Wspóldzielenie %s nie powiodło się. ponieważ plik nie istnieje",
+"You are not allowed to share %s" => "Nie masz uprawnień aby udostępnić %s",
"Sharing %s failed, because the user %s is the item owner" => "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s jest właścicielem elementu",
"Sharing %s failed, because the user %s does not exist" => "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s nie istnieje",
"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s nie jest członkiem żadnej grupy której członkiem jest %s",
"Sharing %s failed, because this item is already shared with %s" => "Współdzielenie %s nie powiodło się, ponieważ element jest już współdzielony z %s",
"Sharing %s failed, because the group %s does not exist" => "Współdzielenie %s nie powiodło się, ponieważ grupa %s nie istnieje",
"Sharing %s failed, because %s is not a member of the group %s" => "Współdzielenie %s nie powiodło się, ponieważ %s nie jest członkiem grupy %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Musisz zapewnić hasło aby utworzyć link publiczny, dozwolone są tylko linki chronione",
"Sharing %s failed, because sharing with links is not allowed" => "Współdzielenie %s nie powiodło się, ponieważ współdzielenie z linkami nie jest dozwolone",
"Share type %s is not valid for %s" => "Typ udziału %s nie jest właściwy dla %s",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Ustawienie uprawnień dla %s nie powiodło się, ponieważ uprawnienia wykraczają poza przydzielone %s",
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index ddb6934357ab763b5774c08bb431f2b47fe1575e..5d8eeb72c8eea671d5e502f581a6a16a65d639d7 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -59,12 +59,14 @@ $TRANSLATIONS = array(
"Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira os <a href='%s'>guias de instalação</a>.",
"%s shared »%s« with you" => "%s compartilhou »%s« com você",
"Sharing %s failed, because the file does not exist" => "Compartilhamento %s falhou, porque o arquivo não existe",
+"You are not allowed to share %s" => "Você não tem permissão para compartilhar %s",
"Sharing %s failed, because the user %s is the item owner" => "Compartilhamento %s falhou, porque o usuário %s é o proprietário do item",
"Sharing %s failed, because the user %s does not exist" => "Compartilhamento %s falhou, porque o usuário %s não existe",
"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Compartilhamento %s falhou, porque o usuário %s não é membro de nenhum grupo que o usuário %s pertença",
"Sharing %s failed, because this item is already shared with %s" => "Compartilhamento %s falhou, porque este Ãtem já está compartilhado com %s",
"Sharing %s failed, because the group %s does not exist" => "Compartilhamento %s falhou, porque o grupo %s não existe",
"Sharing %s failed, because %s is not a member of the group %s" => "Compartilhamento %s falhou, porque %s não é membro do grupo %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Você precisa fornecer uma senha para criar um link público, apenas links protegidos são permitidos",
"Sharing %s failed, because sharing with links is not allowed" => "Compartilhamento %s falhou, porque compartilhamento com links não é permitido",
"Share type %s is not valid for %s" => "Tipo de compartilhamento %s não é válido para %s",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s",
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index ad424933331ca8ff981db1f82691a1ff918a3169..d2257afc7bb5eb945a7c467aec7505139c8054d4 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -56,6 +56,8 @@ $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>.",
"%s shared »%s« with you" => "%s partilhado »%s« consigo",
+"Sharing %s failed, because the user %s is the item owner" => "A partilha %s falhou, porque o utilizador %s é o proprietário",
+"Sharing %s failed, because the user %s does not exist" => "A partilha %s falhou, porque o utilizador %s nao existe",
"Could not find category \"%s\"" => "Não foi encontrado a categoria \"%s\"",
"seconds ago" => "Minutos atrás",
"_%n minute ago_::_%n minutes ago_" => array("","%n minutos atrás"),
@@ -67,7 +69,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","%n meses atrás"),
"last year" => "ano passado",
"years ago" => "anos atrás",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Apenas os seguintes caracteres são permitidos no nome de utilizador: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"",
"A valid username must be provided" => "Um nome de utilizador válido deve ser fornecido",
-"A valid password must be provided" => "Uma password válida deve ser fornecida"
+"A valid password must be provided" => "Uma password válida deve ser fornecida",
+"The username is already being used" => "O nome de utilizador já está a ser usado"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index 2611fcf7a6b33a493d391bb6b258acc7c7b9f690..38532d0b3bc079e30865f1c1a597a12a8a15da4d 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -31,6 +31,7 @@ $TRANSLATIONS = array(
"Application is not enabled" => "Приложение не разрешено",
"Authentication error" => "Ошибка аутентификации",
"Token expired. Please reload page." => "Токен проÑрочен. Перезагрузите Ñтраницу.",
+"Unknown user" => "ÐеизвеÑтный пользователь",
"Files" => "Файлы",
"Text" => "ТекÑÑ‚",
"Images" => "ИзображениÑ",
@@ -39,8 +40,13 @@ $TRANSLATIONS = array(
"%s you may not use dots in the database name" => "%s Ð’Ñ‹ не можете иÑпользовать точки в имени базы данных",
"MS SQL username and/or password not valid: %s" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль MS SQL не подходит: %s",
"You need to enter either an existing account or the administrator." => "Ð’Ñ‹ должны войти или в ÑущеÑтвующий аккаунт или под админиÑтратором.",
+"MySQL/MariaDB username and/or password not valid" => " Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль MySQL/MariaDB не дейÑтвительны.",
"DB Error: \"%s\"" => "Ошибка БД: \"%s\"",
"Offending command was: \"%s\"" => "Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° была: \"%s\"",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "Пользователь MySQL '%s'@'localhost' уже ÑущеÑтвует.",
+"Drop this user from MySQL/MariaDB" => "Удалить данного учаÑтника из MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "Пользователь MySQL '%s'@'%%' уже ÑущеÑтвует.",
+"Drop this user from MySQL/MariaDB." => "Удалить данного учаÑтника из MySQL/MariaDB.",
"Oracle connection could not be established" => "Ñоединение Ñ Oracle не может быть уÑтановлено",
"Oracle username and/or password not valid" => "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/или пароль Oracle",
"Offending command was: \"%s\", name: %s, password: %s" => "Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° была: \"%s\", имÑ: %s, пароль: %s",
@@ -50,6 +56,15 @@ $TRANSLATIONS = array(
"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>.",
"%s shared »%s« with you" => "%s поделилÑÑ Â»%s« Ñ Ð²Ð°Ð¼Ð¸",
+"Sharing %s failed, because the user %s is the item owner" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, пользователь %s уже ÑвлÑетÑÑ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†ÐµÐ¼",
+"Sharing %s failed, because the user %s does not exist" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, пользователь %s не ÑущеÑтвует.",
+"Sharing %s failed, because this item is already shared with %s" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s ,в виду того что, объект уже находитьÑÑ Ð² общем доÑтупе Ñ %s",
+"Sharing %s failed, because the group %s does not exist" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, группа %s не ÑущеÑтвует.",
+"Sharing %s failed, because %s is not a member of the group %s" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, %s не ÑвлÑетÑÑ Ñ‡Ð»ÐµÐ½Ð¾Ð¼ группы %s",
+"Sharing %s failed, because sharing with links is not allowed" => "Ðе удалоÑÑŒ уÑтановить общий доÑтуп Ð´Ð»Ñ %s, потому что обмен Ñо ÑÑылками не допуÑкаетÑÑ",
+"Share type %s is not valid for %s" => "Такой втд общего доÑтупа как %s не допуÑтим Ð´Ð»Ñ %s",
+"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "ÐаÑтройка прав доÑтупа Ð´Ð»Ñ %s невозможна, поÑкольку права доÑтупа превышают предоÑтавленные права доÑтупа %s",
+"Setting permissions for %s failed, because the item was not found" => "Ðе удалоÑÑŒ произвеÑти наÑтройку прав доÑтупа Ð´Ð»Ñ %s , Ñлемент не был найден.",
"Could not find category \"%s\"" => "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ \"%s\" не найдена",
"seconds ago" => "неÑколько Ñекунд назад",
"_%n minute ago_::_%n minutes ago_" => array("%n минута назад","%n минуты назад","%n минут назад"),
@@ -61,7 +76,9 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n меÑÑц назад","%n меÑÑца назад","%n меÑÑцев назад"),
"last year" => "в прошлом году",
"years ago" => "неÑколько лет назад",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Только Ñледующие Ñимволы допуÑкаютÑÑ Ð² имени пользователÑ: \"a-z\", \"A-Z\", \"0-9\", и \"_.@-\"",
"A valid username must be provided" => "Укажите правильное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ",
-"A valid password must be provided" => "Укажите валидный пароль"
+"A valid password must be provided" => "Укажите валидный пароль",
+"The username is already being used" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐ¶Ðµ иÑпользуетÑÑ"
);
$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/sl.php b/lib/l10n/sl.php
index eeaa0ddf96b7b87270ab1ac23609307945b3f45f..083f966ded42115cb2049efcd2825f2fe3321661 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -56,6 +56,7 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Spletni stražnik Å¡e ni ustrezno nastavljen in ne omogoÄa usklajevanja, saj je nastavitev WebDAV okvarjena.",
"Please double check the <a href='%s'>installation guides</a>." => "Preverite <a href='%s'>navodila namestitve</a>.",
"%s shared »%s« with you" => "%s je omogoÄil souporabo »%s«",
+"Sharing %s failed, because the file does not exist" => "Souporaba %s je spodletela, ker ta datoteka ne obstaja",
"Sharing %s failed, because the user %s is the item owner" => "Nastavljanje souporabe %s je spodletelo, ker je uporabnik %s lastnik predmeta.",
"Sharing %s failed, because the user %s does not exist" => "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ne obstaja.",
"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni Älan nobene skupine, v kateri je tudi uporabnik %s.",
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index ba63531ad766fd2379259c5e4428e28e3d187d32..c30a09997743ca9d8f9df8b17f272a8b757ce341 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -1,5 +1,7 @@
<?php
$TRANSLATIONS = array(
+"You are accessing the server from an untrusted domain." => "Du ansluter till servern från en osäker domän.",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Vänligen kontakta din administratör. Om du är en administratör, konfigurera inställningen \"trusted_domain\" i config/config.php. En exempelkonfiguration finns i tillgänglig i config/config.sample.php.",
"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",
@@ -56,12 +58,15 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
"Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
"%s shared »%s« with you" => "%s delade »%s« med dig",
+"Sharing %s failed, because the file does not exist" => "Delning av %s misslyckades på grund av att filen inte existerar",
+"You are not allowed to share %s" => "Du har inte rätt att dela %s",
"Sharing %s failed, because the user %s is the item owner" => "Delning %s misslyckades därför att användaren %s är den som äger objektet",
"Sharing %s failed, because the user %s does not exist" => "Delning %s misslyckades därför att användaren %s inte existerar",
"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Delning %s misslyckades därför att användaren %s inte är medlem i någon utav de grupper som %s är medlem i",
"Sharing %s failed, because this item is already shared with %s" => "Delning %s misslyckades därför att objektet redan är delat med %s",
"Sharing %s failed, because the group %s does not exist" => "Delning %s misslyckades därför att gruppen %s inte existerar",
"Sharing %s failed, because %s is not a member of the group %s" => "Delning %s misslyckades därför att %s inte ingår i gruppen %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Du måste ange ett lösenord för att skapa en offentlig länk, endast skyddade länkar är tillåtna",
"Sharing %s failed, because sharing with links is not allowed" => "Delning %s misslyckades därför att delning utav länkar inte är tillåtet",
"Share type %s is not valid for %s" => "Delningstyp %s är inte giltig för %s",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Misslyckades att sätta rättigheter för %s därför att rättigheterna överskrider de som är tillåtna för %s",
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 3ff2a70bdefc1f7a466e52dbe2c6149add08b9e7..a8c48134cf25cea883c9fff5d5cc6114bb094274 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -2,7 +2,7 @@
$TRANSLATIONS = array(
"You are accessing the server from an untrusted domain." => "Sunucuya güvenilmeyen bir alan adından ulaşıyorsunuz.",
"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Lütfen yöneticiniz ile iletişime geçin. Eğer bu örneğin bir yöneticisi iseniz, config/config.php dosyası içerisindeki \"trusted_domain\" ayarını yapılandırın. Bu yapılandırmanın bir örneği config/config.sample.php dosyasında verilmiştir.",
-"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "ownCloud yazılımının bu sürümü ile uyumlu olmadığı için \"%s\" uygulaması kurulamaz.",
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "ownCloud yazılımının bu sürümü ile uyumlu olmadığı için \"%s\" uygulaması kurulamıyor.",
"No app name specified" => "Uygulama adı belirtilmedi",
"Help" => "Yardım",
"Personal" => "KiÅŸisel",
@@ -12,27 +12,27 @@ $TRANSLATIONS = array(
"Failed to upgrade \"%s\"." => "\"%s\" yükseltme başarısız oldu.",
"Unknown filetype" => "Bilinmeyen dosya türü",
"Invalid image" => "Geçersiz resim",
-"web services under your control" => "kontrolünüzün altındaki web hizmetleri",
+"web services under your control" => "denetiminizdeki web hizmetleri",
"ZIP download is turned off." => "ZIP indirmeleri kapatıldı.",
"Files need to be downloaded one by one." => "Dosyaların tek tek indirilmesi gerekmektedir.",
"Back to Files" => "Dosyalara Dön",
"Selected files too large to generate zip file." => "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyük.",
"Please download the files separately in smaller chunks or kindly ask your administrator." => "Dosyaları ayrı ayrı, küçük parçalar halinde indirin veya yöneticinizden yardım isteyin. ",
"No source specified when installing app" => "Uygulama kurulurken bir kaynak belirtilmedi",
-"No href specified when installing app from http" => "Uygulama kuruluyorken http'de href belirtilmedi",
+"No href specified when installing app from http" => "Uygulama http'den kurulurken href belirtilmedi",
"No path specified when installing app from local file" => "Uygulama yerel dosyadan kurulurken dosya yolu belirtilmedi",
"Archives of type %s are not supported" => "%s arşiv türü desteklenmiyor",
-"Failed to open archive when installing app" => "Uygulama kuruluyorken arşiv dosyası açılamadı",
+"Failed to open archive when installing app" => "Uygulama kurulurken arşiv dosyası açılamadı",
"App does not provide an info.xml file" => "Uygulama info.xml dosyası sağlamıyor",
-"App can't be installed because of not allowed code in the App" => "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor.",
-"App can't be installed because it is not compatible with this version of ownCloud" => "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor.",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Uygulama kurulamıyor. Çünkü \"birlikte gelmeyen\" uygulamalar için <shipped>true</shipped> etiketi içeriyor",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Uygulama kurulamıyor çünkü info.xml/version ile uygulama markette belirtilen sürüm aynı değil",
+"App can't be installed because of not allowed code in the App" => "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor",
+"App can't be installed because it is not compatible with this version of ownCloud" => "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Uygulama, birlikte gelmeyen uygulama olmasına rağmen <shipped>true</shipped> etiketi içerdiği için kurulamıyor",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Uygulama info.xml/version ile uygulama marketinde belirtilen sürüm aynı olmadığından kurulamıyor",
"App directory already exists" => "Uygulama dizini zaten mevcut",
"Can't create app folder. Please fix permissions. %s" => "Uygulama dizini oluşturulamıyor. Lütfen izinleri düzeltin. %s",
-"Application is not enabled" => "Uygulama etkinleÅŸtirilmedi",
+"Application is not enabled" => "Uygulama etkin deÄŸil",
"Authentication error" => "Kimlik doğrulama hatası",
-"Token expired. Please reload page." => "Jetonun süresi geçti. Lütfen sayfayı yenileyin.",
+"Token expired. Please reload page." => "Belirteç süresi geçti. Lütfen sayfayı yenileyin.",
"Unknown user" => "Bilinmeyen kullanıcı",
"Files" => "Dosyalar",
"Text" => "Metin",
@@ -59,12 +59,14 @@ $TRANSLATIONS = array(
"Please double check the <a href='%s'>installation guides</a>." => "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin.",
"%s shared »%s« with you" => "%s sizinle »%s« paylaşımında bulundu",
"Sharing %s failed, because the file does not exist" => "%s paylaşımı, dosya mevcut olmadığından başarısız oldu",
+"You are not allowed to share %s" => "%s paylaşımını yapma izniniz yok",
"Sharing %s failed, because the user %s is the item owner" => "%s paylaşımı, %s öge sahibi olduğundan başarısız oldu",
"Sharing %s failed, because the user %s does not exist" => "%s paylaşımı, %s kullanıcısı mevcut olmadığından başarısız oldu",
"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "%s paylaşımı, %s kullanıcısının %s üyeliklerinden birine sahip olmadığından başarısız oldu",
"Sharing %s failed, because this item is already shared with %s" => "%s paylaşımı, %s ile zaten paylaşıldığından dolayı başarısız oldu",
"Sharing %s failed, because the group %s does not exist" => "%s paylaşımı, %s grubu mevcut olmadığından başarısız oldu",
"Sharing %s failed, because %s is not a member of the group %s" => "%s paylaşımı, %s kullanıcısı %s grup üyesi olmadığından başarısız oldu",
+"You need to provide a password to create a public link, only protected links are allowed" => "Herkese açık bir bağlantı oluşturmak için bir parola belirtmeniz gerekiyor. Sadece korunmuş bağlantılara izin verilmektedir",
"Sharing %s failed, because sharing with links is not allowed" => "%s paylaşımı, bağlantılar ile paylaşım izin verilmediğinden başarısız oldu",
"Share type %s is not valid for %s" => "%s paylaşım türü %s için geçerli değil",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "%s için izinler, izinler %s için verilen izinleri aştığından dolayı ayarlanamadı",
diff --git a/lib/l10n/ur_PK.php b/lib/l10n/ur_PK.php
index 7dc967ccd9323ff236cccbb31a49b183e43d6c1a..458414e9da2f347a37178cb3897e7836b3de30c6 100644
--- a/lib/l10n/ur_PK.php
+++ b/lib/l10n/ur_PK.php
@@ -5,10 +5,18 @@ $TRANSLATIONS = array(
"Settings" => "سیٹینگز",
"Users" => "یوزرز",
"Admin" => "ایڈمن",
+"Unknown filetype" => "غیر معررو٠قسم Ú©ÛŒ Ùائل",
+"Invalid image" => "غلط تصویر",
"web services under your control" => "آپ کے اختیار میں ویب سروسیز",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
+"seconds ago" => "سیکنڈز Ù¾ÛÙ„Û’",
+"_%n minute ago_::_%n minutes ago_" => array("","%n منٹس Ù¾ÛÙ„Û’"),
"_%n hour ago_::_%n hours ago_" => array("",""),
+"today" => "آج",
+"yesterday" => "Ú©Ù„",
"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months 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/private/app.php b/lib/private/app.php
index e672df7b32ab8dde0cd7323f1a4ac44edc8f534c..fe1fa6a0d1aa1bae851b3e6e169accdecf3b106a 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -42,7 +42,7 @@ class OC_App{
static private $altLogin = array();
/**
- * @brief clean the appid
+ * clean the appid
* @param string|boolean $app Appid that needs to be cleaned
* @return string
*/
@@ -51,7 +51,7 @@ class OC_App{
}
/**
- * @brief loads all apps
+ * loads all apps
* @param array $types
* @return bool
*
@@ -192,7 +192,7 @@ class OC_App{
}
/**
- * @brief checks whether or not an app is enabled
+ * checks whether or not an app is enabled
* @param string $app app
* @return bool
*
@@ -207,7 +207,7 @@ class OC_App{
}
/**
- * @brief enables an app
+ * enables an app
* @param mixed $app app
* @throws \Exception
* @return void
@@ -257,7 +257,7 @@ class OC_App{
}
/**
- * @brief disables an app
+ * disables an app
* @param string $app app
* @return null
*
@@ -271,7 +271,7 @@ class OC_App{
}
/**
- * @brief adds an entry to the navigation
+ * adds an entry to the navigation
* @param array $data array containing the data
* @return bool
*
@@ -293,7 +293,7 @@ class OC_App{
}
/**
- * @brief marks a navigation entry as active
+ * marks a navigation entry as active
* @param string $id id of the entry
* @return bool
*
@@ -307,9 +307,9 @@ class OC_App{
}
/**
- * @brief Get the navigation entries for the $app
+ * Get the navigation entries for the $app
* @param string $app app
- * @return array of the $data added with addNavigationEntry
+ * @return array an array of the $data added with addNavigationEntry
*
* Warning: destroys the existing entries
*/
@@ -323,7 +323,7 @@ class OC_App{
}
/**
- * @brief gets the active Menu entry
+ * gets the active Menu entry
* @return string id or empty string
*
* This function returns the id of the active navigation entry (set by
@@ -334,7 +334,7 @@ class OC_App{
}
/**
- * @brief Returns the Settings Navigation
+ * Returns the Settings Navigation
* @return string
*
* This function returns an array containing all settings pages added. The
@@ -559,7 +559,7 @@ class OC_App{
/**
- * @brief Read all app metadata from the info.xml file
+ * Read all app metadata from the info.xml file
* @param string $appid id of the app or the path of the info.xml file
* @param boolean $path (optional)
* @return array
@@ -626,7 +626,7 @@ class OC_App{
}
/**
- * @brief Returns the navigation
+ * Returns the navigation
* @return array
*
* This function returns an array containing all entries added. The
@@ -717,8 +717,8 @@ class OC_App{
}
/**
- * @brief: get a list of all apps in the apps folder
- * @return array or app names (string IDs)
+ * get a list of all apps in the apps folder
+ * @return array an array of app names (string IDs)
* @todo: change the name of this method to getInstalledApps, which is more accurate
*/
public static function getAllApps() {
@@ -750,7 +750,7 @@ class OC_App{
}
/**
- * @brief: Lists all apps, this is used in apps.php
+ * Lists all apps, this is used in apps.php
* @return array
*/
public static function listAllApps() {
@@ -824,7 +824,7 @@ class OC_App{
}
/**
- * @brief: Internal custom sort funtion to bring the app into the right order. Should only be called by listAllApps
+ * Internal custom sort funtion to bring the app into the right order. Should only be called by listAllApps
* @return array
*/
private static function customSort($a, $b) {
@@ -854,7 +854,7 @@ class OC_App{
}
/**
- * @brief: get a list of all apps on apps.owncloud.com
+ * get a list of all apps on apps.owncloud.com
* @return array, multi-dimensional array of apps.
* Keys: id, name, type, typename, personid, license, detailpage, preview, changed, description
*/
@@ -959,8 +959,14 @@ class OC_App{
* ownCloud version. disable them if not.
* This is important if you upgrade ownCloud and have non ported 3rd
* party apps installed.
+ *
+ * @param array $apps optional app id list to check, uses all enabled apps
+ * when not specified
+ *
+ * @return array containing the list of ids of the disabled apps
*/
public static function checkAppsRequirements($apps = array()) {
+ $disabledApps = array();
if (empty($apps)) {
$apps = OC_App::getEnabledApps();
}
@@ -968,49 +974,91 @@ class OC_App{
foreach($apps as $app) {
// check if the app is compatible with this version of ownCloud
$info = OC_App::getAppInfo($app);
- if(!isset($info['require']) or !self::isAppVersionCompatible($version, $info['require'])) {
+ if(!self::isAppCompatible($version, $info)) {
OC_Log::write('core',
'App "'.$info['name'].'" ('.$app.') can\'t be used because it is'
.' not compatible with this version of ownCloud',
OC_Log::ERROR);
OC_App::disable( $app );
OC_Hook::emit('update', 'success', 'Disabled '.$info['name'].' app because it is not compatible');
+ $disabledApps[] = $app;
}
}
+ return $disabledApps;
}
+ /**
+ * Ajust the number of version parts of $version1 to match
+ * the number of version parts of $version2.
+ *
+ * @param string $version1 version to adjust
+ * @param string $version2 version to take the number of parts from
+ * @return string shortened $version1
+ */
+ private static function adjustVersionParts($version1, $version2) {
+ $version1 = explode('.', $version1);
+ $version2 = explode('.', $version2);
+ // reduce $version1 to match the number of parts in $version2
+ while (count($version1) > count($version2)) {
+ array_pop($version1);
+ }
+ // if $version1 does not have enough parts, add some
+ while (count($version1) < count($version2)) {
+ $version1[] = '0';
+ }
+ return implode('.', $version1);
+ }
/**
- * 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
- * major.minor.bugfix
+ * Check whether the current ownCloud version matches the given
+ * application's version requirements.
+ *
+ * The comparison is made based on the number of parts that the
+ * app info version has. For example for ownCloud 6.0.3 if the
+ * app info version is expecting version 6.0, the comparison is
+ * made on the first two parts of the ownCloud version.
+ * This means that it's possible to specify "requiremin" => 6
+ * and "requiremax" => 6 and it will still match ownCloud 6.0.3.
+ *
+ * @param string $ocVersion ownCloud version to check against
+ * @param array $appInfo app info (from xml)
+ *
* @return boolean true if compatible, otherwise false
*/
- public static function isAppVersionCompatible($owncloudVersions, $appRequired){
- $appVersions = explode('.', $appRequired);
+ public static function isAppCompatible($ocVersion, $appInfo){
+ $requireMin = '';
+ $requireMax = '';
+ if (isset($appInfo['requiremin'])) {
+ $requireMin = $appInfo['requiremin'];
+ } else if (isset($appInfo['require'])) {
+ $requireMin = $appInfo['require'];
+ }
+
+ if (isset($appInfo['requiremax'])) {
+ $requireMax = $appInfo['requiremax'];
+ }
- for($i=0; $i<count($appVersions); $i++){
- $appVersion = (int) $appVersions[$i];
+ if (is_array($ocVersion)) {
+ $ocVersion = implode('.', $ocVersion);
+ }
- if(isset($owncloudVersions[$i])){
- $owncloudVersion = $owncloudVersions[$i];
- } else {
- $owncloudVersion = 0;
- }
+ if (!empty($requireMin)
+ && version_compare(self::adjustVersionParts($ocVersion, $requireMin), $requireMin, '<')
+ ) {
- if($owncloudVersion < $appVersion){
- return false;
- } elseif ($owncloudVersion > $appVersion) {
- return true;
- }
+ return false;
+ }
+
+ if (!empty($requireMax)
+ && version_compare(self::adjustVersionParts($ocVersion, $requireMax), $requireMax, '>')
+ ) {
+
+ return false;
}
return true;
}
-
/**
* get the installed version of all apps
*/
@@ -1054,7 +1102,7 @@ class OC_App{
// check if the app is compatible with this version of ownCloud
$info = self::getAppInfo($app);
$version=OC_Util::getVersion();
- if(!isset($info['require']) or !self::isAppVersionCompatible($version, $info['require'])) {
+ if(!self::isAppCompatible($version, $info)) {
throw new \Exception(
$l->t("App \"%s\" can't be installed because it is not compatible with this version of ownCloud.",
array($info['name'])
diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php
index 0cd6b3bc35bc3f6616ec14ee2556c5446e8bf43f..e2a961b1d6d90ce16e178793b193434e945cbe6e 100644
--- a/lib/private/appconfig.php
+++ b/lib/private/appconfig.php
@@ -89,8 +89,8 @@ class AppConfig implements \OCP\IAppConfig {
}
/**
- * @brief Get all apps using the config
- * @return array with app ids
+ * Get all apps using the config
+ * @return array an array of app ids
*
* This function returns a list of all apps that have at least one
* entry in the appconfig table.
@@ -107,9 +107,9 @@ class AppConfig implements \OCP\IAppConfig {
}
/**
- * @brief Get the available keys for an app
+ * Get the available keys for an app
* @param string $app the app we are looking for
- * @return array with key names
+ * @return array an array of key names
*
* This function gets all keys of an app. Please note that the values are
* not returned.
@@ -122,7 +122,7 @@ class AppConfig implements \OCP\IAppConfig {
}
/**
- * @brief Gets the config value
+ * Gets the config value
* @param string $app app
* @param string $key key
* @param string $default = null, default value if the key does not exist
@@ -141,7 +141,7 @@ class AppConfig implements \OCP\IAppConfig {
}
/**
- * @brief check if a key is set in the appconfig
+ * check if a key is set in the appconfig
* @param string $app
* @param string $key
* @return bool
@@ -152,7 +152,7 @@ class AppConfig implements \OCP\IAppConfig {
}
/**
- * @brief sets a value in the appconfig
+ * sets a value in the appconfig
* @param string $app app
* @param string $key key
* @param string $value value
@@ -185,7 +185,7 @@ class AppConfig implements \OCP\IAppConfig {
}
/**
- * @brief Deletes a key
+ * Deletes a key
* @param string $app app
* @param string $key key
* @return boolean|null
@@ -202,7 +202,7 @@ class AppConfig implements \OCP\IAppConfig {
}
/**
- * @brief Remove app from appconfig
+ * Remove app from appconfig
* @param string $app app
* @return boolean|null
*
diff --git a/lib/private/appframework/app.php b/lib/private/appframework/app.php
index 3b13194862d105dc41af78b451b6fcbd0ec08dd7..baf52d02054b17ff218b6bf6f93fda174eb456df 100644
--- a/lib/private/appframework/app.php
+++ b/lib/private/appframework/app.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/private/appframework/core/api.php b/lib/private/appframework/core/api.php
index e7269373bb01dc7bbe321018d556ed0fafec371c..ba6b9f95cb2ebdd59efe4d6e41f65dc2e6632fef 100644
--- a/lib/private/appframework/core/api.php
+++ b/lib/private/appframework/core/api.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -119,7 +119,7 @@ class API implements IApi{
}
/**
- * @brief connects a function to a hook
+ * 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
@@ -133,10 +133,10 @@ class API implements IApi{
}
/**
- * @brief Emits a signal. To get data from the slot use references!
+ * 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
+ * @param array $params default: array() array with additional data
* @return bool, true if slots exists or false if not
*/
public function emitHook($signalClass, $signalName, $params = array()) {
@@ -144,7 +144,7 @@ class API implements IApi{
}
/**
- * @brief clear hooks
+ * clear hooks
* @param string $signalClass
* @param string $signalName
*/
diff --git a/lib/private/appframework/db/db.php b/lib/private/appframework/db/db.php
new file mode 100644
index 0000000000000000000000000000000000000000..fc77a38f814a845de773bb7153ff6c2f2708f39a
--- /dev/null
+++ b/lib/private/appframework/db/db.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.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\Db;
+
+use \OCP\IDb;
+
+
+/**
+ * Small Facade for being able to inject the database connection for tests
+ */
+class Db implements IDb {
+
+
+ /**
+ * 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 \OC_DB_StatementWrapper prepared SQL query
+ */
+ public function prepareQuery($sql, $limit=null, $offset=null){
+ return \OCP\DB::prepare($sql, $limit, $offset);
+ }
+
+
+ /**
+ * 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 getInsertId($tableName){
+ return \OCP\DB::insertid($tableName);
+ }
+
+
+}
diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index e478225a53d0be8e326508a14016ceb3f4d32e67..61a2333eceeb38d4ddad732ebd50098b869d2fc5 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -30,8 +30,10 @@ use OC\AppFramework\Http\Dispatcher;
use OC\AppFramework\Core\API;
use OC\AppFramework\Middleware\MiddlewareDispatcher;
use OC\AppFramework\Middleware\Security\SecurityMiddleware;
+use OC\AppFramework\Middleware\Security\CORSMiddleware;
use OC\AppFramework\Utility\SimpleContainer;
use OC\AppFramework\Utility\TimeFactory;
+use OC\AppFramework\Utility\ControllerMethodReflector;
use OCP\AppFramework\IApi;
use OCP\AppFramework\IAppContainer;
use OCP\AppFramework\Middleware;
@@ -80,7 +82,12 @@ class DIContainer extends SimpleContainer implements IAppContainer{
});
$this['Dispatcher'] = $this->share(function($c) {
- return new Dispatcher($c['Protocol'], $c['MiddlewareDispatcher']);
+ return new Dispatcher(
+ $c['Protocol'],
+ $c['MiddlewareDispatcher'],
+ $c['ControllerMethodReflector'],
+ $c['Request']
+ );
});
@@ -89,13 +96,30 @@ class DIContainer extends SimpleContainer implements IAppContainer{
*/
$app = $this;
$this['SecurityMiddleware'] = $this->share(function($c) use ($app){
- return new SecurityMiddleware($app, $c['Request']);
+ return new SecurityMiddleware(
+ $c['Request'],
+ $c['ControllerMethodReflector'],
+ $app->getServer()->getNavigationManager(),
+ $app->getServer()->getURLGenerator(),
+ $app->getServer()->getLogger(),
+ $c['AppName'],
+ $app->isLoggedIn(),
+ $app->isAdminUser()
+ );
+ });
+
+ $this['CORSMiddleware'] = $this->share(function($c) {
+ return new CORSMiddleware(
+ $c['Request'],
+ $c['ControllerMethodReflector']
+ );
});
$middleWares = &$this->middleWares;
$this['MiddlewareDispatcher'] = $this->share(function($c) use (&$middleWares) {
$dispatcher = new MiddlewareDispatcher();
$dispatcher->registerMiddleware($c['SecurityMiddleware']);
+ $dispatcher->registerMiddleware($c['CORSMiddleware']);
foreach($middleWares as $middleWare) {
$dispatcher->registerMiddleware($c[$middleWare]);
@@ -112,6 +136,9 @@ class DIContainer extends SimpleContainer implements IAppContainer{
return new TimeFactory();
});
+ $this['ControllerMethodReflector'] = $this->share(function($c) {
+ return new ControllerMethodReflector();
+ });
}
@@ -168,8 +195,8 @@ class DIContainer extends SimpleContainer implements IAppContainer{
}
/**
- * @param $message
- * @param $level
+ * @param string $message
+ * @param string $level
* @return mixed
*/
function log($message, $level) {
diff --git a/lib/private/appframework/http.php b/lib/private/appframework/http.php
index 65d926105f1594b97912bd59daa93d70ee0032d2..2b1387af715dba9dfea927a7233d62bdf8ba336d 100644
--- a/lib/private/appframework/http.php
+++ b/lib/private/appframework/http.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -33,7 +33,7 @@ class Http extends BaseHttp {
protected $headers;
/**
- * @param $_SERVER $server
+ * @param array $server $_SERVER
* @param string $protocolVersion the http version to use defaults to HTTP/1.1
*/
public function __construct($server, $protocolVersion='HTTP/1.1') {
diff --git a/lib/private/appframework/http/dispatcher.php b/lib/private/appframework/http/dispatcher.php
index a2afb53f0fab86ef0e005e96652372bbfa616a36..442e33ee726944059af0122af4d501311bd36aa8 100644
--- a/lib/private/appframework/http/dispatcher.php
+++ b/lib/private/appframework/http/dispatcher.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -26,7 +26,11 @@ namespace OC\AppFramework\Http;
use \OC\AppFramework\Middleware\MiddlewareDispatcher;
use \OC\AppFramework\Http;
+use \OC\AppFramework\Utility\ControllerMethodReflector;
+
use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\Response;
+use OCP\IRequest;
/**
@@ -36,17 +40,25 @@ class Dispatcher {
private $middlewareDispatcher;
private $protocol;
-
+ private $reflector;
+ private $request;
/**
* @param Http $protocol the http protocol with contains all status headers
* @param MiddlewareDispatcher $middlewareDispatcher the dispatcher which
* runs the middleware
+ * @param ControllerMethodReflector the reflector that is used to inject
+ * the arguments for the controller
+ * @param IRequest $request the incoming request
*/
public function __construct(Http $protocol,
- MiddlewareDispatcher $middlewareDispatcher) {
+ MiddlewareDispatcher $middlewareDispatcher,
+ ControllerMethodReflector $reflector,
+ IRequest $request) {
$this->protocol = $protocol;
$this->middlewareDispatcher = $middlewareDispatcher;
+ $this->reflector = $reflector;
+ $this->request = $request;
}
@@ -63,10 +75,13 @@ class Dispatcher {
$out = array(null, array(), null);
try {
+ // prefill reflector with everything thats needed for the
+ // middlewares
+ $this->reflector->reflect($controller, $methodName);
$this->middlewareDispatcher->beforeController($controller,
$methodName);
- $response = $controller->$methodName();
+ $response = $this->executeController($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
@@ -98,4 +113,70 @@ class Dispatcher {
}
+ /**
+ * Uses the reflected parameters, types and request parameters to execute
+ * the controller
+ * @param Controller $controller the controller to be executed
+ * @param string $methodName the method on the controller that should be executed
+ * @return Response
+ */
+ private function executeController($controller, $methodName) {
+ $arguments = array();
+
+ // valid types that will be casted
+ $types = array('int', 'integer', 'bool', 'boolean', 'float');
+
+ foreach($this->reflector->getParameters() as $param => $default) {
+
+ // try to get the parameter from the request object and cast
+ // it to the type annotated in the @param annotation
+ $value = $this->request->getParam($param, $default);
+ $type = $this->reflector->getType($param);
+
+ // if this is submitted using GET or a POST form, 'false' should be
+ // converted to false
+ if(($type === 'bool' || $type === 'boolean') &&
+ $value === 'false' &&
+ (
+ $this->request->method === 'GET' ||
+ strpos($this->request->getHeader('Content-Type'),
+ 'application/x-www-form-urlencoded') !== false
+ )
+ ) {
+ $value = false;
+
+ } elseif(in_array($type, $types)) {
+ settype($value, $type);
+ }
+
+ $arguments[] = $value;
+ }
+
+ $response = call_user_func_array(array($controller, $methodName), $arguments);
+
+ // format response if not of type response
+ if(!($response instanceof Response)) {
+
+ // get format from the url format or request format parameter
+ $format = $this->request->getParam('format');
+
+ // if none is given try the first Accept header
+ if($format === null) {
+ $header = $this->request->getHeader('Accept');
+ $formats = explode(',', $header);
+
+ if($header !== null && count($formats) > 0) {
+ $accept = strtolower(trim($formats[0]));
+ $format = str_replace('application/', '', $accept);
+ } else {
+ $format = 'json';
+ }
+ }
+
+ $response = $controller->buildResponse($response, $format);
+ }
+
+ return $response;
+ }
+
}
diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php
index 643fa685adcd72e7735fc4eaad30ab5ccdb8831a..8b68ca486ff6fc19d1c37d6b5c2634c5419214f7 100644
--- a/lib/private/appframework/http/request.php
+++ b/lib/private/appframework/http/request.php
@@ -3,7 +3,9 @@
* ownCloud - Request
*
* @author Thomas Tanghus
+ * @author Bernhard Posselt
* @copyright 2013 Thomas Tanghus (thomas@tanghus.net)
+ * @copyright 2014 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/private/appframework/middleware/middlewaredispatcher.php b/lib/private/appframework/middleware/middlewaredispatcher.php
index 598743e523f97ca290ef5cd7ff242db73e510865..dcb63a8e5523b32ddfce6adda7c156bfc4d1ef38 100644
--- a/lib/private/appframework/middleware/middlewaredispatcher.php
+++ b/lib/private/appframework/middleware/middlewaredispatcher.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/private/appframework/middleware/security/corsmiddleware.php b/lib/private/appframework/middleware/security/corsmiddleware.php
new file mode 100644
index 0000000000000000000000000000000000000000..dca3996ea2e45ddfd64c66907490a3f62aeabf8b
--- /dev/null
+++ b/lib/private/appframework/middleware/security/corsmiddleware.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * ownCloud - App Framework
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @copyright Bernhard Posselt 2014
+ */
+
+namespace OC\AppFramework\Middleware\Security;
+
+use OC\AppFramework\Utility\ControllerMethodReflector;
+use OCP\IRequest;
+use OCP\AppFramework\Http\Response;
+use OCP\AppFramework\Middleware;
+
+/**
+ * This middleware sets the correct CORS headers on a response if the
+ * controller has the @CORS annotation. This is needed for webapps that want
+ * to access an API and dont run on the same domain, see
+ * https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
+ */
+class CORSMiddleware extends Middleware {
+
+ private $request;
+ private $reflector;
+
+ /**
+ * @param IRequest $request
+ * @param ControllerMethodReflector $reflector
+ */
+ public function __construct(IRequest $request,
+ ControllerMethodReflector $reflector) {
+ $this->request = $request;
+ $this->reflector = $reflector;
+ }
+
+
+ /**
+ * 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){
+ // only react if its a CORS request and if the request sends origin and
+
+ if(isset($this->request->server['HTTP_ORIGIN']) &&
+ $this->reflector->hasAnnotation('CORS')) {
+
+ // allow credentials headers must not be true or CSRF is possible
+ // otherwise
+ foreach($response->getHeaders() as $header => $value ) {
+ if(strtolower($header) === 'access-control-allow-credentials' &&
+ strtolower(trim($value)) === 'true') {
+ $msg = 'Access-Control-Allow-Credentials must not be '.
+ 'set to true in order to prevent CSRF';
+ throw new SecurityException($msg);
+ }
+ }
+
+ $origin = $this->request->server['HTTP_ORIGIN'];
+ $response->addHeader('Access-Control-Allow-Origin', $origin);
+ }
+ return $response;
+ }
+
+
+}
diff --git a/lib/private/appframework/middleware/security/securityexception.php b/lib/private/appframework/middleware/security/securityexception.php
index e551675acdfaeb306a40dfea8e8c27611fa55e69..df37d5e327566ed1987e9c8827c7271118ced3cb 100644
--- a/lib/private/appframework/middleware/security/securityexception.php
+++ b/lib/private/appframework/middleware/security/securityexception.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/private/appframework/middleware/security/securitymiddleware.php b/lib/private/appframework/middleware/security/securitymiddleware.php
index 0f160d224ad4303fbef748ef6e8480cebd8bdc9f..5b56210024dbe2eef3c81b760002c291d03b875d 100644
--- a/lib/private/appframework/middleware/security/securitymiddleware.php
+++ b/lib/private/appframework/middleware/security/securitymiddleware.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -25,13 +25,15 @@
namespace OC\AppFramework\Middleware\Security;
use OC\AppFramework\Http;
-use OC\AppFramework\Utility\MethodAnnotationReader;
+use OC\AppFramework\Utility\ControllerMethodReflector;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\Middleware;
use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Http\JSONResponse;
-use OCP\AppFramework\IAppContainer;
+use OCP\INavigationManager;
+use OCP\IURLGenerator;
use OCP\IRequest;
+use OCP\ILogger;
/**
@@ -42,23 +44,41 @@ use OCP\IRequest;
*/
class SecurityMiddleware extends Middleware {
- /**
- * @var \OCP\AppFramework\IAppContainer
- */
- private $app;
-
- /**
- * @var \OCP\IRequest
- */
+ private $navigationManager;
private $request;
+ private $reflector;
+ private $appName;
+ private $urlGenerator;
+ private $logger;
+ private $isLoggedIn;
+ private $isAdminUser;
/**
- * @param IAppContainer $app
* @param IRequest $request
+ * @param ControllerMethodReflector $reflector
+ * @param INavigationManager $navigationManager
+ * @param IURLGenerator $urlGenerator
+ * @param ILogger $logger
+ * @param string $appName
+ * @param bool $isLoggedIn
+ * @param bool $isAdminUser
*/
- public function __construct(IAppContainer $app, IRequest $request){
- $this->app = $app;
+ public function __construct(IRequest $request,
+ ControllerMethodReflector $reflector,
+ INavigationManager $navigationManager,
+ IURLGenerator $urlGenerator,
+ ILogger $logger,
+ $appName,
+ $isLoggedIn,
+ $isAdminUser){
+ $this->navigationManager = $navigationManager;
$this->request = $request;
+ $this->reflector = $reflector;
+ $this->appName = $appName;
+ $this->urlGenerator = $urlGenerator;
+ $this->logger = $logger;
+ $this->isLoggedIn = $isLoggedIn;
+ $this->isAdminUser = $isAdminUser;
}
@@ -72,28 +92,25 @@ class SecurityMiddleware extends Middleware {
*/
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->app->getServer()->getNavigationManager()->setActiveEntry($this->app->getAppName());
+ $this->navigationManager->setActiveEntry($this->appName);
// security checks
- $isPublicPage = $annotationReader->hasAnnotation('PublicPage');
+ $isPublicPage = $this->reflector->hasAnnotation('PublicPage');
if(!$isPublicPage) {
- if(!$this->app->isLoggedIn()) {
+ if(!$this->isLoggedIn) {
throw new SecurityException('Current user is not logged in', Http::STATUS_UNAUTHORIZED);
}
- if(!$annotationReader->hasAnnotation('NoAdminRequired')) {
- if(!$this->app->isAdminUser()) {
+ if(!$this->reflector->hasAnnotation('NoAdminRequired')) {
+ if(!$this->isAdminUser) {
throw new SecurityException('Logged in user must be an admin', Http::STATUS_FORBIDDEN);
}
}
}
- if(!$annotationReader->hasAnnotation('NoCSRFRequired')) {
+ if(!$this->reflector->hasAnnotation('NoCSRFRequired')) {
if(!$this->request->passesCSRFCheck()) {
throw new SecurityException('CSRF check failed', Http::STATUS_PRECONDITION_FAILED);
}
@@ -121,13 +138,13 @@ class SecurityMiddleware extends Middleware {
array('message' => $exception->getMessage()),
$exception->getCode()
);
- $this->app->log($exception->getMessage(), 'debug');
+ $this->logger->debug($exception->getMessage());
} else {
// TODO: replace with link to route
- $url = $this->app->getServer()->getURLGenerator()->getAbsoluteURL('index.php');
+ $url = $this->urlGenerator->getAbsoluteURL('index.php');
$response = new RedirectResponse($url);
- $this->app->log($exception->getMessage(), 'debug');
+ $this->logger->debug($exception->getMessage());
}
return $response;
diff --git a/lib/private/appframework/routing/routeconfig.php b/lib/private/appframework/routing/routeconfig.php
index a3bbde6af5345d492a9cf7457293e0b62b1c411b..91ea7778d0868d5c1a5b4a31d9f1c23f1eeb481c 100644
--- a/lib/private/appframework/routing/routeconfig.php
+++ b/lib/private/appframework/routing/routeconfig.php
@@ -61,7 +61,7 @@ class RouteConfig {
/**
* Creates one route base on the give configuration
- * @param $routes
+ * @param array $routes
* @throws \UnexpectedValueException
*/
private function processSimpleRoutes($routes)
@@ -105,7 +105,7 @@ class RouteConfig {
* - update
* - destroy
*
- * @param $routes
+ * @param array $routes
*/
private function processResources($routes)
{
@@ -151,7 +151,7 @@ class RouteConfig {
/**
* Based on a given route name the controller name is generated
- * @param $controller
+ * @param string $controller
* @return string
*/
private function buildControllerName($controller)
@@ -161,7 +161,7 @@ class RouteConfig {
/**
* Based on the action part of the route name the controller method name is generated
- * @param $action
+ * @param string $action
* @return string
*/
private function buildActionName($action) {
@@ -170,7 +170,7 @@ class RouteConfig {
/**
* Generates the id used in the url part o the route url
- * @param $resource
+ * @param string $resource
* @return string
*/
private function buildResourceId($resource) {
@@ -179,7 +179,7 @@ class RouteConfig {
/**
* Underscored strings are converted to camel case strings
- * @param $str string
+ * @param string $str
* @return string
*/
private function underScoreToCamelCase($str) {
diff --git a/lib/private/appframework/utility/methodannotationreader.php b/lib/private/appframework/utility/controllermethodreflector.php
similarity index 52%
rename from lib/private/appframework/utility/methodannotationreader.php
rename to lib/private/appframework/utility/controllermethodreflector.php
index 42060a0852987206de1d023df0b51654149022ca..a1519c7280990a154b42d3636b9c427a6de9a61d 100644
--- a/lib/private/appframework/utility/methodannotationreader.php
+++ b/lib/private/appframework/utility/controllermethodreflector.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2014 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -28,23 +28,68 @@ namespace OC\AppFramework\Utility;
/**
* Reads and parses annotations from doc comments
*/
-class MethodAnnotationReader {
+class ControllerMethodReflector {
private $annotations;
+ private $types;
+ private $parameters;
+
+ public function __construct() {
+ $this->types = array();
+ $this->parameters = array();
+ $this->annotations = array();
+ }
+
/**
* @param object $object an object or classname
- * @param string $method the method which we want to inspect for annotations
+ * @param string $method the method which we want to inspect
*/
- public function __construct($object, $method){
- $this->annotations = array();
-
+ public function reflect($object, $method){
$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];
+
+ // extract type parameter information
+ preg_match_all('/@param (?<type>\w+) \$(?<var>\w+)/', $docs, $matches);
+ $this->types = array_combine($matches['var'], $matches['type']);
+
+ // get method parameters
+ foreach ($reflection->getParameters() as $param) {
+ if($param->isOptional()) {
+ $default = $param->getDefaultValue();
+ } else {
+ $default = null;
+ }
+ $this->parameters[$param->name] = $default;
+ }
+ }
+
+
+ /**
+ * Inspects the PHPDoc parameters for types
+ * @param string $parameter the parameter whose type comments should be
+ * parsed
+ * @return string|null type in the type parameters (@param int $something)
+ * would return int or null if not existing
+ */
+ public function getType($parameter) {
+ if(array_key_exists($parameter, $this->types)) {
+ return $this->types[$parameter];
+ } else {
+ return null;
+ }
+ }
+
+
+ /**
+ * @return array the arguments of the method with key => default value
+ */
+ public function getParameters() {
+ return $this->parameters;
}
diff --git a/lib/private/appframework/utility/timefactory.php b/lib/private/appframework/utility/timefactory.php
index 2c3dd6cf5e3182e7c73a01964241b55b1edeb134..a9b07a356e3e542ca554769ab369e4aa05bacc83 100644
--- a/lib/private/appframework/utility/timefactory.php
+++ b/lib/private/appframework/utility/timefactory.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/private/archive/tar.php b/lib/private/archive/tar.php
index cbdb565ba35e6440f8c04cfb1379ee7e407ba117..21a995d9e50f7bd06c779764414f89f0a6c8f306 100644
--- a/lib/private/archive/tar.php
+++ b/lib/private/archive/tar.php
@@ -154,7 +154,7 @@ class OC_Archive_TAR extends OC_Archive{
}
/**
* get the last modified time of a file in the archive
- * @param string path
+ * @param string $path
* @return int
*/
function mtime($path) {
diff --git a/lib/private/avatar.php b/lib/private/avatar.php
index e97f55eecafeede2526d2c13ed747528081fc37f..2286b89687891e584b70e7968a789ef9958db2f2 100644
--- a/lib/private/avatar.php
+++ b/lib/private/avatar.php
@@ -15,16 +15,16 @@ class OC_Avatar implements \OCP\IAvatar {
private $view;
/**
- * @brief constructor
- * @param $user string user to do avatar-management with
+ * constructor
+ * @param string $user 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, avatars are square, defaults to 64
+ * get the users avatar
+ * @param int $size size in px of the avatar, avatars are square, defaults to 64
* @return boolean|\OC_Image containing the avatar or false if there's no image
*/
public function get ($size = 64) {
@@ -43,8 +43,8 @@ class OC_Avatar implements \OCP\IAvatar {
}
/**
- * @brief sets the users avatar
- * @param $data mixed OC_Image, imagedata or path to set a new avatar
+ * sets the users avatar
+ * @param \OC_Image|resource|string $data OC_Image, 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
@@ -81,7 +81,7 @@ class OC_Avatar implements \OCP\IAvatar {
}
/**
- * @brief remove the users avatar
+ * remove the users avatar
* @return void
*/
public function remove () {
diff --git a/lib/private/avatarmanager.php b/lib/private/avatarmanager.php
index 3ca46868ea6d3968217c2655aa838192622e2293..6abe87c4f410f81d52fc425591f2c33dedb2d6f9 100644
--- a/lib/private/avatarmanager.php
+++ b/lib/private/avatarmanager.php
@@ -15,9 +15,9 @@ use OCP\IAvatarManager;
class AvatarManager implements IAvatarManager {
/**
- * @brief return a user specific instance of \OCP\IAvatar
+ * return a user specific instance of \OCP\IAvatar
* @see \OCP\IAvatar
- * @param $user string the ownCloud user id
+ * @param string $user the ownCloud user id
* @return \OCP\IAvatar
*/
function getAvatar($user) {
diff --git a/lib/private/backgroundjob.php b/lib/private/backgroundjob.php
index afc3c270405e9e4200a30037752e5e09d08667a7..922824753b08c41d1681acd344485f17f9031d80 100644
--- a/lib/private/backgroundjob.php
+++ b/lib/private/backgroundjob.php
@@ -25,7 +25,7 @@
*/
class OC_BackgroundJob{
/**
- * @brief get the execution type of background jobs
+ * get the execution type of background jobs
* @return string
*
* This method returns the type how background jobs are executed. If the user
@@ -36,7 +36,7 @@ class OC_BackgroundJob{
}
/**
- * @brief sets the background jobs execution type
+ * sets the background jobs execution type
* @param string $type execution type
* @return false|null
*
diff --git a/lib/private/backgroundjob/joblist.php b/lib/private/backgroundjob/joblist.php
index 26c9026934964c18d48fc8d47b84fa9c59ad2e95..9fa13c25851de21666db812f1582658a12316b0d 100644
--- a/lib/private/backgroundjob/joblist.php
+++ b/lib/private/backgroundjob/joblist.php
@@ -31,7 +31,7 @@ class JobList implements IJobList {
}
/**
- * @param \Test\BackgroundJob\TestJob $job
+ * @param Job|string $job
* @param mixed $argument
*/
public function add($job, $argument = null) {
@@ -48,7 +48,7 @@ class JobList implements IJobList {
}
/**
- * @param Job $job
+ * @param Job|string $job
* @param mixed $argument
*/
public function remove($job, $argument = null) {
@@ -70,7 +70,7 @@ class JobList implements IJobList {
/**
* check if a job is in the list
*
- * @param $job
+ * @param Job|string $job
* @param mixed $argument
* @return bool
*/
@@ -126,7 +126,7 @@ class JobList implements IJobList {
/**
* @param int $id
- * @return Job
+ * @return Job|null
*/
public function getById($id) {
$query = $this->conn->prepare('SELECT `id`, `class`, `last_run`, `argument` FROM `*PREFIX*jobs` WHERE `id` = ?');
diff --git a/lib/private/cache/file.php b/lib/private/cache/file.php
index feee9cc32b6340f7555e3825d5f0fab48548eb97..4e7c065678e3fb27a2c3f1903416d325071b30d6 100644
--- a/lib/private/cache/file.php
+++ b/lib/private/cache/file.php
@@ -48,7 +48,7 @@ class File {
/**
* Returns the size of the stored/cached data
*
- * @param $key
+ * @param string $key
* @return int
*/
public function size($key) {
diff --git a/lib/private/config.php b/lib/private/config.php
index 6701ca0532bd87ae2cb7ecd4dfeceda5adc806b1..82a1c46c9d5c54c2e01cacb54f02d4e013ec559d 100644
--- a/lib/private/config.php
+++ b/lib/private/config.php
@@ -64,8 +64,8 @@ class Config {
}
/**
- * @brief Lists all available config keys
- * @return array with key names
+ * Lists all available config keys
+ * @return array an array of key names
*
* This function returns all keys saved in config.php. Please note that it
* does not return the values.
@@ -75,10 +75,10 @@ class Config {
}
/**
- * @brief Gets a value from config.php
+ * Gets a value from config.php
* @param string $key key
- * @param array|bool|string|null $default = null default value
- * @return string the value or $default
+ * @param mixed $default = null default value
+ * @return mixed the value or $default
*
* This function gets the value from config.php. If it does not exist,
* $default will be returned.
@@ -92,9 +92,9 @@ class Config {
}
/**
- * @brief Sets a value
+ * Sets a value
* @param string $key key
- * @param string $value value
+ * @param mixed $value value
*
* This function sets the value and writes the config.php.
*
@@ -108,7 +108,7 @@ class Config {
}
/**
- * @brief Removes a key from the config
+ * Removes a key from the config
* @param string $key key
*
* This function removes a key from the config.php.
@@ -125,7 +125,7 @@ class Config {
}
/**
- * @brief Loads the config file
+ * Loads the config file
*
* Reads the config file and saves it to the cache
*/
@@ -153,7 +153,7 @@ class Config {
}
/**
- * @brief Writes the config file
+ * Writes the config file
*
* Saves the config to the config file.
*
diff --git a/lib/private/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php
index 5577273df8c004c79317531030021b7e953f7635..9ebf5fc05cfe0c69585ea2e3dc16b1bb4b18d348 100644
--- a/lib/private/connector/sabre/auth.php
+++ b/lib/private/connector/sabre/auth.php
@@ -69,6 +69,8 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
* even if there are no HTTP Basic Auth headers.
* In other case, just fallback to the parent implementation.
*
+ * @param Sabre_DAV_Server $server
+ * @param $realm
* @return bool
*/
public function authenticate(Sabre_DAV_Server $server, $realm) {
diff --git a/lib/private/connector/sabre/exceptionloggerplugin.php b/lib/private/connector/sabre/exceptionloggerplugin.php
index 8e77afaf207a03cb3a862b7844089a8699917d1c..5eaf1e87621415530202c5b276f0515fe7f546cb 100644
--- a/lib/private/connector/sabre/exceptionloggerplugin.php
+++ b/lib/private/connector/sabre/exceptionloggerplugin.php
@@ -11,6 +11,17 @@
class OC_Connector_Sabre_ExceptionLoggerPlugin extends Sabre_DAV_ServerPlugin
{
+ private $nonFatalExceptions = array(
+ 'Sabre_DAV_Exception_NotAuthenticated' => true,
+ // the sync client uses this to find out whether files exist,
+ // so it is not always an error, log it as debug
+ 'Sabre_DAV_Exception_NotFound' => true,
+ // this one mostly happens when the same file is uploaded at
+ // exactly the same time from two clients, only one client
+ // wins, the second one gets "Precondition failed"
+ 'Sabre_DAV_Exception_PreconditionFailed' => true,
+ );
+
private $appName;
/**
@@ -43,8 +54,10 @@ class OC_Connector_Sabre_ExceptionLoggerPlugin extends Sabre_DAV_ServerPlugin
*/
public function logException($e) {
$exceptionClass = get_class($e);
- if ($exceptionClass !== 'Sabre_DAV_Exception_NotAuthenticated') {
- \OCP\Util::logException($this->appName, $e);
+ $level = \OCP\Util::FATAL;
+ if (isset($this->nonFatalExceptions[$exceptionClass])) {
+ $level = \OCP\Util::DEBUG;
}
+ \OCP\Util::logException($this->appName, $e, $level);
}
}
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index 66b50a875524b50f97921c9fe785f3b6eb49d817..8a16ba55e7a92d03290892464220ec76ce28572f 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -123,7 +123,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
/**
* Returns the data
*
- * @return string | resource
+ * @return string|resource
*/
public function get() {
@@ -156,7 +156,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
/**
* Returns the size of the node, in bytes
*
- * @return int
+ * @return int|float
*/
public function getSize() {
return $this->info->getSize();
diff --git a/lib/private/connector/sabre/filesplugin.php b/lib/private/connector/sabre/filesplugin.php
index 65231040fb5973f7622e1730387d8a3c427a1ef5..25d7fd53343730b4ae1564696c668ffe701f5a51 100644
--- a/lib/private/connector/sabre/filesplugin.php
+++ b/lib/private/connector/sabre/filesplugin.php
@@ -37,6 +37,7 @@ class OC_Connector_Sabre_FilesPlugin extends Sabre_DAV_ServerPlugin
$server->xmlNamespaces[self::NS_OWNCLOUD] = 'oc';
$server->protectedProperties[] = '{' . self::NS_OWNCLOUD . '}id';
+ $server->protectedProperties[] = '{' . self::NS_OWNCLOUD . '}perm';
$this->server = $server;
$this->server->subscribeEvent('beforeGetProperties', array($this, 'beforeGetProperties'));
@@ -57,15 +58,24 @@ class OC_Connector_Sabre_FilesPlugin extends Sabre_DAV_ServerPlugin
if ($node instanceof OC_Connector_Sabre_Node) {
- $fileid_propertyname = '{' . self::NS_OWNCLOUD . '}id';
- if (array_search($fileid_propertyname, $requestedProperties)) {
- unset($requestedProperties[array_search($fileid_propertyname, $requestedProperties)]);
+ $fileIdPropertyName = '{' . self::NS_OWNCLOUD . '}id';
+ $permissionsPropertyName = '{' . self::NS_OWNCLOUD . '}permissions';
+ if (array_search($fileIdPropertyName, $requestedProperties)) {
+ unset($requestedProperties[array_search($fileIdPropertyName, $requestedProperties)]);
+ }
+ if (array_search($permissionsPropertyName, $requestedProperties)) {
+ unset($requestedProperties[array_search($permissionsPropertyName, $requestedProperties)]);
}
/** @var $node OC_Connector_Sabre_Node */
$fileId = $node->getFileId();
if (!is_null($fileId)) {
- $returnedProperties[200][$fileid_propertyname] = $fileId;
+ $returnedProperties[200][$fileIdPropertyName] = $fileId;
+ }
+
+ $permissions = $node->getDavPermissions();
+ if (!is_null($fileId)) {
+ $returnedProperties[200][$permissionsPropertyName] = $permissions;
}
}
@@ -73,7 +83,7 @@ class OC_Connector_Sabre_FilesPlugin extends Sabre_DAV_ServerPlugin
}
/**
- * @param $filePath
+ * @param string $filePath
* @param Sabre_DAV_INode $node
* @throws Sabre_DAV_Exception_BadRequest
*/
diff --git a/lib/private/connector/sabre/node.php b/lib/private/connector/sabre/node.php
index eede39cba8bd27385c1bfa3612ba9c7b548d8877..f124b75444365b6fef1910e62cc7ce68da567c73 100644
--- a/lib/private/connector/sabre/node.php
+++ b/lib/private/connector/sabre/node.php
@@ -56,7 +56,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
protected $info;
/**
- * @brief Sets up the node, expects a full path name
+ * Sets up the node, expects a full path name
* @param \OC\Files\View $view
* @param \OCP\Files\FileInfo $info
*/
@@ -71,7 +71,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
}
/**
- * @brief Returns the name of the node
+ * Returns the name of the node
* @return string
*/
public function getName() {
@@ -79,7 +79,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
}
/**
- * @brief Renames the node
+ * Renames the node
* @param string $name The new name
* @throws Sabre_DAV_Exception_BadRequest
* @throws Sabre_DAV_Exception_Forbidden
@@ -116,7 +116,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
}
/**
- * @brief Returns the last modification time, as a unix timestamp
+ * Returns the last modification time, as a unix timestamp
* @return int timestamp as integer
*/
public function getLastModified() {
@@ -138,7 +138,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
}
/**
- * @brief Updates properties on this node,
+ * Updates properties on this node,
* @see Sabre_DAV_IProperties::updateProperties
* @param array $properties
* @return boolean
@@ -188,7 +188,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
}
/**
- * @brief Returns a list of properties for this nodes.;
+ * Returns a list of properties for this nodes.;
* @param array $properties
* @return array
* @note The properties list is a list of propertynames the client
@@ -237,4 +237,36 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
return null;
}
+
+ /**
+ * @return string|null
+ */
+ public function getDavPermissions() {
+ $p ='';
+ if ($this->info->isShared()) {
+ $p .= 'S';
+ }
+ if ($this->info->isShareable()) {
+ $p .= 'R';
+ }
+ if ($this->info->isMounted()) {
+ $p .= 'M';
+ }
+ if ($this->info->isDeletable()) {
+ $p .= 'D';
+ }
+ if ($this->info->isDeletable()) {
+ $p .= 'N';
+ }
+ if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) {
+ if ($this->info->isUpdateable()) {
+ $p .= 'W';
+ }
+ } else {
+ if ($this->info->isUpdateable()) {
+ $p .= 'CK';
+ }
+ }
+ return $p;
+ }
}
diff --git a/lib/private/connector/sabre/quotaplugin.php b/lib/private/connector/sabre/quotaplugin.php
index 1e73e1645c3f6eff57c95fcc53400536357028c8..c9b8336b57b14f67a8eefb741462cead14f679aa 100644
--- a/lib/private/connector/sabre/quotaplugin.php
+++ b/lib/private/connector/sabre/quotaplugin.php
@@ -97,7 +97,7 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin {
}
/**
- * @param $parentUri
+ * @param string $parentUri
* @return mixed
*/
public function getFreeSpace($parentUri) {
diff --git a/lib/private/connector/sabre/server.php b/lib/private/connector/sabre/server.php
index 2660b043f467e38562c534ab33771f5ab62c44fe..cf28b11163f44d3be9b5a64a2522b57f59b8a355 100644
--- a/lib/private/connector/sabre/server.php
+++ b/lib/private/connector/sabre/server.php
@@ -170,7 +170,7 @@ class OC_Connector_Sabre_Server extends Sabre_DAV_Server {
if ($node instanceof Sabre_DAV_IFile) {
$size = $node->getSize();
if (!is_null($size)) {
- $newProperties[200][$prop] = (int)$node->getSize();
+ $newProperties[200][$prop] = 0 + $size;
}
}
break;
diff --git a/lib/private/contactsmanager.php b/lib/private/contactsmanager.php
index 4299d88017a7fa462cd137f3b2fe01681e9befaf..338cc04865158fde990b7bb70e07cb6cf0183c51 100644
--- a/lib/private/contactsmanager.php
+++ b/lib/private/contactsmanager.php
@@ -31,15 +31,16 @@ namespace OC {
* @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
+ * @return array an array of contacts which are arrays of key-value-pairs
*/
public function search($pattern, $searchProperties = array(), $options = array()) {
+ $this->loadAddressBooks();
$result = array();
- foreach($this->address_books as $address_book) {
- $r = $address_book->search($pattern, $searchProperties, $options);
+ foreach($this->addressBooks as $addressBook) {
+ $r = $addressBook->search($pattern, $searchProperties, $options);
$contacts = array();
foreach($r as $c){
- $c['addressbook-key'] = $address_book->getKey();
+ $c['addressbook-key'] = $addressBook->getKey();
$contacts[] = $c;
}
$result = array_merge($result, $contacts);
@@ -52,18 +53,20 @@ namespace OC {
* This function can be used to delete the contact identified by the given id
*
* @param object $id the unique identifier to a contact
- * @param string $address_book_key identifier of the address book in which the contact shall be deleted
+ * @param string $addressBookKey identifier of the address book in which the contact shall be deleted
* @return bool successful or not
*/
- public function delete($id, $address_book_key) {
- if (!array_key_exists($address_book_key, $this->address_books))
+ public function delete($id, $addressBookKey) {
+ $addressBook = $this->getAddressBook($addressBookKey);
+ if (!$addressBook) {
return null;
+ }
- $address_book = $this->address_books[$address_book_key];
- if ($address_book->getPermissions() & \OCP\PERMISSION_DELETE)
+ if ($addressBook->getPermissions() & \OCP\PERMISSION_DELETE) {
return null;
+ }
- return $address_book->delete($id);
+ return $addressBook->delete($id);
}
/**
@@ -71,19 +74,20 @@ namespace OC {
* 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 string $address_book_key identifier of the address book in which the contact shall be created or updated
+ * @param string $addressBookKey identifier of 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))
+ public function createOrUpdate($properties, $addressBookKey) {
+ $addressBook = $this->getAddressBook($addressBookKey);
+ if (!$addressBook) {
return null;
+ }
- $address_book = $this->address_books[$address_book_key];
- if ($address_book->getPermissions() & \OCP\PERMISSION_CREATE)
+ if ($addressBook->getPermissions() & \OCP\PERMISSION_CREATE) {
return null;
+ }
- return $address_book->createOrUpdate($properties);
+ return $addressBook->createOrUpdate($properties);
}
/**
@@ -92,30 +96,31 @@ namespace OC {
* @return bool true if enabled, false if not
*/
public function isEnabled() {
- return !empty($this->address_books);
+ return !empty($this->addressBooks) || !empty($this->addressBookLoaders);
}
/**
- * @param \OCP\IAddressBook $address_book
+ * @param \OCP\IAddressBook $addressBook
*/
- public function registerAddressBook(\OCP\IAddressBook $address_book) {
- $this->address_books[$address_book->getKey()] = $address_book;
+ public function registerAddressBook(\OCP\IAddressBook $addressBook) {
+ $this->addressBooks[$addressBook->getKey()] = $addressBook;
}
/**
- * @param \OCP\IAddressBook $address_book
+ * @param \OCP\IAddressBook $addressBook
*/
- public function unregisterAddressBook(\OCP\IAddressBook $address_book) {
- unset($this->address_books[$address_book->getKey()]);
+ public function unregisterAddressBook(\OCP\IAddressBook $addressBook) {
+ unset($this->addressBooks[$addressBook->getKey()]);
}
/**
* @return array
*/
public function getAddressBooks() {
+ $this->loadAddressBooks();
$result = array();
- foreach($this->address_books as $address_book) {
- $result[$address_book->getKey()] = $address_book->getDisplayName();
+ foreach($this->addressBooks as $addressBook) {
+ $result[$addressBook->getKey()] = $addressBook->getDisplayName();
}
return $result;
@@ -125,26 +130,56 @@ namespace OC {
* removes all registered address book instances
*/
public function clear() {
- $this->address_books = array();
+ $this->addressBooks = array();
+ $this->addressBookLoaders = array();
}
/**
* @var \OCP\IAddressBook[] which holds all registered address books
*/
- private $address_books = array();
+ private $addressBooks = array();
+
+ /**
+ * @var \Closure[] to call to load/register address books
+ */
+ private $addressBookLoaders = 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)
+ public function register(\Closure $callable)
{
- //
- //TODO: implement me
- //
+ $this->addressBookLoaders[] = $callable;
+ }
+
+ /**
+ * Get (and load when needed) the address book for $key
+ *
+ * @param string $addressBookKey
+ * @return \OCP\IAddressBook
+ */
+ protected function getAddressBook($addressBookKey)
+ {
+ $this->loadAddressBooks();
+ if (!array_key_exists($addressBookKey, $this->addressBooks)) {
+ return null;
+ }
+
+ return $this->addressBooks[$addressBookKey];
+ }
+
+ /**
+ * Load all address books registered with 'register'
+ */
+ protected function loadAddressBooks()
+ {
+ foreach($this->addressBookLoaders as $callable) {
+ $callable($this);
+ }
+ $this->addressBookLoaders = array();
}
}
}
diff --git a/lib/private/davclient.php b/lib/private/davclient.php
index 916dc11d17a286db8823b36ea52266eb562302cc..a7bf04865199a6764a2a417b41c43c26ae68b1f4 100644
--- a/lib/private/davclient.php
+++ b/lib/private/davclient.php
@@ -32,7 +32,7 @@ class OC_DAVClient extends \Sabre_DAV_Client {
protected $verifyHost;
/**
- * @brief Sets the request timeout or 0 to disable timeout.
+ * Sets the request timeout or 0 to disable timeout.
* @param integer $timeout in seconds or 0 to disable
*/
public function setRequestTimeout($timeout) {
@@ -40,7 +40,7 @@ class OC_DAVClient extends \Sabre_DAV_Client {
}
/**
- * @brief Sets the CURLOPT_SSL_VERIFYHOST setting
+ * Sets the CURLOPT_SSL_VERIFYHOST setting
* @param integer $value value to set CURLOPT_SSL_VERIFYHOST to
*/
public function setVerifyHost($value) {
diff --git a/lib/private/db.php b/lib/private/db.php
index 322a13642ae242ef8361f09946b7ac9f313a9fde..422f783c745633ac3941f5ff1fd79ba889b54ea2 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -46,11 +46,8 @@ class OC_DB {
*/
static private $connection; //the preferred connection to use, only Doctrine
- static private $prefix=null;
- static private $type=null;
-
/**
- * @brief connects to the database
+ * connects to the database
* @return boolean|null true if connection can be established or false on error
*
* Connects to the database as specified in config.php
@@ -72,102 +69,45 @@ class OC_DB {
$port=false;
}
- // 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':
- $datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' );
- $connectionParams = array(
- 'user' => $user,
- 'password' => $pass,
- 'path' => $datadir.'/'.$name.'.db',
- 'driver' => 'pdo_sqlite',
- );
- $connectionParams['adapter'] = '\OC\DB\AdapterSqlite';
- $connectionParams['wrapperClass'] = 'OC\DB\Connection';
- break;
- case 'mysql':
- $connectionParams = array(
- 'user' => $user,
- 'password' => $pass,
- 'host' => $host,
- 'port' => $port,
- 'dbname' => $name,
- 'charset' => 'UTF8',
- 'driver' => 'pdo_mysql',
- );
- $connectionParams['adapter'] = '\OC\DB\Adapter';
- $connectionParams['wrapperClass'] = 'OC\DB\Connection';
- // Send "SET NAMES utf8". Only required on PHP 5.3 below 5.3.6.
- // See http://stackoverflow.com/questions/4361459/php-pdo-charset-set-names#4361485
- $eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\MysqlSessionInit);
- break;
- case 'pgsql':
- $connectionParams = array(
- 'user' => $user,
- 'password' => $pass,
- 'host' => $host,
- 'port' => $port,
- 'dbname' => $name,
- 'driver' => 'pdo_pgsql',
- );
- $connectionParams['adapter'] = '\OC\DB\AdapterPgSql';
- $connectionParams['wrapperClass'] = 'OC\DB\Connection';
- break;
- case 'oci':
- $connectionParams = array(
- 'user' => $user,
- 'password' => $pass,
- 'host' => $host,
- 'dbname' => $name,
- 'charset' => 'AL32UTF8',
- 'driver' => 'oci8',
- );
- if (!empty($port)) {
- $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(
- 'user' => $user,
- 'password' => $pass,
- 'host' => $host,
- 'port' => $port,
- 'dbname' => $name,
- 'charset' => 'UTF8',
- 'driver' => 'pdo_sqlsrv',
- );
- $connectionParams['adapter'] = '\OC\DB\AdapterSQLSrv';
- $connectionParams['wrapperClass'] = 'OC\DB\Connection';
- break;
- default:
- return false;
- }
- $connectionParams['tablePrefix'] = OC_Config::getValue('dbtableprefix', 'oc_' );
- try {
- 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
- self::$connection->disableQueryStatementCaching();
- }
- } catch(\Doctrine\DBAL\DBALException $e) {
- OC_Log::write('core', $e->getMessage(), OC_Log::FATAL);
- OC_User::setUserId(null);
-
- // send http status 503
- header('HTTP/1.1 503 Service Temporarily Unavailable');
- header('Status: 503 Service Temporarily Unavailable');
- OC_Template::printErrorPage('Failed to connect to database');
- die();
+ $factory = new \OC\DB\ConnectionFactory();
+ if (!$factory->isValidType($type)) {
+ return false;
+ }
+
+ if ($factory->normalizeType($type) === 'sqlite3') {
+ $datadir = OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data');
+ $connectionParams = array(
+ 'user' => $user,
+ 'password' => $pass,
+ 'path' => $datadir.'/'.$name.'.db',
+ );
+ } else {
+ $connectionParams = array(
+ 'user' => $user,
+ 'password' => $pass,
+ 'host' => $host,
+ 'dbname' => $name,
+ );
+ if (!empty($port)) {
+ $connectionParams['port'] = $port;
}
}
+
+ $connectionParams['tablePrefix'] = OC_Config::getValue('dbtableprefix', 'oc_');
+
+ try {
+ self::$connection = $factory->getConnection($type, $connectionParams);
+ } catch(\Doctrine\DBAL\DBALException $e) {
+ OC_Log::write('core', $e->getMessage(), OC_Log::FATAL);
+ OC_User::setUserId(null);
+
+ // send http status 503
+ header('HTTP/1.1 503 Service Temporarily Unavailable');
+ header('Status: 503 Service Temporarily Unavailable');
+ OC_Template::printErrorPage('Failed to connect to database');
+ die();
+ }
+
return true;
}
@@ -190,7 +130,7 @@ class OC_DB {
}
/**
- * @brief Prepare a SQL query
+ * Prepare a SQL query
* @param string $query Query string
* @param int $limit
* @param int $offset
@@ -202,12 +142,12 @@ class OC_DB {
*/
static public function prepare( $query , $limit = null, $offset = null, $isManipulation = null) {
self::connect();
-
+
if ($isManipulation === null) {
//try to guess, so we return the number of rows on manipulations
$isManipulation = self::isManipulation($query);
}
-
+
// return the result
try {
$result = self::$connection->prepare($query, $limit, $offset);
@@ -222,7 +162,7 @@ class OC_DB {
/**
* tries to guess the type of statement based on the first 10 characters
* the current check allows some whitespace but does not work with IF EXISTS or other more complex statements
- *
+ *
* @param string $sql
* @return bool
*/
@@ -245,9 +185,9 @@ class OC_DB {
}
return false;
}
-
+
/**
- * @brief execute a prepared statement, on error write log and throw exception
+ * execute a prepared statement, on error write log and throw exception
* @param mixed $stmt OC_DB_StatementWrapper,
* an array with 'sql' and optionally 'limit' and 'offset' keys
* .. or a simple sql query string
@@ -296,7 +236,7 @@ class OC_DB {
}
/**
- * @brief gets last value of autoincrement
+ * gets last value of autoincrement
* @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix
* @return string id
* @throws DatabaseException
@@ -312,7 +252,7 @@ class OC_DB {
}
/**
- * @brief Insert a row if a matching row doesn't exists.
+ * Insert a row if a matching row doesn't exists.
* @param string $table The table to insert into in the form '*PREFIX*tableName'
* @param array $input An array of fieldname/value pairs
* @return boolean number of updated rows
@@ -339,7 +279,7 @@ class OC_DB {
}
/**
- * @brief saves database schema to xml file
+ * saves database schema to xml file
* @param string $file name of file
* @param int $mode
* @return bool
@@ -352,7 +292,7 @@ class OC_DB {
}
/**
- * @brief Creates tables from XML file
+ * Creates tables from XML file
* @param string $file file to read structure from
* @return bool
*
@@ -365,7 +305,7 @@ class OC_DB {
}
/**
- * @brief update the database schema
+ * update the database schema
* @param string $file file to read structure from
* @throws Exception
* @return string|boolean
@@ -382,12 +322,21 @@ class OC_DB {
}
/**
- * @brief drop a table
+ * drop a table - the database prefix will be prepended
* @param string $tableName the table to drop
*/
public static function dropTable($tableName) {
- $schemaManager = self::getMDB2SchemaManager();
- $schemaManager->dropTable($tableName);
+
+ $tableName = OC_Config::getValue('dbtableprefix', 'oc_' ) . trim($tableName);
+
+ self::$connection->beginTransaction();
+
+ $platform = self::$connection->getDatabasePlatform();
+ $sql = $platform->getDropTableSQL($platform->quoteIdentifier($tableName));
+
+ self::$connection->query($sql);
+
+ self::$connection->commit();
}
/**
@@ -399,15 +348,6 @@ class OC_DB {
$schemaManager->removeDBStructure($file);
}
- /**
- * @brief replaces the ownCloud tables with a new set
- * @param $file string path to the MDB2 xml db export file
- */
- public static function replaceDB( $file ) {
- $schemaManager = self::getMDB2SchemaManager();
- $schemaManager->replaceDB($file);
- }
-
/**
* check if a result is an error, works with Doctrine
* @param mixed $result
@@ -462,4 +402,51 @@ class OC_DB {
self::$connection->disableQueryStatementCaching();
}
}
+
+ /**
+ * Checks if a table exists in the database - the database prefix will be prepended
+ *
+ * @param string $table
+ * @return bool
+ * @throws DatabaseException
+ */
+ public static function tableExists($table) {
+
+ $table = OC_Config::getValue('dbtableprefix', 'oc_' ) . trim($table);
+
+ $dbType = OC_Config::getValue( 'dbtype', 'sqlite' );
+ switch ($dbType) {
+ case 'sqlite':
+ case 'sqlite3':
+ $sql = "SELECT name FROM sqlite_master "
+ . "WHERE type = 'table' AND name = ? "
+ . "UNION ALL SELECT name FROM sqlite_temp_master "
+ . "WHERE type = 'table' AND name = ?";
+ $result = \OC_DB::executeAudited($sql, array($table, $table));
+ break;
+ case 'mysql':
+ $sql = 'SHOW TABLES LIKE ?';
+ $result = \OC_DB::executeAudited($sql, array($table));
+ break;
+ case 'pgsql':
+ $sql = 'SELECT tablename AS table_name, schemaname AS schema_name '
+ . 'FROM pg_tables WHERE schemaname NOT LIKE \'pg_%\' '
+ . 'AND schemaname != \'information_schema\' '
+ . 'AND tablename = ?';
+ $result = \OC_DB::executeAudited($sql, array($table));
+ break;
+ case 'oci':
+ $sql = 'SELECT TABLE_NAME FROM USER_TABLES WHERE TABLE_NAME = ?';
+ $result = \OC_DB::executeAudited($sql, array($table));
+ break;
+ case 'mssql':
+ $sql = 'SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = ?';
+ $result = \OC_DB::executeAudited($sql, array($table));
+ break;
+ default:
+ throw new DatabaseException("Unknown database type: $dbType");
+ }
+
+ return $result->fetchOne() === $table;
+ }
}
diff --git a/lib/private/db/adapter.php b/lib/private/db/adapter.php
index 6b31f37dd988333a4375d56e31e5a679b0fdf6b3..975b94322866f5d1d15f7b59ed951789af28f22f 100644
--- a/lib/private/db/adapter.php
+++ b/lib/private/db/adapter.php
@@ -40,7 +40,7 @@ class Adapter {
}
/**
- * @brief insert the @input values when they do not exist yet
+ * insert the @input values when they do not exist yet
* @param string $table name
* @param array $input key->value pairs
* @return int count of inserted rows
diff --git a/lib/private/db/connection.php b/lib/private/db/connection.php
index 2bd7b09302005e6ba9fa45406284efd5e0e653ee..b7981fcd6919e64f67b5050f3366bf7683fcf202 100644
--- a/lib/private/db/connection.php
+++ b/lib/private/db/connection.php
@@ -152,7 +152,7 @@ class Connection extends \Doctrine\DBAL\Connection {
}
/**
- * @brief Insert a row if a matching row doesn't exists.
+ * Insert a row if a matching row doesn't exists.
* @param string $table. The table to insert into in the form '*PREFIX*tableName'
* @param array $input. An array of fieldname/value pairs
* @return bool The return value from execute()
diff --git a/lib/private/db/connectionfactory.php b/lib/private/db/connectionfactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..8f852cf7127287f4e164f8eaee229bc54b3080e3
--- /dev/null
+++ b/lib/private/db/connectionfactory.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright (c) 2014 Andreas Fischer <bantu@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\DB;
+
+/**
+* Takes care of creating and configuring Doctrine connections.
+*/
+class ConnectionFactory {
+ /**
+ * @var array
+ *
+ * Array mapping DBMS type to default connection parameters passed to
+ * \Doctrine\DBAL\DriverManager::getConnection().
+ */
+ protected $defaultConnectionParams = array(
+ 'mssql' => array(
+ 'adapter' => '\OC\DB\AdapterSQLSrv',
+ 'charset' => 'UTF8',
+ 'driver' => 'pdo_sqlsrv',
+ 'wrapperClass' => 'OC\DB\Connection',
+ ),
+ 'mysql' => array(
+ 'adapter' => '\OC\DB\Adapter',
+ 'charset' => 'UTF8',
+ 'driver' => 'pdo_mysql',
+ 'wrapperClass' => 'OC\DB\Connection',
+ ),
+ 'oci' => array(
+ 'adapter' => '\OC\DB\AdapterOCI8',
+ 'charset' => 'AL32UTF8',
+ 'driver' => 'oci8',
+ 'wrapperClass' => 'OC\DB\OracleConnection',
+ ),
+ 'pgsql' => array(
+ 'adapter' => '\OC\DB\AdapterPgSql',
+ 'driver' => 'pdo_pgsql',
+ 'wrapperClass' => 'OC\DB\Connection',
+ ),
+ 'sqlite3' => array(
+ 'adapter' => '\OC\DB\AdapterSqlite',
+ 'driver' => 'pdo_sqlite',
+ 'wrapperClass' => 'OC\DB\Connection',
+ ),
+ );
+
+ /**
+ * @brief Get default connection parameters for a given DBMS.
+ * @param string $type DBMS type
+ * @throws \InvalidArgumentException If $type is invalid
+ * @return array Default connection parameters.
+ */
+ public function getDefaultConnectionParams($type) {
+ $normalizedType = $this->normalizeType($type);
+ if (!isset($this->defaultConnectionParams[$normalizedType])) {
+ throw new \InvalidArgumentException("Unsupported type: $type");
+ }
+ return $this->defaultConnectionParams[$normalizedType];
+ }
+
+ /**
+ * @brief Get default connection parameters for a given DBMS.
+ * @param string $type DBMS type
+ * @param array $additionalConnectionParams Additional connection parameters
+ * @return \OC\DB\Connection
+ */
+ public function getConnection($type, $additionalConnectionParams) {
+ $normalizedType = $this->normalizeType($type);
+ $eventManager = new \Doctrine\Common\EventManager();
+ switch ($normalizedType) {
+ case 'mysql':
+ // Send "SET NAMES utf8". Only required on PHP 5.3 below 5.3.6.
+ // See http://stackoverflow.com/questions/4361459/php-pdo-charset-set-names#4361485
+ $eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\MysqlSessionInit);
+ break;
+ case 'oci':
+ $eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\OracleSessionInit);
+ break;
+ }
+ $connection = \Doctrine\DBAL\DriverManager::getConnection(
+ array_merge($this->getDefaultConnectionParams($type), $additionalConnectionParams),
+ new \Doctrine\DBAL\Configuration(),
+ $eventManager
+ );
+ switch ($normalizedType) {
+ case 'sqlite3':
+ // Sqlite doesn't handle query caching and schema changes
+ // TODO: find a better way to handle this
+ /** @var $connection \OC\DB\Connection */
+ $connection->disableQueryStatementCaching();
+ break;
+ }
+ return $connection;
+ }
+
+ /**
+ * @brief Normalize DBMS type
+ * @param string $type DBMS type
+ * @return string Normalized DBMS type
+ */
+ public function normalizeType($type) {
+ return $type === 'sqlite' ? 'sqlite3' : $type;
+ }
+
+ /**
+ * @brief Checks whether the specified DBMS type is valid.
+ * @return bool
+ */
+ public function isValidType($type) {
+ $normalizedType = $this->normalizeType($type);
+ return isset($this->defaultConnectionParams[$normalizedType]);
+ }
+}
diff --git a/lib/private/db/connectionwrapper.php b/lib/private/db/connectionwrapper.php
index c2cfc21d2040c7ada2b6bab7917d7332ececffb8..132e76666ab5d705f6ab1fb9acdce6ad333f12a2 100644
--- a/lib/private/db/connectionwrapper.php
+++ b/lib/private/db/connectionwrapper.php
@@ -41,8 +41,8 @@ class ConnectionWrapper implements \OCP\IDBConnection {
/**
* Insert a row if a matching row doesn't exists.
- * @param string The table name (will replace *PREFIX*) to perform the replace on.
- * @param array
+ * @param string $table The table name (will replace *PREFIX*) to perform the replace on.
+ * @param array $input
*
* The input array if in the form:
*
diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php
index aaf2ea543b9ba31e6e58dc689c9cffce1cf4962b..4208dbd18f4e1c0386aeffecb8f93b5028a3a471 100644
--- a/lib/private/db/mdb2schemamanager.php
+++ b/lib/private/db/mdb2schemamanager.php
@@ -24,7 +24,7 @@ class MDB2SchemaManager {
}
/**
- * @brief saves database scheme to xml file
+ * saves database scheme to xml file
* @param string $file name of file
* @param int|string $mode
* @return bool
@@ -38,7 +38,7 @@ class MDB2SchemaManager {
}
/**
- * @brief Creates tables from XML file
+ * Creates tables from XML file
* @param string $file file to read structure from
* @return bool
*
@@ -51,7 +51,7 @@ class MDB2SchemaManager {
}
/**
- * @brief update the database scheme
+ * update the database scheme
* @param string $file file to read structure from
* @return string|boolean
*/
@@ -86,7 +86,7 @@ class MDB2SchemaManager {
$column->oldColumnName = $platform->quoteIdentifier($column->oldColumnName);
}
}
-
+
if ($generateSql) {
return $this->generateChangeScript($schemaDiff);
}
@@ -94,19 +94,6 @@ class MDB2SchemaManager {
return $this->executeSchemaChange($schemaDiff);
}
- /**
- * @brief drop a table
- * @param string $tableName the table to drop
- */
- public function dropTable($tableName) {
- $sm = $this->conn->getSchemaManager();
- $fromSchema = $sm->createSchema();
- $toSchema = clone $fromSchema;
- $toSchema->dropTable($tableName);
- $sql = $fromSchema->getMigrateToSql($toSchema, $this->conn->getDatabasePlatform());
- $this->conn->executeQuery($sql);
- }
-
/**
* remove all tables defined in a database structure xml file
* @param string $file the xml file describing the tables
@@ -124,27 +111,6 @@ class MDB2SchemaManager {
$this->executeSchemaChange($schemaDiff);
}
- /**
- * @brief replaces the ownCloud tables with a new set
- * @param $file string path to the MDB2 xml db export file
- */
- public function replaceDB( $file ) {
- $apps = \OC_App::getAllApps();
- $this->conn->beginTransaction();
- // Delete the old tables
- $this->removeDBStructure( \OC::$SERVERROOT . '/db_structure.xml' );
-
- foreach($apps as $app) {
- $path = \OC_App::getAppPath($app).'/appinfo/database.xml';
- if(file_exists($path)) {
- $this->removeDBStructure( $path );
- }
- }
-
- // Create new tables
- $this->conn->commit();
- }
-
/**
* @param \Doctrine\DBAL\Schema\Schema $schema
* @return bool
diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php
index 1c16d03eab2cbfbcd724cfc46278321ebd124979..597650985fac87000ea19e4ec133aea85ec0ffd3 100644
--- a/lib/private/db/mdb2schemareader.php
+++ b/lib/private/db/mdb2schemareader.php
@@ -66,7 +66,7 @@ class MDB2SchemaReader {
}
/**
- * @param\Doctrine\DBAL\Schema\Schema $schema
+ * @param \Doctrine\DBAL\Schema\Schema $schema
* @param \SimpleXMLElement $xml
* @throws \DomainException
*/
@@ -303,7 +303,7 @@ class MDB2SchemaReader {
}
/**
- * @param \SimpleXMLElement | string $xml
+ * @param \SimpleXMLElement|string $xml
* @return bool
*/
private function asBool($xml) {
diff --git a/lib/private/db/pgsqltools.php b/lib/private/db/pgsqltools.php
new file mode 100644
index 0000000000000000000000000000000000000000..c3ac140594d224c8c63eb09c3b9cdab3045331a7
--- /dev/null
+++ b/lib/private/db/pgsqltools.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * Copyright (c) 2014 Andreas Fischer <bantu@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\DB;
+
+/**
+* Various PostgreSQL specific helper functions.
+*/
+class PgSqlTools {
+ /**
+ * @brief Resynchronizes all sequences of a database after using INSERTs
+ * without leaving out the auto-incremented column.
+ * @param \OC\DB\Connection $conn
+ * @return null
+ */
+ public function resynchronizeDatabaseSequences(Connection $conn) {
+ $databaseName = $conn->getDatabase();
+ foreach ($conn->getSchemaManager()->listSequences() as $sequence) {
+ $sequenceName = $sequence->getName();
+ $sqlInfo = 'SELECT table_schema, table_name, column_name
+ FROM information_schema.columns
+ WHERE column_default = ? AND table_catalog = ?';
+ $sequenceInfo = $conn->fetchAssoc($sqlInfo, array(
+ "nextval('$sequenceName'::regclass)",
+ $databaseName
+ ));
+ $tableName = $sequenceInfo['table_name'];
+ $columnName = $sequenceInfo['column_name'];
+ $sqlMaxId = "SELECT MAX($columnName) FROM $tableName";
+ $sqlSetval = "SELECT setval('$sequenceName', ($sqlMaxId))";
+ $conn->executeQuery($sqlSetval);
+ }
+ }
+}
diff --git a/lib/private/db/statementwrapper.php b/lib/private/db/statementwrapper.php
index 492209b883bd94134cacd548dcb308ef0937c730..93fabc147caab6e538bb8ff4e812e14777fa4ca5 100644
--- a/lib/private/db/statementwrapper.php
+++ b/lib/private/db/statementwrapper.php
@@ -13,6 +13,7 @@
* @method string errorCode();
* @method array errorInfo();
* @method integer rowCount();
+ * @method array fetchAll(integer $fetchMode = null);
*/
class OC_DB_StatementWrapper {
/**
@@ -41,7 +42,7 @@ class OC_DB_StatementWrapper {
* make execute return the result instead of a bool
*
* @param array $input
- * @return \OC_DB_StatementWrapper | int
+ * @return \OC_DB_StatementWrapper|int
*/
public function execute($input=array()) {
if(OC_Config::getValue( "log_query", false)) {
diff --git a/lib/private/defaults.php b/lib/private/defaults.php
index fca798568c579402b85dbe87c7b5a4f7fad5fbfa..663c327a3b0eab5ce45de284d2b080c77f33f42e 100644
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -185,7 +185,7 @@ class OC_Defaults {
/**
* Returns mail header color
- * @return mail header color
+ * @return string
*/
public function getMailHeaderColor() {
if ($this->themeExist('getMailHeaderColor')) {
diff --git a/lib/private/fileproxy.php b/lib/private/fileproxy.php
index 88976c1b8e510e46d1f4a1ee96aac85e4b3d2809..2835e9746427cd88d6a35eb9d99b076aa54a9210 100644
--- a/lib/private/fileproxy.php
+++ b/lib/private/fileproxy.php
@@ -47,7 +47,7 @@ class OC_FileProxy{
/**
* fallback function when a proxy operation is not implemented
* @param string $function the name of the proxy operation
- * @param mixed
+ * @param mixed $arguments
*
* this implements a dummy proxy for all operations
*/
diff --git a/lib/private/files.php b/lib/private/files.php
index 3affcf10449d4d8c6ad2102801980d942f8efa27..7c437a16a98aa831c3507579bf17e26e8396e0c0 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -152,7 +152,7 @@ class OC_Files {
/** @var $storage \OC\Files\Storage\Storage */
list($storage) = $view->resolvePath($filename);
if ($storage->isLocal()) {
- self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename));
+ self::addSendfileHeader($filename);
} else {
\OC\Files\Filesystem::readfile($filename);
}
@@ -167,9 +167,11 @@ class OC_Files {
*/
private static function addSendfileHeader($filename) {
if (isset($_SERVER['MOD_X_SENDFILE_ENABLED'])) {
+ $filename = \OC\Files\Filesystem::getLocalFile($filename);
header("X-Sendfile: " . $filename);
}
if (isset($_SERVER['MOD_X_SENDFILE2_ENABLED'])) {
+ $filename = \OC\Files\Filesystem::getLocalFile($filename);
if (isset($_SERVER['HTTP_RANGE']) &&
preg_match("/^bytes=([0-9]+)-([0-9]*)$/", $_SERVER['HTTP_RANGE'], $range)) {
$filelength = filesize($filename);
@@ -185,6 +187,7 @@ class OC_Files {
}
if (isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) {
+ $filename = \OC::$WEBROOT . '/data' . \OC\Files\Filesystem::getRoot() . $filename;
header("X-Accel-Redirect: " . $filename);
}
}
@@ -222,7 +225,7 @@ class OC_Files {
* checks if the selected files are within the size constraint. If not, outputs an error page.
*
* @param string $dir
- * @param array | string $files
+ * @param array|string $files
*/
static function validateZipDownload($dir, $files) {
if (!OC_Config::getValue('allowZipDownload', true)) {
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index 1c9de56f8c5322879cef7a0a621f3e36fcb85fa0..59963f41e3d00f591cfc173f6bbbe637b15ec35d 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -109,7 +109,7 @@ class Cache {
* get the stored metadata of a file or folder
*
* @param string/int $file
- * @return array | false
+ * @return array|false
*/
public function get($file) {
if (is_string($file) or $file == '') {
@@ -142,11 +142,11 @@ class Cache {
} else {
//fix types
$data['fileid'] = (int)$data['fileid'];
- $data['size'] = (int)$data['size'];
+ $data['size'] = 0 + $data['size'];
$data['mtime'] = (int)$data['mtime'];
$data['storage_mtime'] = (int)$data['storage_mtime'];
$data['encrypted'] = (bool)$data['encrypted'];
- $data['unencrypted_size'] = (int)$data['unencrypted_size'];
+ $data['unencrypted_size'] = 0 + $data['unencrypted_size'];
$data['storage'] = $this->storageId;
$data['mimetype'] = $this->getMimetype($data['mimetype']);
$data['mimepart'] = $this->getMimetype($data['mimepart']);
@@ -450,7 +450,7 @@ class Cache {
* search for files matching $pattern
*
* @param string $pattern
- * @return array of file data
+ * @return array an array of file data
*/
public function search($pattern) {
@@ -532,9 +532,9 @@ class Cache {
$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
if ($row = $result->fetchRow()) {
list($sum, $min, $unencryptedSum) = array_values($row);
- $sum = (int)$sum;
- $min = (int)$min;
- $unencryptedSum = (int)$unencryptedSum;
+ $sum = 0 + $sum;
+ $min = 0 + $min;
+ $unencryptedSum = 0 + $unencryptedSum;
if ($min === -1) {
$totalSize = $min;
} else {
@@ -597,12 +597,16 @@ class Cache {
* get the path of a file on this storage by it's id
*
* @param int $id
- * @return string | null
+ * @return string|null
*/
public function getPathById($id) {
$sql = 'SELECT `path` FROM `*PREFIX*filecache` WHERE `fileid` = ? AND `storage` = ?';
$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
if ($row = $result->fetchRow()) {
+ // Oracle stores empty strings as null...
+ if ($row['path'] === null) {
+ return '';
+ }
return $row['path'];
} else {
return null;
@@ -636,7 +640,7 @@ class Cache {
/**
* normalize the given path
- * @param $path
+ * @param string $path
* @return string
*/
public function normalize($path) {
diff --git a/lib/private/files/cache/homecache.php b/lib/private/files/cache/homecache.php
index 2326c46e8d0213cbb7eca13172006c080746435a..f61769f0b9bff0ba7b1965db3ee87a317a048282 100644
--- a/lib/private/files/cache/homecache.php
+++ b/lib/private/files/cache/homecache.php
@@ -36,8 +36,10 @@ class HomeCache extends Cache {
$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
if ($row = $result->fetchRow()) {
list($sum, $unencryptedSum) = array_values($row);
- $totalSize = (int)$sum;
- $unencryptedSize = (int)$unencryptedSum;
+ $totalSize = 0 + $sum;
+ $unencryptedSize = 0 + $unencryptedSum;
+ $entry['size'] += 0;
+ $entry['unencrypted_size'] += 0;
if ($entry['size'] !== $totalSize) {
$this->update($id, array('size' => $totalSize));
}
diff --git a/lib/private/files/cache/permissions.php b/lib/private/files/cache/permissions.php
index 2e2bdb20b781cc4f80cb71124654bc03b8136c44..eba18af386318119cdee5cab63e12c33e56e1e3d 100644
--- a/lib/private/files/cache/permissions.php
+++ b/lib/private/files/cache/permissions.php
@@ -36,7 +36,7 @@ class Permissions {
$sql = 'SELECT `permissions` FROM `*PREFIX*permissions` WHERE `user` = ? AND `fileid` = ?';
$result = \OC_DB::executeAudited($sql, array($user, $fileId));
if ($row = $result->fetchRow()) {
- return $row['permissions'];
+ return $this->updatePermissions($row['permissions']);
} else {
return -1;
}
@@ -78,7 +78,7 @@ class Permissions {
$result = \OC_DB::executeAudited($sql, $params);
$filePermissions = array();
while ($row = $result->fetchRow()) {
- $filePermissions[$row['fileid']] = $row['permissions'];
+ $filePermissions[$row['fileid']] = $this->updatePermissions($row['permissions']);
}
return $filePermissions;
}
@@ -99,7 +99,7 @@ class Permissions {
$result = \OC_DB::executeAudited($sql, array($parentId, $user));
$filePermissions = array();
while ($row = $result->fetchRow()) {
- $filePermissions[$row['fileid']] = $row['permissions'];
+ $filePermissions[$row['fileid']] = $this->updatePermissions($row['permissions']);
}
return $filePermissions;
}
@@ -140,4 +140,17 @@ class Permissions {
}
return $users;
}
+
+ /**
+ * check if admin removed the share permission for the user and update the permissions
+ *
+ * @param int $permissions
+ * @return int
+ */
+ protected function updatePermissions($permissions) {
+ if (\OCP\Util::isSharingDisabledForUser()) {
+ $permissions &= ~\OCP\PERMISSION_SHARE;
+ }
+ return $permissions;
+ }
}
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index c0bdde06a755ce04b397797d8847fe6c65c61557..b97070fcdf0b910e514cffba8192b2b41e6a7cb7 100644
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@ -10,6 +10,7 @@ namespace OC\Files\Cache;
use OC\Files\Filesystem;
use OC\Hooks\BasicEmitter;
+use OCP\Config;
/**
* Class Scanner
@@ -26,22 +27,27 @@ class Scanner extends BasicEmitter {
/**
* @var \OC\Files\Storage\Storage $storage
*/
- private $storage;
+ protected $storage;
/**
* @var string $storageId
*/
- private $storageId;
+ protected $storageId;
/**
* @var \OC\Files\Cache\Cache $cache
*/
- private $cache;
+ protected $cache;
/**
* @var \OC\Files\Cache\Permissions $permissionsCache
*/
- private $permissionsCache;
+ protected $permissionsCache;
+
+ /**
+ * @var boolean $cacheActive If true, perform cache operations, if false, do not affect cache
+ */
+ protected $cacheActive;
const SCAN_RECURSIVE = true;
const SCAN_SHALLOW = false;
@@ -54,6 +60,7 @@ class Scanner extends BasicEmitter {
$this->storageId = $this->storage->getId();
$this->cache = $storage->getCache();
$this->permissionsCache = $storage->getPermissionsCache();
+ $this->cacheActive = !Config::getSystemValue('filesystem_cache_readonly', false);
}
/**
@@ -61,7 +68,7 @@ class Scanner extends BasicEmitter {
* *
*
* @param string $path
- * @return array with metadata of the file
+ * @return array an array of metadata of the file
*/
public function getData($path) {
if (!$this->storage->isReadable($path)) {
@@ -88,7 +95,7 @@ class Scanner extends BasicEmitter {
* @param string $file
* @param int $reuseExisting
* @param bool $parentExistsInCache
- * @return array with metadata of the scanned file
+ * @return array an array of metadata of the scanned file
*/
public function scanFile($file, $reuseExisting = 0, $parentExistsInCache = false) {
if (!self::isPartialFile($file)
@@ -137,9 +144,12 @@ class Scanner extends BasicEmitter {
$parent = '';
}
$parentCacheData = $this->cache->get($parent);
- $this->cache->update($parentCacheData['fileid'], array(
- 'etag' => $this->storage->getETag($parent),
- ));
+ \OC_Hook::emit('Scanner', 'updateCache', array('file' => $file, 'data' => $data));
+ if($this->cacheActive) {
+ $this->cache->update($parentCacheData['fileid'], array(
+ 'etag' => $this->storage->getETag($parent),
+ ));
+ }
}
}
}
@@ -156,12 +166,18 @@ class Scanner extends BasicEmitter {
}
}
if (!empty($newData)) {
- $data['fileid'] = $this->cache->put($file, $newData);
+ \OC_Hook::emit('Scanner', 'addToCache', array('file' => $file, 'data' => $newData));
+ if($this->cacheActive) {
+ $data['fileid'] = $this->cache->put($file, $newData);
+ }
$this->emit('\OC\Files\Cache\Scanner', 'postScanFile', array($file, $this->storageId));
\OC_Hook::emit('\OC\Files\Cache\Scanner', 'post_scan_file', array('path' => $file, 'storage' => $this->storageId));
}
} else {
- $this->cache->remove($file);
+ \OC_Hook::emit('Scanner', 'removeFromCache', array('file' => $file));
+ if($this->cacheActive) {
+ $this->cache->remove($file);
+ }
}
return $data;
}
@@ -174,7 +190,7 @@ class Scanner extends BasicEmitter {
* @param string $path
* @param bool $recursive
* @param int $reuse
- * @return array with the meta data of the scanned file or folder
+ * @return array an array of the meta data of the scanned file or folder
*/
public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1) {
if ($reuse === -1) {
@@ -244,7 +260,10 @@ class Scanner extends BasicEmitter {
$removedChildren = \array_diff($existingChildren, $newChildren);
foreach ($removedChildren as $childName) {
$child = ($path) ? $path . '/' . $childName : $childName;
- $this->cache->remove($child);
+ \OC_Hook::emit('Scanner', 'removeFromCache', array('file' => $child));
+ if($this->cacheActive) {
+ $this->cache->remove($child);
+ }
}
\OC_DB::commit();
if ($exceptionOccurred){
@@ -263,17 +282,21 @@ class Scanner extends BasicEmitter {
$size += $childSize;
}
}
- $this->cache->put($path, array('size' => $size));
+ $newData = array('size' => $size);
+ \OC_Hook::emit('Scanner', 'addToCache', array('file' => $child, 'data' => $newData));
+ if($this->cacheActive) {
+ $this->cache->put($path, $newData);
+ }
}
$this->emit('\OC\Files\Cache\Scanner', 'postScanFolder', array($path, $this->storageId));
return $size;
}
/**
- * @brief check if the file should be ignored when scanning
+ * check if the file should be ignored when scanning
* NOTE: files with a '.part' extension are ignored as well!
* prevents unfinished put requests to be scanned
- * @param String $file
+ * @param string $file
* @return boolean
*/
public static function isPartialFile($file) {
@@ -290,8 +313,19 @@ class Scanner extends BasicEmitter {
$lastPath = null;
while (($path = $this->cache->getIncomplete()) !== false && $path !== $lastPath) {
$this->scan($path, self::SCAN_RECURSIVE, self::REUSE_ETAG);
- $this->cache->correctFolderSize($path);
+ \OC_Hook::emit('Scanner', 'correctFolderSize', array('path' => $path));
+ if($this->cacheActive) {
+ $this->cache->correctFolderSize($path);
+ }
$lastPath = $path;
}
}
+
+ /**
+ * Set whether the cache is affected by scan operations
+ * @param boolean $active The active state of the cache
+ */
+ public function setCacheActive($active) {
+ $this->cacheActive = $active;
+ }
}
diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php
index 199ce5dee78f158369d605c158cc184b34494dca..f6feb6624b29dc5c6f7fdedc0da02cf3c170cded 100644
--- a/lib/private/files/cache/updater.php
+++ b/lib/private/files/cache/updater.php
@@ -17,7 +17,7 @@ class Updater {
* resolve a path to a storage and internal path
*
* @param string $path the relative path
- * @return array consisting of the storage and the internal path
+ * @return array an array consisting of the storage and the internal path
*/
static public function resolvePath($path) {
$view = \OC\Files\Filesystem::getView();
@@ -108,7 +108,7 @@ class Updater {
}
/**
- * @brief get file owner and path
+ * get file owner and path
* @param string $filename
* @return string[] with the oweners uid and the owners path
*/
diff --git a/lib/private/files/cache/watcher.php b/lib/private/files/cache/watcher.php
index 48aa6f853ce8db9ae9052ef65859ebc1e4cf059c..5a4f53fb73d539413af96ccc48c4cacdcc361a6d 100644
--- a/lib/private/files/cache/watcher.php
+++ b/lib/private/files/cache/watcher.php
@@ -45,7 +45,7 @@ class Watcher {
}
/**
- * @param int $policy either \OC\Files\Cache\Watcher::UPDATE_NEVER, \OC\Files\Cache\Watcher::UPDATE_ONCE, \OC\Files\Cache\Watcher::UPDATE_ALWAYS
+ * @param int $policy either \OC\Files\Cache\Watcher::CHECK_NEVER, \OC\Files\Cache\Watcher::CHECK_ONCE, \OC\Files\Cache\Watcher::CHECK_ALWAYS
*/
public function setPolicy($policy) {
$this->watchPolicy = $policy;
@@ -55,7 +55,7 @@ class Watcher {
* check $path for updates
*
* @param string $path
- * @return boolean | array true if path was updated, otherwise the cached data is returned
+ * @return boolean|array true if path was updated, otherwise the cached data is returned
*/
public function checkUpdate($path) {
if ($this->watchPolicy === self::CHECK_ALWAYS or ($this->watchPolicy === self::CHECK_ONCE and array_search($path, $this->checkedPaths) === false)) {
diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php
index d6940f50bf1b61c5b1e0494163fadf498a2aaec3..e7afeb4cccee400912c74751e66f84abebca052a 100644
--- a/lib/private/files/fileinfo.php
+++ b/lib/private/files/fileinfo.php
@@ -147,7 +147,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
}
/**
- * @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER
+ * @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
*/
public function getType() {
if (isset($this->data['type'])) {
@@ -196,4 +196,28 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
public function isShareable() {
return $this->checkPermissions(\OCP\PERMISSION_SHARE);
}
+
+ /**
+ * Check if a file or folder is shared
+ * @return bool
+ */
+ public function isShared() {
+ $sid = $this->getStorage()->getId();
+ if (!is_null($sid)) {
+ $sid = explode(':', $sid);
+ return ($sid[0] === 'shared');
+ }
+
+ return false;
+ }
+
+ public function isMounted() {
+ $sid = $this->getStorage()->getId();
+ if (!is_null($sid)) {
+ $sid = explode(':', $sid);
+ return ($sid[0] !== 'local' and $sid[0] !== 'home');
+ }
+
+ return false;
+ }
}
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index 52df1bec6117c5c823b1521cbb28fc9846dfc59d..ad7213d23683fbaf126c28935628fd276d7d6c58 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -245,7 +245,7 @@ class Filesystem {
}
/**
- * @param $id
+ * @param string $id
* @return Mount\Mount[]
*/
public static function getMountByStorageId($id) {
@@ -256,7 +256,7 @@ class Filesystem {
}
/**
- * @param $id
+ * @param int $id
* @return Mount\Mount[]
*/
public static function getMountByNumericId($id) {
@@ -270,7 +270,7 @@ class Filesystem {
* resolve a path to a storage and internal path
*
* @param string $path
- * @return array consisting of the storage and the internal path
+ * @return array an array consisting of the storage and the internal path
*/
static public function resolvePath($path) {
if (!self::$mounts) {
@@ -384,7 +384,7 @@ class Filesystem {
}
/**
- * @brief get the relative path of the root data directory for the current user
+ * get the relative path of the root data directory for the current user
* @return string
*
* Returns path like /admin/files
@@ -502,7 +502,7 @@ class Filesystem {
}
/**
- * @brief check if the directory should be ignored when scanning
+ * check if the directory should be ignored when scanning
* NOTE: the special directories . and .. would cause never ending recursion
* @param String $dir
* @return boolean
@@ -662,7 +662,7 @@ class Filesystem {
}
/**
- * @brief Fix common problems with a file path
+ * Fix common problems with a file path
* @param string $path
* @param bool $stripTrailingSlash
* @return string
diff --git a/lib/private/files/mapper.php b/lib/private/files/mapper.php
index 833d4bd8d1cfa9bee9e43dc3efa0b2405918536b..666719da12debc83c2e7a6827c71c8f26b3a306a 100644
--- a/lib/private/files/mapper.php
+++ b/lib/private/files/mapper.php
@@ -97,8 +97,8 @@ class Mapper
}
/**
- * @param $path
- * @param $root
+ * @param string $path
+ * @param string $root
* @return false|string
*/
public function stripRootFolder($path, $root) {
diff --git a/lib/private/files/mount/manager.php b/lib/private/files/mount/manager.php
index 91460b72730cbf735ee865cdc6c98ad33f37067a..db1f4600c742ba5f2994792885d13429d15aa5c2 100644
--- a/lib/private/files/mount/manager.php
+++ b/lib/private/files/mount/manager.php
@@ -33,7 +33,7 @@ class Manager {
/**
* Find the mount for $path
*
- * @param $path
+ * @param string $path
* @return Mount
*/
public function find($path) {
@@ -61,7 +61,7 @@ class Manager {
/**
* Find all mounts in $path
*
- * @param $path
+ * @param string $path
* @return Mount[]
*/
public function findIn($path) {
@@ -112,7 +112,7 @@ class Manager {
/**
* Find mounts by numeric storage id
*
- * @param string $id
+ * @param int $id
* @return Mount[]
*/
public function findByNumericId($id) {
diff --git a/lib/private/files/mount/mount.php b/lib/private/files/mount/mount.php
index 08d5ddf348be9e850904941a538ba53d3c20a1ec..7c40853ac95d30993c3785db8bffe506da951df1 100644
--- a/lib/private/files/mount/mount.php
+++ b/lib/private/files/mount/mount.php
@@ -28,7 +28,7 @@ class Mount {
private $loader;
/**
- * @param string | \OC\Files\Storage\Storage $storage
+ * @param string|\OC\Files\Storage\Storage $storage
* @param string $mountpoint
* @param array $arguments (optional)\
* @param \OC\Files\Storage\Loader $loader
@@ -59,12 +59,23 @@ class Mount {
}
/**
+ * get complete path to the mount point, relative to data/
+ *
* @return string
*/
public function getMountPoint() {
return $this->mountPoint;
}
+ /**
+ * get name of the mount point
+ *
+ * @return string
+ */
+ public function getMountPointName() {
+ return basename(rtrim($this->mountPoint, '/'));
+ }
+
/**
* @param string $mountPoint new mount point
*/
@@ -150,6 +161,6 @@ class Mount {
* @param callable $wrapper
*/
public function wrapStorage($wrapper) {
- $this->storage = $wrapper($this->mountPoint, $this->storage);
+ $this->storage = $wrapper($this->mountPoint, $this->getStorage());
}
}
diff --git a/lib/private/files/node/folder.php b/lib/private/files/node/folder.php
index d9e0ddc2d610d17c6ab4e9a82c09d88ee01ac78d..1af34fc2be6dc406ce4bef1ea93ae79be0000b7d 100644
--- a/lib/private/files/node/folder.php
+++ b/lib/private/files/node/folder.php
@@ -296,7 +296,7 @@ class Folder extends Node implements \OCP\Files\Folder {
}
/**
- * @param $id
+ * @param int $id
* @return \OC\Files\Node\Node[]
*/
public function getById($id) {
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index 8a263d4ce1efc333875bc53b67f129a7c13217a7..6b11603323ab9e04127b0f6dfcacb5aa689478ac 100644
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -8,6 +8,9 @@
namespace OC\Files\Storage;
+use OC\Files\Filesystem;
+use OC\Files\Cache\Watcher;
+
/**
* Storage backend class for providing common filesystem operation methods
* which are not storage-backend specific.
@@ -19,7 +22,6 @@ namespace OC\Files\Storage;
* Some \OC\Files\Storage\Common methods call functions which are first defined
* in classes which extend it, e.g. $this->stat() .
*/
-
abstract class Common implements \OC\Files\Storage\Storage {
protected $cache;
protected $scanner;
@@ -35,6 +37,22 @@ abstract class Common implements \OC\Files\Storage\Storage {
public function __construct($parameters) {
}
+ /**
+ * Remove a file of folder
+ *
+ * @param string $path
+ * @return bool
+ */
+ protected function remove($path) {
+ if ($this->is_dir($path)) {
+ return $this->rmdir($path);
+ } else if ($this->is_file($path)) {
+ return $this->unlink($path);
+ } else {
+ return false;
+ }
+ }
+
public function is_dir($path) {
return $this->filetype($path) == 'dir';
}
@@ -81,6 +99,10 @@ abstract class Common implements \OC\Files\Storage\Storage {
}
public function isSharable($path) {
+ if (\OC_Util::isSharingDisabledForUser()) {
+ return false;
+ }
+
return $this->isReadable($path);
}
@@ -132,20 +154,33 @@ abstract class Common implements \OC\Files\Storage\Storage {
}
public function rename($path1, $path2) {
- if ($this->copy($path1, $path2)) {
- $this->removeCachedFile($path1);
- return $this->unlink($path1);
- } else {
- return false;
- }
+ $this->remove($path2);
+
+ $this->removeCachedFile($path1);
+ return $this->copy($path1, $path2) and $this->remove($path1);
}
public function copy($path1, $path2) {
- $source = $this->fopen($path1, 'r');
- $target = $this->fopen($path2, 'w');
- list($count, $result) = \OC_Helper::streamCopy($source, $target);
- $this->removeCachedFile($path2);
- return $result;
+ if ($this->is_dir($path1)) {
+ $this->remove($path2);
+ $dir = $this->opendir($path1);
+ $this->mkdir($path2);
+ while ($file = readdir($dir)) {
+ if (!Filesystem::isIgnoredDir($file)) {
+ if (!$this->copy($path1 . '/' . $file, $path2 . '/' . $file)) {
+ return false;
+ }
+ }
+ }
+ closedir($dir);
+ return true;
+ } else {
+ $source = $this->fopen($path1, 'r');
+ $target = $this->fopen($path2, 'w');
+ list(, $result) = \OC_Helper::streamCopy($source, $target);
+ $this->removeCachedFile($path2);
+ return $result;
+ }
}
public function getMimeType($path) {
@@ -276,6 +311,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
public function getWatcher($path = '') {
if (!isset($this->watcher)) {
$this->watcher = new \OC\Files\Cache\Watcher($this);
+ $this->watcher->setPolicy(\OC::$server->getConfig()->getSystemValue('filesystem_check_changes', Watcher::CHECK_ONCE));
}
return $this->watcher;
}
@@ -317,7 +353,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
* clean a path, i.e. remove all redundant '.' and '..'
* making sure that it can't point to higher than '/'
*
- * @param $path The path to clean
+ * @param string $path The path to clean
* @return string cleaned path
*/
public function cleanPath($path) {
@@ -347,7 +383,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
/**
* get the free space in the storage
*
- * @param $path
+ * @param string $path
* @return int
*/
public function free_space($path) {
@@ -376,4 +412,14 @@ abstract class Common implements \OC\Files\Storage\Storage {
protected function removeCachedFile($path) {
unset($this->cachedFiles[$path]);
}
+
+ /**
+ * Check if the storage is an instance of $class or is a wrapper for a storage that is an instance of $class
+ *
+ * @param string $class
+ * @return bool
+ */
+ public function instanceOfStorage($class) {
+ return is_a($this, $class);
+ }
}
diff --git a/lib/private/files/storage/home.php b/lib/private/files/storage/home.php
index 1c2a682f197e7a789a8fa81d88f6e90cf127399a..f66096f6d9c1660900788afa2433bae3274d7219 100644
--- a/lib/private/files/storage/home.php
+++ b/lib/private/files/storage/home.php
@@ -23,7 +23,7 @@ class Home extends Local {
protected $user;
/**
- * @brief Construct a Home storage instance
+ * Construct a Home storage instance
* @param array $arguments array with "user" containing the
* storage owner and "legacy" containing "true" if the storage is
* a legacy storage with "local::" URL instead of the new "home::" one.
@@ -57,7 +57,7 @@ class Home extends Local {
}
/**
- * @brief Returns the owner of this home storage
+ * Returns the owner of this home storage
* @return \OC\User\User owner of this home storage
*/
public function getUser() {
diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index de940fc7cdb6735498742c38d2923a8bbac5b19f..e33747bbd5219d6e63da351750b9a48c2ba36701 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -89,11 +89,10 @@ if (\OC_Util::runningOnWindows()) {
public function stat($path) {
$fullPath = $this->datadir . $path;
$statResult = stat($fullPath);
-
- if ($statResult['size'] < 0) {
- $size = self::getFileSizeFromOS($fullPath);
- $statResult['size'] = $size;
- $statResult[7] = $size;
+ if (PHP_INT_SIZE === 4 && !$this->is_dir($path)) {
+ $filesize = $this->filesize($path);
+ $statResult['size'] = $filesize;
+ $statResult[7] = $filesize;
}
return $statResult;
}
@@ -109,15 +108,13 @@ if (\OC_Util::runningOnWindows()) {
public function filesize($path) {
if ($this->is_dir($path)) {
return 0;
- } else {
- $fullPath = $this->datadir . $path;
- $fileSize = filesize($fullPath);
- if ($fileSize < 0) {
- return self::getFileSizeFromOS($fullPath);
- }
-
- return $fileSize;
}
+ $fullPath = $this->datadir . $path;
+ if (PHP_INT_SIZE === 4) {
+ $helper = new \OC\LargeFileHelper;
+ return $helper->getFilesize($fullPath);
+ }
+ return filesize($fullPath);
}
public function isReadable($path) {
@@ -164,7 +161,14 @@ if (\OC_Util::runningOnWindows()) {
}
public function unlink($path) {
- return $this->delTree($path);
+ if ($this->is_dir($path)) {
+ return $this->rmdir($path);
+ } else if ($this->is_file($path)) {
+ return unlink($this->datadir . $path);
+ } else {
+ return false;
+ }
+
}
public function rename($path1, $path2) {
@@ -177,20 +181,21 @@ if (\OC_Util::runningOnWindows()) {
return false;
}
- if ($return = rename($this->datadir . $path1, $this->datadir . $path2)) {
+ if ($this->is_dir($path2)) {
+ $this->rmdir($path2);
+ } else if ($this->is_file($path2)) {
+ $this->unlink($path2);
}
- return $return;
+
+ return rename($this->datadir . $path1, $this->datadir . $path2);
}
public function copy($path1, $path2) {
- if ($this->is_dir($path2)) {
- if (!$this->file_exists($path2)) {
- $this->mkdir($path2);
- }
- $source = substr($path1, strrpos($path1, '/') + 1);
- $path2 .= $source;
+ if ($this->is_dir($path1)) {
+ return parent::copy($path1, $path2);
+ } else {
+ return copy($this->datadir . $path1, $this->datadir . $path2);
}
- return copy($this->datadir . $path1, $this->datadir . $path2);
}
public function fopen($path, $mode) {
@@ -212,59 +217,6 @@ if (\OC_Util::runningOnWindows()) {
return $return;
}
- /**
- * @param string $dir
- */
- private function delTree($dir) {
- $dirRelative = $dir;
- $dir = $this->datadir . $dir;
- if (!file_exists($dir)) return true;
- if (!is_dir($dir) || is_link($dir)) return unlink($dir);
- foreach (scandir($dir) as $item) {
- if ($item == '.' || $item == '..') continue;
- if (is_file($dir . '/' . $item)) {
- if (unlink($dir . '/' . $item)) {
- }
- } elseif (is_dir($dir . '/' . $item)) {
- if (!$this->delTree($dirRelative . "/" . $item)) {
- return false;
- };
- }
- }
- if ($return = rmdir($dir)) {
- }
- return $return;
- }
-
- /**
- * @param string $fullPath
- */
- private static function getFileSizeFromOS($fullPath) {
- $name = strtolower(php_uname('s'));
- // Windows OS: we use COM to access the filesystem
- if (strpos($name, 'win') !== false) {
- if (class_exists('COM')) {
- $fsobj = new \COM("Scripting.FileSystemObject");
- $f = $fsobj->GetFile($fullPath);
- return $f->Size;
- }
- } else if (strpos($name, 'bsd') !== false) {
- if (\OC_Helper::is_function_enabled('exec')) {
- return (float)exec('stat -f %z ' . escapeshellarg($fullPath));
- }
- } else if (strpos($name, 'linux') !== false) {
- if (\OC_Helper::is_function_enabled('exec')) {
- return (float)exec('stat -c %s ' . escapeshellarg($fullPath));
- }
- } else {
- \OC_Log::write('core',
- 'Unable to determine file size of "' . $fullPath . '". Unknown OS: ' . $name,
- \OC_Log::ERROR);
- }
-
- return 0;
- }
-
public function hash($type, $path, $raw = false) {
return hash_file($type, $this->datadir . $path, $raw);
}
diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index 07691661644210bcd098eea483aeee4120913838..ea4deaa66e84e1cfba2472035242ed4d6aa4ebd4 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -10,29 +10,33 @@ namespace OC\Files\Storage;
/**
* for local filestore, we only have to map the paths
*/
-class MappedLocal extends \OC\Files\Storage\Common{
+class MappedLocal extends \OC\Files\Storage\Common {
protected $datadir;
private $mapper;
public function __construct($arguments) {
- $this->datadir=$arguments['datadir'];
- if(substr($this->datadir, -1)!=='/') {
- $this->datadir.='/';
+ $this->datadir = $arguments['datadir'];
+ if (substr($this->datadir, -1) !== '/') {
+ $this->datadir .= '/';
}
- $this->mapper= new \OC\Files\Mapper($this->datadir);
+ $this->mapper = new \OC\Files\Mapper($this->datadir);
}
+
public function __destruct() {
if (defined('PHPUNIT_RUN')) {
$this->mapper->removePath($this->datadir, true, true);
}
}
- public function getId(){
- return 'local::'.$this->datadir;
+
+ public function getId() {
+ return 'local::' . $this->datadir;
}
+
public function mkdir($path) {
return @mkdir($this->buildPath($path), 0777, true);
}
+
public function rmdir($path) {
try {
$it = new \RecursiveIteratorIterator(
@@ -68,9 +72,10 @@ class MappedLocal extends \OC\Files\Storage\Common{
return false;
}
}
+
public function opendir($path) {
$files = array('.', '..');
- $physicalPath= $this->buildPath($path);
+ $physicalPath = $this->buildPath($path);
$logicalPath = $this->mapper->physicalToLogic($physicalPath);
$dh = opendir($physicalPath);
@@ -80,7 +85,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
continue;
}
- $logicalFilePath = $this->mapper->physicalToLogic($physicalPath.'/'.$file);
+ $logicalFilePath = $this->mapper->physicalToLogic($physicalPath . '/' . $file);
$file= $this->mapper->stripRootFolder($logicalFilePath, $logicalPath);
$file = $this->stripLeading($file);
@@ -88,121 +93,151 @@ class MappedLocal extends \OC\Files\Storage\Common{
}
}
- \OC\Files\Stream\Dir::register('local-win32'.$path, $files);
- return opendir('fakedir://local-win32'.$path);
+ \OC\Files\Stream\Dir::register('local-win32' . $path, $files);
+ return opendir('fakedir://local-win32' . $path);
}
+
public function is_dir($path) {
- if(substr($path, -1)=='/') {
- $path=substr($path, 0, -1);
+ if (substr($path, -1) == '/') {
+ $path = substr($path, 0, -1);
}
return is_dir($this->buildPath($path));
}
+
public function is_file($path) {
return is_file($this->buildPath($path));
}
+
public function stat($path) {
$fullPath = $this->buildPath($path);
$statResult = stat($fullPath);
-
- if ($statResult['size'] < 0) {
- $size = self::getFileSizeFromOS($fullPath);
- $statResult['size'] = $size;
- $statResult[7] = $size;
+ if (PHP_INT_SIZE === 4 && !$this->is_dir($path)) {
+ $filesize = $this->filesize($path);
+ $statResult['size'] = $filesize;
+ $statResult[7] = $filesize;
}
return $statResult;
}
+
public function filetype($path) {
- $filetype=filetype($this->buildPath($path));
- if($filetype=='link') {
- $filetype=filetype(realpath($this->buildPath($path)));
+ $filetype = filetype($this->buildPath($path));
+ if ($filetype == 'link') {
+ $filetype = filetype(realpath($this->buildPath($path)));
}
return $filetype;
}
+
public function filesize($path) {
- if($this->is_dir($path)) {
+ if ($this->is_dir($path)) {
return 0;
- }else{
- $fullPath = $this->buildPath($path);
- $fileSize = filesize($fullPath);
- if ($fileSize < 0) {
- return self::getFileSizeFromOS($fullPath);
- }
-
- return $fileSize;
}
+ $fullPath = $this->buildPath($path);
+ if (PHP_INT_SIZE === 4) {
+ $helper = new \OC\LargeFileHelper;
+ return $helper->getFilesize($fullPath);
+ }
+ return filesize($fullPath);
}
+
public function isReadable($path) {
return is_readable($this->buildPath($path));
}
+
public function isUpdatable($path) {
return is_writable($this->buildPath($path));
}
+
public function file_exists($path) {
return file_exists($this->buildPath($path));
}
+
public function filemtime($path) {
return filemtime($this->buildPath($path));
}
- public function touch($path, $mtime=null) {
+
+ public function touch($path, $mtime = null) {
// sets the modification time of the file to the given value.
// If mtime is nil the current time is set.
// note that the access time of the file always changes to the current time.
- if(!is_null($mtime)) {
- $result=touch( $this->buildPath($path), $mtime );
- }else{
- $result=touch( $this->buildPath($path));
+ if (!is_null($mtime)) {
+ $result = touch($this->buildPath($path), $mtime);
+ } else {
+ $result = touch($this->buildPath($path));
}
- if( $result ) {
- clearstatcache( true, $this->buildPath($path) );
+ if ($result) {
+ clearstatcache(true, $this->buildPath($path));
}
return $result;
}
+
public function file_get_contents($path) {
return file_get_contents($this->buildPath($path));
}
+
public function file_put_contents($path, $data) {
return file_put_contents($this->buildPath($path), $data);
}
+
public function unlink($path) {
return $this->delTree($path);
}
+
public function rename($path1, $path2) {
if (!$this->isUpdatable($path1)) {
- \OC_Log::write('core', 'unable to rename, file is not writable : '.$path1, \OC_Log::ERROR);
+ \OC_Log::write('core', 'unable to rename, file is not writable : ' . $path1, \OC_Log::ERROR);
return false;
}
- if(! $this->file_exists($path1)) {
- \OC_Log::write('core', 'unable to rename, file does not exists : '.$path1, \OC_Log::ERROR);
+ if (!$this->file_exists($path1)) {
+ \OC_Log::write('core', 'unable to rename, file does not exists : ' . $path1, \OC_Log::ERROR);
return false;
}
+ if ($this->is_dir($path2)) {
+ $this->rmdir($path2);
+ } else if ($this->is_file($path2)) {
+ $this->unlink($path2);
+ }
+
$physicPath1 = $this->buildPath($path1);
$physicPath2 = $this->buildPath($path2);
- if($return=rename($physicPath1, $physicPath2)) {
+ if ($return = rename($physicPath1, $physicPath2)) {
// mapper needs to create copies or all children
$this->copyMapping($path1, $path2);
$this->cleanMapper($physicPath1, false, true);
}
return $return;
}
+
public function copy($path1, $path2) {
- if($this->is_dir($path2)) {
- if(!$this->file_exists($path2)) {
- $this->mkdir($path2);
+ if ($this->is_dir($path1)) {
+ if ($this->is_dir($path2)) {
+ $this->rmdir($path2);
+ } else if ($this->is_file($path2)) {
+ $this->unlink($path2);
}
- $source=substr($path1, strrpos($path1, '/')+1);
- $path2.=$source;
- }
- if($return=copy($this->buildPath($path1), $this->buildPath($path2))) {
- // mapper needs to create copies or all children
- $this->copyMapping($path1, $path2);
+ $dir = $this->opendir($path1);
+ $this->mkdir($path2);
+ while ($file = readdir($dir)) {
+ if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
+ if (!$this->copy($path1 . '/' . $file, $path2 . '/' . $file)) {
+ return false;
+ }
+ }
+ }
+ closedir($dir);
+ return true;
+ } else {
+ if ($return = copy($this->buildPath($path1), $this->buildPath($path2))) {
+ $this->copyMapping($path1, $path2);
+ }
+ return $return;
}
- return $return;
}
+
public function fopen($path, $mode) {
- if($return=fopen($this->buildPath($path), $mode)) {
- switch($mode) {
+ if ($return = fopen($this->buildPath($path), $mode)) {
+ switch ($mode) {
case 'r':
break;
case 'r+':
@@ -223,15 +258,15 @@ class MappedLocal extends \OC\Files\Storage\Common{
* @param string $dir
*/
private function delTree($dir, $isLogicPath=true) {
- $dirRelative=$dir;
+ $dirRelative = $dir;
if ($isLogicPath) {
- $dir=$this->buildPath($dir);
+ $dir = $this->buildPath($dir);
}
if (!file_exists($dir)) {
return true;
}
if (!is_dir($dir) || is_link($dir)) {
- if($return=unlink($dir)) {
+ if ($return = unlink($dir)) {
$this->cleanMapper($dir, false);
return $return;
}
@@ -240,52 +275,23 @@ class MappedLocal extends \OC\Files\Storage\Common{
if ($item == '.' || $item == '..') {
continue;
}
- if(is_file($dir.'/'.$item)) {
- if(unlink($dir.'/'.$item)) {
- $this->cleanMapper($dir.'/'.$item, false);
+ if (is_file($dir . '/' . $item)) {
+ if (unlink($dir . '/' . $item)) {
+ $this->cleanMapper($dir . '/' . $item, false);
}
- }elseif(is_dir($dir.'/'.$item)) {
- if (!$this->delTree($dir. "/" . $item, false)) {
+ } elseif (is_dir($dir . '/' . $item)) {
+ if (!$this->delTree($dir . "/" . $item, false)) {
return false;
};
}
}
- if($return=rmdir($dir)) {
+ if ($return = rmdir($dir)) {
$this->cleanMapper($dir, false);
}
return $return;
}
- /**
- * @param string $fullPath
- */
- private static function getFileSizeFromOS($fullPath) {
- $name = strtolower(php_uname('s'));
- // Windows OS: we use COM to access the filesystem
- if (strpos($name, 'win') !== false) {
- if (class_exists('COM')) {
- $fsobj = new \COM("Scripting.FileSystemObject");
- $f = $fsobj->GetFile($fullPath);
- return $f->Size;
- }
- } else if (strpos($name, 'bsd') !== false) {
- if (\OC_Helper::is_function_enabled('exec')) {
- return (float)exec('stat -f %z ' . escapeshellarg($fullPath));
- }
- } else if (strpos($name, 'linux') !== false) {
- if (\OC_Helper::is_function_enabled('exec')) {
- return (float)exec('stat -c %s ' . escapeshellarg($fullPath));
- }
- } else {
- \OC_Log::write('core',
- 'Unable to determine file size of "'.$fullPath.'". Unknown OS: '.$name,
- \OC_Log::ERROR);
- }
-
- return 0;
- }
-
- public function hash($type, $path, $raw=false) {
+ public function hash($type, $path, $raw = false) {
return hash_file($type, $this->buildPath($path), $raw);
}
@@ -296,9 +302,11 @@ class MappedLocal extends \OC\Files\Storage\Common{
public function search($query) {
return $this->searchInDir($query);
}
+
public function getLocalFile($path) {
return $this->buildPath($path);
}
+
public function getLocalFolder($path) {
return $this->buildPath($path);
}
@@ -306,20 +314,20 @@ class MappedLocal extends \OC\Files\Storage\Common{
/**
* @param string $query
*/
- protected function searchInDir($query, $dir='') {
- $files=array();
+ protected function searchInDir($query, $dir = '') {
+ $files = array();
$physicalDir = $this->buildPath($dir);
foreach (scandir($physicalDir) as $item) {
if ($item == '.' || $item == '..')
continue;
- $physicalItem = $this->mapper->physicalToLogic($physicalDir.'/'.$item);
- $item = substr($physicalItem, strlen($physicalDir)+1);
+ $physicalItem = $this->mapper->physicalToLogic($physicalDir . '/' . $item);
+ $item = substr($physicalItem, strlen($physicalDir) + 1);
- if(strstr(strtolower($item), strtolower($query)) !== false) {
- $files[]=$dir.'/'.$item;
+ if (strstr(strtolower($item), strtolower($query)) !== false) {
+ $files[] = $dir . '/' . $item;
}
- if(is_dir($physicalItem)) {
- $files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item));
+ if (is_dir($physicalItem)) {
+ $files = array_merge($files, $this->searchInDir($query, $dir . '/' . $item));
}
}
return $files;
@@ -327,30 +335,31 @@ class MappedLocal extends \OC\Files\Storage\Common{
/**
* check if a file or folder has been updated since $time
+ *
* @param string $path
* @param int $time
* @return bool
*/
public function hasUpdated($path, $time) {
- return $this->filemtime($path)>$time;
+ return $this->filemtime($path) > $time;
}
/**
* @param string $path
*/
- private function buildPath($path, $create=true) {
+ private function buildPath($path, $create = true) {
$path = $this->stripLeading($path);
- $fullPath = $this->datadir.$path;
+ $fullPath = $this->datadir . $path;
return $this->mapper->logicToPhysical($fullPath, $create);
}
/**
* @param string $path
*/
- private function cleanMapper($path, $isLogicPath=true, $recursive=true) {
+ private function cleanMapper($path, $isLogicPath = true, $recursive=true) {
$fullPath = $path;
if ($isLogicPath) {
- $fullPath = $this->datadir.$path;
+ $fullPath = $this->datadir . $path;
}
$this->mapper->removePath($fullPath, $isLogicPath, $recursive);
}
@@ -363,8 +372,8 @@ class MappedLocal extends \OC\Files\Storage\Common{
$path1 = $this->stripLeading($path1);
$path2 = $this->stripLeading($path2);
- $fullPath1 = $this->datadir.$path1;
- $fullPath2 = $this->datadir.$path2;
+ $fullPath1 = $this->datadir . $path1;
+ $fullPath2 = $this->datadir . $path2;
$this->mapper->copy($fullPath1, $fullPath2);
}
@@ -373,10 +382,10 @@ class MappedLocal extends \OC\Files\Storage\Common{
* @param string $path
*/
private function stripLeading($path) {
- if(strpos($path, '/') === 0) {
+ if (strpos($path, '/') === 0) {
$path = substr($path, 1);
}
- if(strpos($path, '\\') === 0) {
+ if (strpos($path, '\\') === 0) {
$path = substr($path, 1);
}
if ($path === false) {
diff --git a/lib/private/files/storage/wrapper/quota.php b/lib/private/files/storage/wrapper/quota.php
index a878b2c5cf6c8d27798c9b1185f9aa257f8172af..c57c797f87a57c5c1f2babc63e2b5e2e99bc8bb7 100644
--- a/lib/private/files/storage/wrapper/quota.php
+++ b/lib/private/files/storage/wrapper/quota.php
@@ -30,7 +30,7 @@ class Quota extends Wrapper {
}
/**
- * @return quota value
+ * @return int quota value
*/
public function getQuota() {
return $this->quota;
diff --git a/lib/private/files/storage/wrapper/wrapper.php b/lib/private/files/storage/wrapper/wrapper.php
index 11ea9f71da75c5cc3cfcfa3750140b85c7a258b0..364475a68e0e9df9a1bafd39c07c1cecd8782775 100644
--- a/lib/private/files/storage/wrapper/wrapper.php
+++ b/lib/private/files/storage/wrapper/wrapper.php
@@ -440,4 +440,25 @@ class Wrapper implements \OC\Files\Storage\Storage {
public function isLocal() {
return $this->storage->isLocal();
}
+
+ /**
+ * Check if the storage is an instance of $class or is a wrapper for a storage that is an instance of $class
+ *
+ * @param string $class
+ * @return bool
+ */
+ public function instanceOfStorage($class) {
+ return is_a($this, $class) or $this->storage->instanceOfStorage($class);
+ }
+
+ /**
+ * Pass any methods custom to specific storage implementations to the wrapped storage
+ *
+ * @param string $method
+ * @param array $args
+ * @return mixed
+ */
+ public function __call($method, $args) {
+ return call_user_func_array(array($this->storage, $method), $args);
+ }
}
diff --git a/lib/private/files/stream/oc.php b/lib/private/files/stream/oc.php
index 88e7e062df9da747515bde59d9409c657ffb28e2..c206b41f55ee6c3ed06d81091da073218c4a9d76 100644
--- a/lib/private/files/stream/oc.php
+++ b/lib/private/files/stream/oc.php
@@ -18,7 +18,15 @@ class OC {
static private $rootView;
private $path;
+
+ /**
+ * @var resource
+ */
private $dirSource;
+
+ /**
+ * @var resource
+ */
private $fileSource;
private $meta;
diff --git a/lib/private/files/type/templatemanager.php b/lib/private/files/type/templatemanager.php
index cd1536d2732897a4e85f87c3eda6a20202d68ec7..e693e7079a5c230ac17b8e5082994d408caa2257 100644
--- a/lib/private/files/type/templatemanager.php
+++ b/lib/private/files/type/templatemanager.php
@@ -19,7 +19,7 @@ class TemplateManager {
* get the path of the template for a mimetype
*
* @param string $mimetype
- * @return string | null
+ * @return string|null
*/
public function getTemplatePath($mimetype) {
if (isset($this->templates[$mimetype])) {
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 47fc04c937d1eb9e29dabb536cee9a3ddd585e33..0b8d336f26053c6d4cc2e8e58a587dc6071446f3 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -11,7 +11,7 @@
* working with files within that view (e.g. read, write, delete, etc.). Each
* view is restricted to a set of directories via a virtual root. The default view
* uses the currently logged in user's data directory as root (parts of
- * OC_Filesystem are merely a wrapper for OC_FilesystemView).
+ * OC_Filesystem are merely a wrapper for OC\Files\View).
*
* Apps that need to access files outside of the user data folders (to modify files
* belonging to a user other than the one currently logged in, for example) should
@@ -29,15 +29,14 @@ use OC\Files\Cache\Updater;
class View {
private $fakeRoot = '';
- private $internal_path_cache = array();
- private $storage_cache = array();
public function __construct($root = '') {
$this->fakeRoot = $root;
}
public function getAbsolutePath($path = '/') {
- if (!$path) {
+ $this->assertPathLength($path);
+ if ($path === '') {
$path = '/';
}
if ($path[0] !== '/') {
@@ -77,6 +76,7 @@ class View {
* @return string
*/
public function getRelativePath($path) {
+ $this->assertPathLength($path);
if ($this->fakeRoot == '') {
return $path;
}
@@ -109,7 +109,7 @@ class View {
* resolve a path to a storage and internal path
*
* @param string $path
- * @return array consisting of the storage and the internal path
+ * @return array an array consisting of the storage and the internal path
*/
public function resolvePath($path) {
$a = $this->getAbsolutePath($path);
@@ -168,6 +168,10 @@ class View {
}
}
+ /**
+ * @param string $path
+ * @return resource
+ */
public function opendir($path) {
return $this->basicOperation('opendir', $path, array('read'));
}
@@ -204,6 +208,7 @@ class View {
}
public function readfile($path) {
+ $this->assertPathLength($path);
@ob_end_clean();
$handle = $this->fopen($path, 'rb');
if ($handle) {
@@ -428,7 +433,7 @@ class View {
if ($this->is_dir($path1)) {
$result = $this->copy($path1, $path2);
if ($result === true) {
- $result = $storage1->unlink($internalPath1);
+ $result = $storage1->rmdir($internalPath1);
}
} else {
$source = $this->fopen($path1 . $postFix1, 'r');
@@ -552,6 +557,11 @@ class View {
}
}
+ /**
+ * @param string $path
+ * @param string $mode
+ * @return resource
+ */
public function fopen($path, $mode) {
$hooks = array();
switch ($mode) {
@@ -586,6 +596,7 @@ class View {
}
public function toTmpFile($path) {
+ $this->assertPathLength($path);
if (Filesystem::isValidPath($path)) {
$source = $this->fopen($path, 'r');
if ($source) {
@@ -602,7 +613,7 @@ class View {
}
public function fromTmpFile($tmpFile, $path) {
-
+ $this->assertPathLength($path);
if (Filesystem::isValidPath($path)) {
// Get directory that the file is going into
@@ -631,6 +642,7 @@ class View {
}
public function getMimeType($path) {
+ $this->assertPathLength($path);
return $this->basicOperation('getMimeType', $path);
}
@@ -660,11 +672,12 @@ class View {
}
public function free_space($path = '/') {
+ $this->assertPathLength($path);
return $this->basicOperation('free_space', $path);
}
/**
- * @brief abstraction layer for basic filesystem functions: wrapper for \OC\Files\Storage\Storage
+ * abstraction layer for basic filesystem functions: wrapper for \OC\Files\Storage\Storage
* @param string $operation
* @param string $path
* @param array $hooks (optional)
@@ -796,9 +809,10 @@ class View {
* @param string $path
* @param boolean $includeMountPoints whether to add mountpoint sizes,
* defaults to true
- * @return \OC\Files\FileInfo | false
+ * @return \OC\Files\FileInfo|false
*/
public function getFileInfo($path, $includeMountPoints = true) {
+ $this->assertPathLength($path);
$data = array();
if (!Filesystem::isValidPath($path)) {
return $data;
@@ -869,6 +883,7 @@ class View {
* @return FileInfo[]
*/
public function getDirectoryContent($directory, $mimetype_filter = '') {
+ $this->assertPathLength($directory);
$result = array();
if (!Filesystem::isValidPath($directory)) {
return $result;
@@ -991,12 +1006,13 @@ class View {
* change file metadata
*
* @param string $path
- * @param array | \OCP\Files\FileInfo $data
+ * @param array|\OCP\Files\FileInfo $data
* @return int
*
* returns the fileid of the updated file
*/
public function putFileInfo($path, $data) {
+ $this->assertPathLength($path);
if ($data instanceof FileInfo) {
$data = $data->getData();
}
@@ -1144,4 +1160,12 @@ class View {
}
return null;
}
+
+ private function assertPathLength($path) {
+ $maxLen = min(PHP_MAXPATHLEN, 4000);
+ $pathLen = strlen($path);
+ if ($pathLen > $maxLen) {
+ throw new \OCP\Files\InvalidPathException("Path length($pathLen) exceeds max path length($maxLen): $path");
+ }
+ }
}
diff --git a/lib/private/geo.php b/lib/private/geo.php
index cd62511f0c1f53f743d4234c394c1cbbd39baabc..bd9253bc0dd2675c832035cc38768dc2a81a0369 100644
--- a/lib/private/geo.php
+++ b/lib/private/geo.php
@@ -7,9 +7,9 @@
*/
class OC_Geo{
/**
- * @brief returns the closest timezone to coordinates
- * @param $latitude
- * @param $longitude
+ * returns the closest timezone to coordinates
+ * @param float $latitude
+ * @param float $longitude
* @return mixed Closest timezone
*/
public static function timezone($latitude, $longitude) {
diff --git a/lib/private/group.php b/lib/private/group.php
index ea6384bae3e7e8bd3380c96133b87e04dfb32736..8dc381292052ce75fb24dfa08c9db9e3d55701ba 100644
--- a/lib/private/group.php
+++ b/lib/private/group.php
@@ -57,8 +57,8 @@ class OC_Group {
}
/**
- * @brief set the group backend
- * @param \OC_Group_Backend $backend The backend to use for user managment
+ * set the group backend
+ * @param \OC_Group_Backend $backend The backend to use for user managment
* @return bool
*/
public static function useBackend($backend) {
@@ -74,7 +74,7 @@ class OC_Group {
}
/**
- * @brief Try to create a new group
+ * Try to create a new group
* @param string $gid The name of the group to create
* @return bool
*
@@ -93,7 +93,7 @@ class OC_Group {
}
/**
- * @brief delete a group
+ * delete a group
* @param string $gid gid of the group to delete
* @return bool
*
@@ -118,7 +118,7 @@ class OC_Group {
}
/**
- * @brief is user in group?
+ * is user in group?
* @param string $uid uid of the user
* @param string $gid gid of the group
* @return bool
@@ -135,7 +135,7 @@ class OC_Group {
}
/**
- * @brief Add a user to a group
+ * Add a user to a group
* @param string $uid Name of the user to add to group
* @param string $gid Name of the group in which add the user
* @return bool
@@ -156,7 +156,7 @@ class OC_Group {
}
/**
- * @brief Removes a user from a group
+ * Removes a user from a group
* @param string $uid Name of the user to remove from group
* @param string $gid Name of the group from which remove the user
* @return bool
@@ -177,9 +177,9 @@ class OC_Group {
}
/**
- * @brief Get all groups a user belongs to
+ * Get all groups a user belongs to
* @param string $uid Name of the user
- * @return array with group names
+ * @return array an array of group names
*
* This function fetches all groups a user belongs to. It does not check
* if the user exists at all.
@@ -199,11 +199,11 @@ class OC_Group {
}
/**
- * @brief get a list of all groups
+ * get a list of all groups
* @param string $search
* @param int|null $limit
* @param int|null $offset
- * @returns array with group names
+ * @return array an array of group names
*
* Returns a list with all groups
*/
@@ -227,12 +227,12 @@ class OC_Group {
}
/**
- * @brief get a list of all users in a group
+ * get a list of all users in a group
* @param string $gid
* @param string $search
* @param int $limit
* @param int $offset
- * @returns array with user ids
+ * @return array an array of user ids
*/
public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
$group = self::getManager()->get($gid);
@@ -249,12 +249,12 @@ class OC_Group {
}
/**
- * @brief get a list of all users in several groups
+ * get a list of all users in several groups
* @param string[] $gids
* @param string $search
* @param int $limit
* @param int $offset
- * @return array with user ids
+ * @return array an array of user ids
*/
public static function usersInGroups($gids, $search = '', $limit = -1, $offset = 0) {
$users = array();
@@ -266,24 +266,24 @@ class OC_Group {
}
/**
- * @brief get a list of all display names in a group
+ * get a list of all display names in a group
* @param string $gid
* @param string $search
* @param int $limit
* @param int $offset
- * @returns array with display names (value) and user ids(key)
+ * @return array an array of display names (value) and user ids(key)
*/
public static function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
return self::getManager()->displayNamesInGroup($gid, $search, $limit, $offset);
}
/**
- * @brief get a list of all display names in several groups
+ * get a list of all display names in several groups
* @param array $gids
* @param string $search
* @param int $limit
* @param int $offset
- * @return array with display names (Key) user ids (value)
+ * @return array an array of display names (Key) user ids (value)
*/
public static function displayNamesInGroups($gids, $search = '', $limit = -1, $offset = 0) {
$displayNames = array();
diff --git a/lib/private/group/backend.php b/lib/private/group/backend.php
index cc61fce1615ec4c043e1e7978ce8b635d9ce6c36..ab694268bb3b1aa799604e9ca68063b815a88e6e 100644
--- a/lib/private/group/backend.php
+++ b/lib/private/group/backend.php
@@ -49,7 +49,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
);
/**
- * @brief Get all supported actions
+ * Get all supported actions
* @return int bitwise-or'ed actions
*
* Returns the supported actions as int to be
@@ -67,9 +67,9 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
}
/**
- * @brief Check if backend implements actions
+ * Check if backend implements actions
* @param int $actions bitwise-or'ed actions
- * @return boolean
+ * @return bool
*
* Returns the supported actions as int to be
* compared with OC_GROUP_BACKEND_CREATE_GROUP etc.
@@ -79,7 +79,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
}
/**
- * @brief is user in group?
+ * is user in group?
* @param string $uid uid of the user
* @param string $gid gid of the group
* @return bool
@@ -91,9 +91,9 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
}
/**
- * @brief Get all groups a user belongs to
+ * Get all groups a user belongs to
* @param string $uid Name of the user
- * @return array with group names
+ * @return array an array of group names
*
* This function fetches all groups a user belongs to. It does not check
* if the user exists at all.
@@ -103,11 +103,11 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
}
/**
- * @brief get a list of all groups
+ * get a list of all groups
* @param string $search
* @param int $limit
* @param int $offset
- * @return array with group names
+ * @return array an array of group names
*
* Returns a list with all groups
*/
@@ -126,12 +126,12 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
}
/**
- * @brief get a list of all users in a group
+ * get a list of all users in a group
* @param string $gid
* @param string $search
* @param int $limit
* @param int $offset
- * @return array with user ids
+ * @return array an array of user ids
*/
public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
return array();
diff --git a/lib/private/group/database.php b/lib/private/group/database.php
index df0d84d0d2a3528dde710bd07f04fcb60650f227..baaf2cf273914259cb2e4322524293d0c1f87d27 100644
--- a/lib/private/group/database.php
+++ b/lib/private/group/database.php
@@ -43,7 +43,7 @@
class OC_Group_Database extends OC_Group_Backend {
/**
- * @brief Try to create a new group
+ * Try to create a new group
* @param string $gid The name of the group to create
* @return bool
*
@@ -69,7 +69,7 @@ class OC_Group_Database extends OC_Group_Backend {
}
/**
- * @brief delete a group
+ * delete a group
* @param string $gid gid of the group to delete
* @return bool
*
@@ -88,7 +88,7 @@ class OC_Group_Database extends OC_Group_Backend {
}
/**
- * @brief is user in group?
+ * is user in group?
* @param string $uid uid of the user
* @param string $gid gid of the group
* @return bool
@@ -104,7 +104,7 @@ class OC_Group_Database extends OC_Group_Backend {
}
/**
- * @brief Add a user to a group
+ * Add a user to a group
* @param string $uid Name of the user to add to group
* @param string $gid Name of the group in which add the user
* @return bool
@@ -123,7 +123,7 @@ class OC_Group_Database extends OC_Group_Backend {
}
/**
- * @brief Removes a user from a group
+ * Removes a user from a group
* @param string $uid Name of the user to remove from group
* @param string $gid Name of the group from which remove the user
* @return bool
@@ -138,9 +138,9 @@ class OC_Group_Database extends OC_Group_Backend {
}
/**
- * @brief Get all groups a user belongs to
+ * Get all groups a user belongs to
* @param string $uid Name of the user
- * @return array with group names
+ * @return array an array of group names
*
* This function fetches all groups a user belongs to. It does not check
* if the user exists at all.
@@ -159,11 +159,11 @@ class OC_Group_Database extends OC_Group_Backend {
}
/**
- * @brief get a list of all groups
+ * get a list of all groups
* @param string $search
* @param int $limit
* @param int $offset
- * @return array with group names
+ * @return array an array of group names
*
* Returns a list with all groups
*/
@@ -192,12 +192,12 @@ class OC_Group_Database extends OC_Group_Backend {
}
/**
- * @brief get a list of all users in a group
+ * get a list of all users in a group
* @param string $gid
* @param string $search
* @param int $limit
* @param int $offset
- * @return array with user ids
+ * @return array an array of user ids
*/
public function usersInGroup($gid, $search = '', $limit = null, $offset = null) {
$stmt = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` LIKE ?',
@@ -212,12 +212,11 @@ class OC_Group_Database extends OC_Group_Backend {
}
/**
- * @brief get the number of all users matching the search string in a group
+ * get the number of all users matching the search string in a group
* @param string $gid
* @param string $search
- * @param int $limit
- * @param int $offset
- * @return int | false
+ * @return int|false
+ * @throws DatabaseException
*/
public function countUsersInGroup($gid, $search = '') {
$stmt = OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` LIKE ?');
diff --git a/lib/private/group/dummy.php b/lib/private/group/dummy.php
index 94cbb607ad1157d27c9a0e3591a0192ec9269f5d..e48c6a0e266ca2204e9f866d83112da9f2eff969 100644
--- a/lib/private/group/dummy.php
+++ b/lib/private/group/dummy.php
@@ -27,11 +27,11 @@
class OC_Group_Dummy extends OC_Group_Backend {
private $groups=array();
/**
- * @brief Try to create a new group
+ * Try to create a new group
* @param string $gid The name of the group to create
- * @returns true/false
+ * @return bool
*
- * Trys to create a new group. If the group name already exists, false will
+ * Tries to create a new group. If the group name already exists, false will
* be returned.
*/
public function createGroup($gid) {
@@ -44,9 +44,9 @@ class OC_Group_Dummy extends OC_Group_Backend {
}
/**
- * @brief delete a group
- * @param $gid gid of the group to delete
- * @returns true/false
+ * delete a group
+ * @param string $gid gid of the group to delete
+ * @return bool
*
* Deletes a group and removes it from the group_user-table
*/
@@ -60,10 +60,10 @@ class OC_Group_Dummy extends OC_Group_Backend {
}
/**
- * @brief is user in group?
- * @param $uid uid of the user
- * @param $gid gid of the group
- * @returns true/false
+ * is user in group?
+ * @param string $uid uid of the user
+ * @param string $gid gid of the group
+ * @return bool
*
* Checks whether the user is member of a group or not.
*/
@@ -76,10 +76,10 @@ class OC_Group_Dummy extends OC_Group_Backend {
}
/**
- * @brief Add a user to a group
- * @param $uid Name of the user to add to group
- * @param $gid Name of the group in which add the user
- * @returns true/false
+ * Add a user to a group
+ * @param string $uid Name of the user to add to group
+ * @param string $gid Name of the group in which add the user
+ * @return bool
*
* Adds a user to a group.
*/
@@ -97,10 +97,10 @@ class OC_Group_Dummy extends OC_Group_Backend {
}
/**
- * @brief Removes a user from a group
- * @param $uid NameUSER of the user to remove from group
- * @param $gid Name of the group from which remove the user
- * @returns true/false
+ * Removes a user from a group
+ * @param string $uid Name of the user to remove from group
+ * @param string $gid Name of the group from which remove the user
+ * @return bool
*
* removes the user from a group.
*/
@@ -117,9 +117,9 @@ class OC_Group_Dummy extends OC_Group_Backend {
}
/**
- * @brief Get all groups a user belongs to
- * @param $uid Name of the user
- * @returns array with group names
+ * Get all groups a user belongs to
+ * @param string $uid Name of the user
+ * @return array an array of group names
*
* This function fetches all groups a user belongs to. It does not check
* if the user exists at all.
@@ -136,18 +136,23 @@ class OC_Group_Dummy extends OC_Group_Backend {
}
/**
- * @brief get a list of all groups
- * @returns array with group names
- *
- * Returns a list with all groups
+ * Get a list of all groups
+ * @param string $search
+ * @param int $limit
+ * @param int $offset
+ * @return array an array of group names
*/
public function getGroups($search = '', $limit = -1, $offset = 0) {
return array_keys($this->groups);
}
/**
- * @brief get a list of all users in a group
- * @returns array with user ids
+ * Get a list of all users in a group
+ * @param string $gid
+ * @param string $search
+ * @param int $limit
+ * @param int $offset
+ * @return array an array of user IDs
*/
public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
if(isset($this->groups[$gid])) {
@@ -158,8 +163,12 @@ class OC_Group_Dummy extends OC_Group_Backend {
}
/**
- * @brief get the number of all users in a group
- * @returns int | bool
+ * get the number of all users in a group
+ * @param string $gid
+ * @param string $search
+ * @param int $limit
+ * @param int $offset
+ * @return int
*/
public function countUsersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
if(isset($this->groups[$gid])) {
diff --git a/lib/private/group/example.php b/lib/private/group/example.php
index 3519b9ed92f0d9681017e07edb032ee2f978ea17..8c1e22866f2f480e61478eb46113a62d89de3086 100644
--- a/lib/private/group/example.php
+++ b/lib/private/group/example.php
@@ -27,58 +27,58 @@
*/
abstract class OC_Group_Example {
/**
- * @brief Try to create a new group
- * @param $gid The name of the group to create
- * @returns true/false
+ * Try to create a new group
+ * @param string $gid The name of the group to create
+ * @return bool
*
- * Trys to create a new group. If the group name already exists, false will
+ * Tries to create a new group. If the group name already exists, false will
* be returned.
*/
abstract public static function createGroup($gid);
/**
- * @brief delete a group
- * @param $gid gid of the group to delete
- * @returns true/false
+ * delete a group
+ * @param string $gid gid of the group to delete
+ * @return bool
*
* Deletes a group and removes it from the group_user-table
*/
abstract public static function deleteGroup($gid);
/**
- * @brief is user in group?
- * @param $uid uid of the user
- * @param $gid gid of the group
- * @returns true/false
+ * is user in group?
+ * @param string $uid uid of the user
+ * @param string $gid gid of the group
+ * @return bool
*
* Checks whether the user is member of a group or not.
*/
abstract public static function inGroup($uid, $gid);
/**
- * @brief Add a user to a group
- * @param $uid Name of the user to add to group
- * @param $gid Name of the group in which add the user
- * @returns true/false
+ * Add a user to a group
+ * @param string $uid Name of the user to add to group
+ * @param string $gid Name of the group in which add the user
+ * @return bool
*
* Adds a user to a group.
*/
abstract public static function addToGroup($uid, $gid);
/**
- * @brief Removes a user from a group
- * @param $uid NameUSER of the user to remove from group
- * @param $gid Name of the group from which remove the user
- * @returns true/false
+ * Removes a user from a group
+ * @param string $uid Name of the user to remove from group
+ * @param string $gid Name of the group from which remove the user
+ * @return bool
*
* removes the user from a group.
*/
abstract public static function removeFromGroup($uid, $gid);
/**
- * @brief Get all groups a user belongs to
- * @param $uid Name of the user
- * @returns array with group names
+ * Get all groups a user belongs to
+ * @param string $uid Name of the user
+ * @return array an array of group names
*
* This function fetches all groups a user belongs to. It does not check
* if the user exists at all.
@@ -86,24 +86,28 @@ abstract class OC_Group_Example {
abstract public static function getUserGroups($uid);
/**
- * @brief get a list of all groups
- * @returns array with group names
- *
- * Returns a list with all groups
+ * get a list of all groups
+ * @param string $search
+ * @param int $limit
+ * @param int $offset
+ * @return array an array of group names
*/
abstract public static function getGroups($search = '', $limit = -1, $offset = 0);
/**
- * check if a group exists
+ * Check if a group exists
* @param string $gid
* @return bool
*/
abstract public function groupExists($gid);
/**
- * @brief get a list of all users in a group
- * @returns array with user ids
+ * get a list of all users in a group
+ * @param string $gid
+ * @param string $search
+ * @param int $limit
+ * @param int $offset
+ * @return array an array of user ids
*/
abstract public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0);
-
}
diff --git a/lib/private/group/group.php b/lib/private/group/group.php
index 7593bb68d1a9050b837104738381ef19abc72b54..3e245ab6bbe8062c208563851921385666a4583d 100644
--- a/lib/private/group/group.php
+++ b/lib/private/group/group.php
@@ -26,7 +26,7 @@ class Group {
private $usersLoaded;
/**
- * @var \OC_Group_Backend[] | \OC_Group_Database[] $backend
+ * @var \OC_Group_Backend[]|\OC_Group_Database[] $backend
*/
private $backends;
@@ -184,7 +184,7 @@ class Group {
* returns the number of users matching the search string
*
* @param string $search
- * @return int | bool
+ * @return int|bool
*/
public function count($search) {
$users = false;
@@ -244,7 +244,7 @@ class Group {
}
/**
- * @brief returns all the Users from an array that really exists
+ * returns all the Users from an array that really exists
* @param string[] $userIds an array containing user IDs
* @return \OC\User\User[] an Array with the userId as Key and \OC\User\User as value
*/
diff --git a/lib/private/group/interface.php b/lib/private/group/interface.php
index 4ef3663837f0094664402c08724f30986298fec2..ee5c2d635d6c98fbe7b2f0173ee0d1e482daecea 100644
--- a/lib/private/group/interface.php
+++ b/lib/private/group/interface.php
@@ -23,7 +23,7 @@
interface OC_Group_Interface {
/**
- * @brief Check if backend implements actions
+ * Check if backend implements actions
* @param int $actions bitwise-or'ed actions
* @return boolean
*
@@ -33,7 +33,7 @@ interface OC_Group_Interface {
public function implementsActions($actions);
/**
- * @brief is user in group?
+ * is user in group?
* @param string $uid uid of the user
* @param string $gid gid of the group
* @return bool
@@ -43,9 +43,9 @@ interface OC_Group_Interface {
public function inGroup($uid, $gid);
/**
- * @brief Get all groups a user belongs to
+ * Get all groups a user belongs to
* @param string $uid Name of the user
- * @return array with group names
+ * @return array an array of group names
*
* This function fetches all groups a user belongs to. It does not check
* if the user exists at all.
@@ -53,11 +53,11 @@ interface OC_Group_Interface {
public function getUserGroups($uid);
/**
- * @brief get a list of all groups
+ * get a list of all groups
* @param string $search
* @param int $limit
* @param int $offset
- * @return array with group names
+ * @return array an array of group names
*
* Returns a list with all groups
*/
@@ -71,12 +71,12 @@ interface OC_Group_Interface {
public function groupExists($gid);
/**
- * @brief get a list of all users in a group
+ * get a list of all users in a group
* @param string $gid
* @param string $search
* @param int $limit
* @param int $offset
- * @return array with user ids
+ * @return array an array of user ids
*/
public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0);
diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index d31225e3c2e71c4ff26cdb67b04cdf50929759c0..dae6443e9d488a61f80a756950e80ad80c273f04 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -28,7 +28,7 @@ use OC\Hooks\PublicEmitter;
*/
class Manager extends PublicEmitter {
/**
- * @var \OC_Group_Backend[] | \OC_Group_Database[] $backends
+ * @var \OC_Group_Backend[]|\OC_Group_Database[] $backends
*/
private $backends = array();
@@ -40,19 +40,38 @@ class Manager extends PublicEmitter {
/**
* @var \OC\Group\Group[]
*/
- private $cachedGroups;
+ private $cachedGroups = array();
+
+ /**
+ * @var \OC\Group\Group[]
+ */
+ private $cachedUserGroups = array();
/**
* @param \OC\User\Manager $userManager
*/
public function __construct($userManager) {
$this->userManager = $userManager;
- $cache = & $this->cachedGroups;
- $this->listen('\OC\Group', 'postDelete', function ($group) use (&$cache) {
+ $cachedGroups = & $this->cachedGroups;
+ $cachedUserGroups = & $this->cachedUserGroups;
+ $this->listen('\OC\Group', 'postDelete', function ($group) use (&$cachedGroups, &$cachedUserGroups) {
+ /**
+ * @var \OC\Group\Group $group
+ */
+ unset($cachedGroups[$group->getGID()]);
+ $cachedUserGroups = array();
+ });
+ $this->listen('\OC\Group', 'postAddUser', function ($group) use (&$cachedUserGroups) {
/**
* @var \OC\Group\Group $group
*/
- unset($cache[$group->getGID()]);
+ $cachedUserGroups = array();
+ });
+ $this->listen('\OC\Group', 'postRemoveUser', function ($group) use (&$cachedUserGroups) {
+ /**
+ * @var \OC\Group\Group $group
+ */
+ $cachedUserGroups = array();
});
}
@@ -135,7 +154,7 @@ class Manager extends PublicEmitter {
foreach ($this->backends as $backend) {
$groupIds = $backend->getGroups($search, $limit, $offset);
foreach ($groupIds as $groupId) {
- $groups[$groupId] = $this->getGroupObject($groupId);
+ $groups[$groupId] = $this->get($groupId);
}
if (!is_null($limit) and $limit <= 0) {
return array_values($groups);
@@ -149,23 +168,28 @@ class Manager extends PublicEmitter {
* @return \OC\Group\Group[]
*/
public function getUserGroups($user) {
+ $uid = $user->getUID();
+ if (isset($this->cachedUserGroups[$uid])) {
+ return $this->cachedUserGroups[$uid];
+ }
$groups = array();
foreach ($this->backends as $backend) {
- $groupIds = $backend->getUserGroups($user->getUID());
+ $groupIds = $backend->getUserGroups($uid);
foreach ($groupIds as $groupId) {
- $groups[$groupId] = $this->getGroupObject($groupId);
+ $groups[$groupId] = $this->get($groupId);
}
}
- return array_values($groups);
+ $this->cachedUserGroups[$uid] = array_values($groups);
+ return $this->cachedUserGroups[$uid];
}
/**
- * @brief get a list of all display names in a group
+ * get a list of all display names in a group
* @param string $gid
* @param string $search
* @param int $limit
* @param int $offset
- * @return array with display names (value) and user ids (key)
+ * @return array an array of display names (value) and user ids (key)
*/
public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
$group = $this->get($gid);
diff --git a/lib/private/helper.php b/lib/private/helper.php
index 4058ec199a7f34964523dff94ad2794439ae340a..e9ca036a32cc79550cdc22823a98fed9f0d61d4f 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -31,12 +31,12 @@ class OC_Helper {
private static $templateManager;
/**
- * @brief Creates an url using a defined route
- * @param $route
+ * Creates an url using a defined route
+ * @param string $route
* @param array $parameters
* @return
* @internal param array $args with param=>value, will be appended to the returned url
- * @returns string the url
+ * @return string the url
*
* Returns a url to the given app and file.
*/
@@ -45,7 +45,7 @@ class OC_Helper {
}
/**
- * @brief Creates an url
+ * Creates an url
* @param string $app app
* @param string $file file
* @param array $args array with param=>value, will be appended to the returned url
@@ -68,7 +68,7 @@ class OC_Helper {
}
/**
- * @brief Creates an absolute url
+ * Creates an absolute url
* @param string $app app
* @param string $file file
* @param array $args array with param=>value, will be appended to the returned url
@@ -78,11 +78,13 @@ class OC_Helper {
* Returns a absolute url to the given app and file.
*/
public static function linkToAbsolute($app, $file, $args = array()) {
- return self::linkTo($app, $file, $args);
+ return OC::$server->getURLGenerator()->getAbsoluteURL(
+ self::linkTo($app, $file, $args)
+ );
}
/**
- * @brief Makes an $url absolute
+ * Makes an $url absolute
* @param string $url the url
* @return string the absolute url
*
@@ -93,7 +95,7 @@ class OC_Helper {
}
/**
- * @brief Creates an url for remote use
+ * Creates an url for remote use
* @param string $service id
* @return string the url
*
@@ -104,7 +106,7 @@ class OC_Helper {
}
/**
- * @brief Creates an absolute url for remote use
+ * Creates an absolute url for remote use
* @param string $service id
* @param bool $add_slash
* @return string the url
@@ -112,12 +114,14 @@ class OC_Helper {
* Returns a absolute url to the given service.
*/
public static function linkToRemote($service, $add_slash = true) {
- return self::makeURLAbsolute(self::linkToRemoteBase($service))
- . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : '');
+ return OC::$server->getURLGenerator()->getAbsoluteURL(
+ self::linkToRemoteBase($service)
+ . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : '')
+ );
}
/**
- * @brief Creates an absolute url for public use
+ * Creates an absolute url for public use
* @param string $service id
* @param bool $add_slash
* @return string the url
@@ -125,12 +129,16 @@ class OC_Helper {
* Returns a absolute url to the given service.
*/
public static function linkToPublic($service, $add_slash = false) {
- return self::linkToAbsolute('', 'public.php') . '?service=' . $service
- . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : '');
+ return OC::$server->getURLGenerator()->getAbsoluteURL(
+ self::linkTo(
+ '', 'public.php') . '?service=' . $service
+ . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : ''
+ )
+ );
}
/**
- * @brief Creates path to an image
+ * Creates path to an image
* @param string $app app
* @param string $image image name
* @return string the url
@@ -142,7 +150,7 @@ class OC_Helper {
}
/**
- * @brief get path to icon of file type
+ * get path to icon of file type
* @param string $mimetype mimetype
* @return string the url
*
@@ -256,7 +264,7 @@ class OC_Helper {
}
/**
- * @brief get path to preview of file
+ * get path to preview of file
* @param string $path path
* @return string the url
*
@@ -271,7 +279,7 @@ class OC_Helper {
}
/**
- * @brief Make a human file size
+ * Make a human file size
* @param int $bytes file size in bytes
* @return string a human readable file size
*
@@ -306,7 +314,7 @@ class OC_Helper {
}
/**
- * @brief Make a php file size
+ * Make a php file size
* @param int $bytes file size in bytes
* @return string a php parseable file size
*
@@ -332,7 +340,7 @@ class OC_Helper {
}
/**
- * @brief Make a computer file size
+ * Make a computer file size
* @param string $str file size in human readable format
* @return int a file size in bytes
*
@@ -369,7 +377,7 @@ class OC_Helper {
}
/**
- * @brief Recursive copying of folders
+ * Recursive copying of folders
* @param string $src source folder
* @param string $dest target folder
*
@@ -391,7 +399,7 @@ class OC_Helper {
}
/**
- * @brief Recursive deletion of folders
+ * Recursive deletion of folders
* @param string $dir path to the folder
* @return bool
*/
@@ -399,7 +407,7 @@ class OC_Helper {
if (is_dir($dir)) {
$files = scandir($dir);
foreach ($files as $file) {
- if ($file != "." && $file != "..") {
+ if ($file !== '' && $file !== "." && $file !== "..") {
self::rmdirr("$dir/$file");
}
}
@@ -477,7 +485,7 @@ class OC_Helper {
}
/**
- * @brief Checks $_REQUEST contains a var for the $s key. If so, returns the html-escaped value of this var; otherwise returns the default value provided by $d.
+ * Checks $_REQUEST contains a var for the $s key. If so, returns the html-escaped value of this var; otherwise returns the default value provided by $d.
* @param string $s name of the var to escape, if set.
* @param string $d default value.
* @return string the print-safe value.
@@ -487,7 +495,7 @@ class OC_Helper {
/**
* detect if a given program is found in the search PATH
*
- * @param $name
+ * @param string $name
* @param bool $path
* @internal param string $program name
* @internal param string $optional search path, defaults to $PATH
@@ -662,8 +670,8 @@ class OC_Helper {
/**
* Adds a suffix to the name in case the file exists
*
- * @param $path
- * @param $filename
+ * @param string $path
+ * @param string $filename
* @return string
*/
public static function buildNotExistingFileName($path, $filename) {
@@ -674,8 +682,8 @@ class OC_Helper {
/**
* Adds a suffix to the name in case the file exists
*
- * @param $path
- * @param $filename
+ * @param string $path
+ * @param string $filename
* @return string
*/
public static function buildNotExistingFileNameForView($path, $filename, \OC\Files\View $view) {
@@ -718,21 +726,33 @@ class OC_Helper {
}
/**
- * @brief Checks if $sub is a subdirectory of $parent
+ * Checks if $sub is a subdirectory of $parent
*
* @param string $sub
* @param string $parent
* @return bool
*/
- public static function issubdirectory($sub, $parent) {
- if (strpos(realpath($sub), realpath($parent)) === 0) {
+ public static function isSubDirectory($sub, $parent) {
+ $realpathSub = realpath($sub);
+ $realpathParent = realpath($parent);
+
+ // realpath() may return false in case the directory does not exist
+ // since we can not be sure how different PHP versions may behave here
+ // we do an additional check whether realpath returned false
+ if($realpathSub === false || $realpathParent === false) {
+ return false;
+ }
+
+ // Check whether $sub is a subdirectory of $parent
+ if (strpos($realpathSub, $realpathParent) === 0) {
return true;
}
+
return false;
}
/**
- * @brief Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
+ * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
*
* @param array $input The array to work on
* @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
@@ -753,9 +773,9 @@ class OC_Helper {
}
/**
- * @brief replaces a copy of string delimited by the start and (optionally) length parameters with the string given in replacement.
+ * replaces a copy of string delimited by the start and (optionally) length parameters with the string given in replacement.
*
- * @param $string
+ * @param string $string
* @param string $replacement The replacement string.
* @param int $start If start is positive, the replacing will begin at the start'th offset into string. If start is negative, the replacing will begin at the start'th character from the end of string.
* @param int $length Length of the part to be replaced
@@ -774,7 +794,7 @@ class OC_Helper {
}
/**
- * @brief Replace all occurrences of the search string with the replacement string
+ * Replace all occurrences of the search string with the replacement string
*
* @param string $search The value being searched for, otherwise known as the needle.
* @param string $replace The replacement
@@ -796,7 +816,7 @@ class OC_Helper {
}
/**
- * @brief performs a search in a nested array
+ * performs a search in a nested array
* @param array $haystack the array to be searched
* @param string $needle the search string
* @param string $index optional, only search this key name
@@ -838,7 +858,7 @@ class OC_Helper {
}
/**
- * @brief calculates the maximum upload size respecting system settings, free space and user quota
+ * calculates the maximum upload size respecting system settings, free space and user quota
*
* @param string $dir the current folder where the user currently operates
* @param int $freeSpace the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly
@@ -853,7 +873,7 @@ class OC_Helper {
/**
* Calculate free space left within user quota
- *
+ *
* @param string $dir the current folder where the user currently operates
* @return int number of bytes representing
*/
diff --git a/lib/private/hook.php b/lib/private/hook.php
index b63b442c31b852653db61107e17f61e5bbe1356c..30e22847c7f1b0410a5c9095055beed7e1cac6c1 100644
--- a/lib/private/hook.php
+++ b/lib/private/hook.php
@@ -8,7 +8,7 @@ class OC_Hook{
static private $registered = array();
/**
- * @brief connects a function to a hook
+ * 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
@@ -42,10 +42,10 @@ class OC_Hook{
}
/**
- * @brief emits a signal
+ * emits a signal
* @param string $signalclass class name of emitter
* @param string $signalname name of signal
- * @param array $params defautl: array() array with additional data
+ * @param mixed $params default: array() array with additional data
* @return bool, true if slots exists or false if not
*
* Emits a signal. To get data from the slot use references!
diff --git a/lib/private/image.php b/lib/private/image.php
index 14aa64d12da4526a4c0a8b687499e77f9c2294a1..5331c399159e0e54b2902c92e08e52cbd613c101 100644
--- a/lib/private/image.php
+++ b/lib/private/image.php
@@ -33,7 +33,7 @@ class OC_Image {
private $fileInfo;
/**
- * @brief Get mime type for an image file.
+ * Get mime type for an image file.
* @param string|null $filePath The path to a local image file.
* @return string The mime type if the it could be determined, otherwise an empty string.
*/
@@ -48,7 +48,7 @@ class OC_Image {
}
/**
- * @brief Constructor.
+ * Constructor.
* @param resource|string $imageRef The path to a local file, a base64 encoded string or a resource created by
* an imagecreate* function.
* @return \OC_Image False on error
@@ -70,7 +70,7 @@ class OC_Image {
}
/**
- * @brief Determine whether the object contains an image resource.
+ * Determine whether the object contains an image resource.
* @return bool
*/
public function valid() { // apparently you can't name a method 'empty'...
@@ -78,7 +78,7 @@ class OC_Image {
}
/**
- * @brief Returns the MIME type of the image or an empty string if no image is loaded.
+ * Returns the MIME type of the image or an empty string if no image is loaded.
* @return string
*/
public function mimeType() {
@@ -86,7 +86,7 @@ class OC_Image {
}
/**
- * @brief Returns the width of the image or -1 if no image is loaded.
+ * Returns the width of the image or -1 if no image is loaded.
* @return int
*/
public function width() {
@@ -94,7 +94,7 @@ class OC_Image {
}
/**
- * @brief Returns the height of the image or -1 if no image is loaded.
+ * Returns the height of the image or -1 if no image is loaded.
* @return int
*/
public function height() {
@@ -102,7 +102,7 @@ class OC_Image {
}
/**
- * @brief Returns the width when the image orientation is top-left.
+ * Returns the width when the image orientation is top-left.
* @return int
*/
public function widthTopLeft() {
@@ -125,7 +125,7 @@ class OC_Image {
}
/**
- * @brief Returns the height when the image orientation is top-left.
+ * Returns the height when the image orientation is top-left.
* @return int
*/
public function heightTopLeft() {
@@ -148,7 +148,7 @@ class OC_Image {
}
/**
- * @brief Outputs the image.
+ * Outputs the image.
* @param string $mimeType
* @return bool
*/
@@ -161,7 +161,7 @@ class OC_Image {
}
/**
- * @brief Saves the image.
+ * Saves the image.
* @param string $filePath
* @param string $mimeType
* @return bool
@@ -181,7 +181,7 @@ class OC_Image {
}
/**
- * @brief Outputs/saves the image.
+ * Outputs/saves the image.
* @param string $filePath
* @param string $mimeType
* @return bool
@@ -259,7 +259,7 @@ class OC_Image {
}
/**
- * @brief Prints the image when called as $image().
+ * Prints the image when called as $image().
*/
public function __invoke() {
return $this->show();
@@ -307,7 +307,7 @@ class OC_Image {
/**
* (I'm open for suggestions on better method name ;)
- * @brief Get the orientation based on EXIF data.
+ * Get the orientation based on EXIF data.
* @return int The orientation or -1 if no EXIF data is available.
*/
public function getOrientation() {
@@ -335,7 +335,7 @@ class OC_Image {
/**
* (I'm open for suggestions on better method name ;)
- * @brief Fixes orientation based on EXIF data.
+ * Fixes orientation based on EXIF data.
* @return bool.
*/
public function fixOrientation() {
@@ -396,7 +396,7 @@ class OC_Image {
}
/**
- * @brief Loads an image from a local file, a base64 encoded string or a resource created by an imagecreate* function.
+ * Loads an image from a local file, a base64 encoded string or a resource created by an imagecreate* function.
* @param resource|string $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 ).
* @return resource|false An image resource or false on error
*/
@@ -421,10 +421,10 @@ class OC_Image {
}
/**
- * @brief Loads an image from an open file handle.
+ * Loads an image from an open file handle.
* It is the responsibility of the caller to position the pointer at the correct place and to close the handle again.
* @param resource $handle
- * @return An image resource or false on error
+ * @return resource|false An image resource or false on error
*/
public function loadFromFileHandle($handle) {
OC_Log::write('core', __METHOD__.'(): Trying', OC_Log::DEBUG);
@@ -435,7 +435,7 @@ class OC_Image {
}
/**
- * @brief Loads an image from a local file.
+ * Loads an image from a local file.
* @param bool|string $imagePath The path to a local file.
* @return bool|resource An image resource or false on error
*/
@@ -536,7 +536,7 @@ class OC_Image {
}
/**
- * @brief Loads an image from a string of data.
+ * Loads an image from a string of data.
* @param string $str A string of image data as read from a file.
* @return bool|resource An image resource or false on error
*/
@@ -561,7 +561,7 @@ class OC_Image {
}
/**
- * @brief Loads an image from a base64 encoded string.
+ * Loads an image from a base64 encoded string.
* @param string $str A string base64 encoded string of image data.
* @return bool|resource An image resource or false on error
*/
@@ -729,7 +729,7 @@ class OC_Image {
}
/**
- * @brief Resizes the image preserving ratio.
+ * Resizes the image preserving ratio.
* @param integer $maxSize The maximum size of either the width or height.
* @return bool
*/
@@ -793,7 +793,7 @@ class OC_Image {
}
/**
- * @brief Crops the image to the middle square. If the image is already square it just returns.
+ * Crops the image to the middle square. If the image is already square it just returns.
* @param int $size maximum size for the result (optional)
* @return bool for success or failure
*/
@@ -852,7 +852,7 @@ class OC_Image {
}
/**
- * @brief Crops the image from point $x$y with dimension $wx$h.
+ * Crops the image from point $x$y with dimension $wx$h.
* @param int $x Horizontal position
* @param int $y Vertical position
* @param int $w Width
@@ -882,7 +882,7 @@ class OC_Image {
}
/**
- * @brief Resizes the image to fit within a boundry while preserving ratio.
+ * Resizes the image to fit within a boundry while preserving ratio.
* @param integer $maxWidth
* @param integer $maxHeight
* @return bool
diff --git a/lib/private/installer.php b/lib/private/installer.php
index e8ea162eb2f42683ea02d39ef0a3885fad7e6385..6940a1dc78d3ff33ede9c3653fb9d14dbeb2da89 100644
--- a/lib/private/installer.php
+++ b/lib/private/installer.php
@@ -56,7 +56,7 @@ class OC_Installer{
* It is the task of oc_app_install to create the tables and do whatever is
* needed to get the app working.
*
- * @brief Installs an app
+ * Installs an app
* @param array $data with all information
* @throws \Exception
* @return integer
@@ -303,10 +303,7 @@ class OC_Installer{
}
// check if the app is compatible with this version of ownCloud
- if(
- !isset($info['require'])
- or !OC_App::isAppVersionCompatible(OC_Util::getVersion(), $info['require'])
- ) {
+ if(!OC_App::isAppCompatible(OC_Util::getVersion(), $info)) {
OC_Helper::rmdirr($extractDir);
throw new \Exception($l->t("App can't be installed because it is not compatible with this version of ownCloud"));
}
@@ -362,7 +359,7 @@ class OC_Installer{
}
/**
- * @brief Check if app is already downloaded
+ * Check if app is already downloaded
* @param string $name name of the application to remove
* @return boolean
*
@@ -378,9 +375,9 @@ class OC_Installer{
}
/**
- * @brief Removes an app
+ * Removes an app
* @param string $name name of the application to remove
- * @param $options array with options
+ * @param array $options options
* @return boolean|null
*
* This function removes an app. $options is an associative array. The
@@ -431,7 +428,7 @@ class OC_Installer{
}
/**
- * @brief Installs shipped apps
+ * Installs shipped apps
*
* This function installs all apps found in the 'apps' directory that should be enabled by default;
*/
diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index d6680d6344595d30ebd22496f726e7db5336fc23..3e44be881500378d8997d6da0a171d10b67a32b6 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -86,7 +86,7 @@ class OC_L10N implements \OCP\IL10N {
}
/**
- * @brief The constructor
+ * The constructor
* @param string $app app requesting l10n
* @param string $lang default: null Language
*
@@ -134,10 +134,10 @@ class OC_L10N implements \OCP\IL10N {
$i18ndir = self::findI18nDir($app);
// Localization is in /l10n, Texts are in $i18ndir
// (Just no need to define date/time format etc. twice)
- if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')
- || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/')
- || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')
- || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/')
+ if((OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')
+ || OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/')
+ || OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')
+ || OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/')
)
&& file_exists($i18ndir.$lang.'.php')) {
// Include the file, save the data from $CONFIG
@@ -162,7 +162,7 @@ class OC_L10N implements \OCP\IL10N {
}
}
- if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php') && OC_Helper::issubdirectory(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')) {
+ if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php') && OC_Helper::isSubDirectory(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')) {
// Include the file, save the data from $CONFIG
include OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php';
if(isset($LOCALIZATIONS) && is_array($LOCALIZATIONS)) {
@@ -176,14 +176,14 @@ class OC_L10N implements \OCP\IL10N {
}
/**
- * @brief Creates a function that The constructor
+ * Creates a function that The constructor
*
* If language is not set, the constructor tries to find the right
* language.
*
* Parts of the code is copied from Habari:
* https://github.com/habari/system/blob/master/classes/locale.php
- * @param $string string
+ * @param string $string
* @return string
*/
protected function createPluralFormFunction($string){
@@ -235,7 +235,7 @@ class OC_L10N implements \OCP\IL10N {
}
/**
- * @brief Translating
+ * Translating
* @param string $text The text we need a translation for
* @param array $parameters default:array() Parameters for sprintf
* @return \OC_L10N_String Translation or the same text
@@ -248,7 +248,7 @@ class OC_L10N implements \OCP\IL10N {
}
/**
- * @brief Translating
+ * Translating
* @param string $text_singular the string to translate for exactly one object
* @param string $text_plural the string to translate for n objects
* @param integer $count Number of objects
@@ -277,8 +277,8 @@ class OC_L10N implements \OCP\IL10N {
}
/**
- * @brief getTranslations
- * @returns array Fetch all translations
+ * getTranslations
+ * @return array Fetch all translations
*
* Returns an associative array with all translations
*/
@@ -288,8 +288,8 @@ class OC_L10N implements \OCP\IL10N {
}
/**
- * @brief getPluralFormString
- * @returns string containing the gettext "Plural-Forms"-string
+ * getPluralFormString
+ * @return string containing the gettext "Plural-Forms"-string
*
* Returns a string like "nplurals=2; plural=(n != 1);"
*/
@@ -299,8 +299,8 @@ class OC_L10N implements \OCP\IL10N {
}
/**
- * @brief getPluralFormFunction
- * @returns string the plural form function
+ * getPluralFormFunction
+ * @return string the plural form function
*
* returned function accepts the argument $n
*/
@@ -313,8 +313,8 @@ class OC_L10N implements \OCP\IL10N {
}
/**
- * @brief get localizations
- * @returns array Fetch all localizations
+ * get localizations
+ * @return array Fetch all localizations
*
* Returns an associative array with all localizations
*/
@@ -324,10 +324,10 @@ class OC_L10N implements \OCP\IL10N {
}
/**
- * @brief Localization
+ * Localization
* @param string $type Type of localization
* @param array|int|string $data parameters for this localization
- * @returns String or false
+ * @return String or false
*
* Returns the localized data.
*
@@ -379,9 +379,9 @@ class OC_L10N implements \OCP\IL10N {
}
/**
- * @brief Choose a language
+ * Choose a language
* @param array $text Associative Array with possible strings
- * @returns String
+ * @return String
*
* $text is an array 'de' => 'hallo welt', 'en' => 'hello world', ...
*
@@ -401,10 +401,27 @@ class OC_L10N implements \OCP\IL10N {
self::$language = $lang;
}
+
+ /**
+ * find the best language
+ * @param array|string $app details below
+ * string language
+ *
+ * If $app is an array, ownCloud assumes that these are the available
+ * languages. Otherwise ownCloud tries to find the files in the l10n
+ * folder.
+ *
+ * If nothing works it returns 'en'
+ */
+ public function getLanguageCode($app=null) {
+ return self::findLanguage($app);
+ }
+
+
/**
- * @brief find the best language
+ * find the best language
* @param array|string $app details below
- * @returns string language
+ * @return string language
*
* If $app is an array, ownCloud assumes that these are the available
* languages. Otherwise ownCloud tries to find the files in the l10n
@@ -475,9 +492,9 @@ class OC_L10N implements \OCP\IL10N {
}
/**
- * @brief find the l10n directory
+ * find the l10n directory
* @param string $app App that needs to be translated
- * @returns directory
+ * @return directory
*/
protected static function findI18nDir($app) {
// find the i18n dir
@@ -495,9 +512,9 @@ class OC_L10N implements \OCP\IL10N {
}
/**
- * @brief find all available languages for an app
+ * find all available languages for an app
* @param string $app App that needs to be translated
- * @returns array an array of available languages
+ * @return array an array of available languages
*/
public static function findAvailableLanguages($app=null) {
$available=array('en');//english is always available
@@ -517,7 +534,7 @@ class OC_L10N implements \OCP\IL10N {
/**
* @param string $app
* @param string $lang
- * @returns bool
+ * @return bool
*/
public static function languageExists($app, $lang) {
if ($lang == 'en') {//english is always available
diff --git a/lib/private/l10n/factory.php b/lib/private/l10n/factory.php
index 8c65f3681718db28b7e3b74beefa9067adfa6a86..d0c3799b9c2f55e39ecb4bfea7e525982fe231e0 100644
--- a/lib/private/l10n/factory.php
+++ b/lib/private/l10n/factory.php
@@ -20,8 +20,8 @@ class Factory {
/**
* get an L10N instance
- * @param $app string
- * @param $lang string|null
+ * @param string $app
+ * @param string|null $lang
* @return \OC_L10N
*/
public function get($app) {
diff --git a/lib/private/largefilehelper.php b/lib/private/largefilehelper.php
new file mode 100644
index 0000000000000000000000000000000000000000..293e09fe2c929bffb616b3be75be99990c7f8397
--- /dev/null
+++ b/lib/private/largefilehelper.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * Copyright (c) 2014 Andreas Fischer <bantu@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC;
+
+/**
+ * Helper class for large files on 32-bit platforms.
+ */
+class LargeFileHelper {
+ /**
+ * pow(2, 53) as a base-10 string.
+ * @var string
+ */
+ const POW_2_53 = '9007199254740992';
+
+ /**
+ * pow(2, 53) - 1 as a base-10 string.
+ * @var string
+ */
+ const POW_2_53_MINUS_1 = '9007199254740991';
+
+ /**
+ * @brief Checks whether our assumptions hold on the PHP platform we are on.
+ *
+ * @throws \RunTimeException if our assumptions do not hold on the current
+ * PHP platform.
+ */
+ public function __construct() {
+ $pow_2_53 = floatval(self::POW_2_53_MINUS_1) + 1.0;
+ if ($this->formatUnsignedInteger($pow_2_53) !== self::POW_2_53) {
+ throw new \RunTimeException(
+ 'This class assumes floats to be double precision or "better".'
+ );
+ }
+ }
+
+ /**
+ * @brief Formats a signed integer or float as an unsigned integer base-10
+ * string. Passed strings will be checked for being base-10.
+ *
+ * @param int|float|string $number Number containing unsigned integer data
+ *
+ * @throws \UnexpectedValueException if $number is not a float, not an int
+ * and not a base-10 string.
+ *
+ * @return string Unsigned integer base-10 string
+ */
+ public function formatUnsignedInteger($number) {
+ if (is_float($number)) {
+ // Undo the effect of the php.ini setting 'precision'.
+ return number_format($number, 0, '', '');
+ } else if (is_string($number) && ctype_digit($number)) {
+ return $number;
+ } else if (is_int($number)) {
+ // Interpret signed integer as unsigned integer.
+ return sprintf('%u', $number);
+ } else {
+ throw new \UnexpectedValueException(
+ 'Expected int, float or base-10 string'
+ );
+ }
+ }
+
+ /**
+ * @brief Tries to get the size of a file via various workarounds that
+ * even work for large files on 32-bit platforms.
+ *
+ * @param string $filename Path to the file.
+ *
+ * @return null|int|float Number of bytes as number (float or int) or
+ * null on failure.
+ */
+ public function getFileSize($filename) {
+ $fileSize = $this->getFileSizeViaCurl($filename);
+ if (!is_null($fileSize)) {
+ return $fileSize;
+ }
+ $fileSize = $this->getFileSizeViaCOM($filename);
+ if (!is_null($fileSize)) {
+ return $fileSize;
+ }
+ $fileSize = $this->getFileSizeViaExec($filename);
+ if (!is_null($fileSize)) {
+ return $fileSize;
+ }
+ return $this->getFileSizeNative($filename);
+ }
+
+ /**
+ * @brief Tries to get the size of a file via a CURL HEAD request.
+ *
+ * @param string $filename Path to the file.
+ *
+ * @return null|int|float Number of bytes as number (float or int) or
+ * null on failure.
+ */
+ public function getFileSizeViaCurl($filename) {
+ if (function_exists('curl_init')) {
+ $ch = curl_init("file://$filename");
+ curl_setopt($ch, CURLOPT_NOBODY, true);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($ch, CURLOPT_HEADER, true);
+ $data = curl_exec($ch);
+ curl_close($ch);
+ if ($data !== false) {
+ $matches = array();
+ preg_match('/Content-Length: (\d+)/', $data, $matches);
+ if (isset($matches[1])) {
+ return 0 + $matches[1];
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * @brief Tries to get the size of a file via the Windows DOM extension.
+ *
+ * @param string $filename Path to the file.
+ *
+ * @return null|int|float Number of bytes as number (float or int) or
+ * null on failure.
+ */
+ public function getFileSizeViaCOM($filename) {
+ if (class_exists('COM')) {
+ $fsobj = new \COM("Scripting.FileSystemObject");
+ $file = $fsobj->GetFile($filename);
+ return 0 + $file->Size;
+ }
+ return null;
+ }
+
+ /**
+ * @brief Tries to get the size of a file via an exec() call.
+ *
+ * @param string $filename Path to the file.
+ *
+ * @return null|int|float Number of bytes as number (float or int) or
+ * null on failure.
+ */
+ public function getFileSizeViaExec($filename) {
+ if (\OC_Helper::is_function_enabled('exec')) {
+ $os = strtolower(php_uname('s'));
+ $arg = escapeshellarg($filename);
+ $result = '';
+ if (strpos($os, 'linux') !== false) {
+ $result = $this->exec("stat -c %s $arg");
+ } else if (strpos($os, 'bsd') !== false) {
+ $result = $this->exec("stat -f %z $arg");
+ } else if (strpos($os, 'win') !== false) {
+ $result = $this->exec("for %F in ($arg) do @echo %~zF");
+ if (is_null($result)) {
+ // PowerShell
+ $result = $this->exec("(Get-Item $arg).length");
+ }
+ }
+ return $result;
+ }
+ return null;
+ }
+
+ /**
+ * @brief Gets the size of a file via a filesize() call and converts
+ * negative signed int to positive float. As the result of filesize()
+ * will wrap around after a file size of 2^32 bytes = 4 GiB, this
+ * should only be used as a last resort.
+ *
+ * @param string $filename Path to the file.
+ *
+ * @return int|float Number of bytes as number (float or int).
+ */
+ public function getFileSizeNative($filename) {
+ $result = filesize($filename);
+ if ($result < 0) {
+ // For file sizes between 2 GiB and 4 GiB, filesize() will return a
+ // negative int, as the PHP data type int is signed. Interpret the
+ // returned int as an unsigned integer and put it into a float.
+ return (float) sprintf('%u', $result);
+ }
+ return $result;
+ }
+
+ protected function exec($cmd) {
+ $result = trim(exec($cmd));
+ return ctype_digit($result) ? 0 + $result : null;
+ }
+}
diff --git a/lib/private/legacy/appconfig.php b/lib/private/legacy/appconfig.php
index cb5cef7e350a889435322f4a3e4e0d771f7e739e..4634f2c695d723b2c8ff528e08f716cc8129251d 100644
--- a/lib/private/legacy/appconfig.php
+++ b/lib/private/legacy/appconfig.php
@@ -34,8 +34,8 @@ class OC_Appconfig {
}
/**
- * @brief Get all apps using the config
- * @return array with app ids
+ * Get all apps using the config
+ * @return array an array of app ids
*
* This function returns a list of all apps that have at least one
* entry in the appconfig table.
@@ -45,9 +45,9 @@ class OC_Appconfig {
}
/**
- * @brief Get the available keys for an app
+ * Get the available keys for an app
* @param string $app the app we are looking for
- * @return array with key names
+ * @return array an array of key names
*
* This function gets all keys of an app. Please note that the values are
* not returned.
@@ -57,7 +57,7 @@ class OC_Appconfig {
}
/**
- * @brief Gets the config value
+ * Gets the config value
* @param string $app app
* @param string $key key
* @param string $default = null, default value if the key does not exist
@@ -71,7 +71,7 @@ class OC_Appconfig {
}
/**
- * @brief check if a key is set in the appconfig
+ * check if a key is set in the appconfig
* @param string $app
* @param string $key
* @return bool
@@ -81,7 +81,7 @@ class OC_Appconfig {
}
/**
- * @brief sets a value in the appconfig
+ * sets a value in the appconfig
* @param string $app app
* @param string $key key
* @param string $value value
@@ -93,7 +93,7 @@ class OC_Appconfig {
}
/**
- * @brief Deletes a key
+ * Deletes a key
* @param string $app app
* @param string $key key
*
@@ -104,7 +104,7 @@ class OC_Appconfig {
}
/**
- * @brief Remove app from appconfig
+ * Remove app from appconfig
* @param string $app app
*
* Removes all keys in appconfig belonging to the app.
diff --git a/lib/private/legacy/cache.php b/lib/private/legacy/cache.php
deleted file mode 100644
index f915eb516b1e538c5db80b91b5fc17f1382426f2..0000000000000000000000000000000000000000
--- a/lib/private/legacy/cache.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/private/legacy/cache/fileglobalgc.php b/lib/private/legacy/cache/fileglobalgc.php
deleted file mode 100644
index 385f6406673f5d89a6a017012751bfe8c9755f26..0000000000000000000000000000000000000000
--- a/lib/private/legacy/cache/fileglobalgc.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-class OC_Cache_FileGlobalGC extends OC\Cache\FileGlobalGC{
-}
diff --git a/lib/private/legacy/config.php b/lib/private/legacy/config.php
index 6c2103179ab039e8c5a32fa802a16092c5c632c6..899c19532f028f5177be4cfda751d8f66baed75d 100644
--- a/lib/private/legacy/config.php
+++ b/lib/private/legacy/config.php
@@ -50,8 +50,8 @@ class OC_Config {
}
/**
- * @brief Lists all available config keys
- * @return array with key names
+ * Lists all available config keys
+ * @return array an array of key names
*
* This function returns all keys saved in config.php. Please note that it
* does not return the values.
@@ -61,7 +61,7 @@ class OC_Config {
}
/**
- * @brief Gets a value from config.php
+ * Gets a value from config.php
* @param string $key key
* @param mixed $default = null default value
* @return mixed the value or $default
@@ -74,7 +74,7 @@ class OC_Config {
}
/**
- * @brief Sets a value
+ * Sets a value
* @param string $key key
* @param mixed $value value
*
@@ -86,7 +86,7 @@ class OC_Config {
}
/**
- * @brief Removes a key from the config
+ * Removes a key from the config
* @param string $key key
*
* This function removes a key from the config.php.
diff --git a/lib/private/legacy/filesystem.php b/lib/private/legacy/filesystem.php
deleted file mode 100644
index 34f92b357ca51d95c480b8aceecce8c28e040550..0000000000000000000000000000000000000000
--- a/lib/private/legacy/filesystem.php
+++ /dev/null
@@ -1,415 +0,0 @@
-<?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.
- */
-
-/**
- * Class for abstraction of filesystem functions
- * This class won't call any filesystem functions for itself but but will pass them to the correct OC_Filestorage object
- * this class should also handle all the file permission related stuff
- *
- * Hooks provided:
- * read(path)
- * write(path, &run)
- * post_write(path)
- * create(path, &run) (when a file is created, both create and write will be emitted in that order)
- * post_create(path)
- * delete(path, &run)
- * post_delete(path)
- * rename(oldpath,newpath, &run)
- * post_rename(oldpath,newpath)
- * copy(oldpath,newpath, &run) (if the newpath doesn't exists yes, copy, create and write will be emitted in that order)
- * post_rename(oldpath,newpath)
- *
- * the &run parameter can be set to false to prevent the operation from occurring
- */
-
-/**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
-class OC_Filesystem {
- /**
- * get the mountpoint of the storage object for a path
- * ( note: because a storage is not always mounted inside the fakeroot, the
- * returned mountpoint is relative to the absolute root of the filesystem
- * and doesn't take the chroot into account )
- *
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- * @param string $path
- * @return string
- */
- static public function getMountPoint($path) {
- return \OC\Files\Filesystem::getMountPoint($path);
- }
-
- /**
- * resolve a path to a storage and internal path
- *
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- * @param string $path
- * @return array consisting of the storage and the internal path
- */
- static public function resolvePath($path) {
- return \OC\Files\Filesystem::resolvePath($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function init($user, $root) {
- return \OC\Files\Filesystem::init($user, $root);
- }
-
- /**
- * get the default filesystem view
- *
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- * @return \OC\Files\View
- */
- static public function getView() {
- return \OC\Files\Filesystem::getView();
- }
-
- /**
- * tear down the filesystem, removing all storage providers
- *
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function tearDown() {
- \OC\Files\Filesystem::tearDown();
- }
-
- /**
- * @brief get the relative path of the root data directory for the current user
- * @return string
- *
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- * Returns path like /admin/files
- */
- static public function getRoot() {
- return \OC\Files\Filesystem::getRoot();
- }
-
- /**
- * clear all mounts and storage backends
- *
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- public static function clearMounts() {
- \OC\Files\Filesystem::clearMounts();
- }
-
- /**
- * mount an \OC\Files\Storage\Storage in our virtual filesystem
- *
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- * @param \OC\Files\Storage\Storage $class
- * @param array $arguments
- * @param string $mountpoint
- */
- static public function mount($class, $arguments, $mountpoint) {
- \OC\Files\Filesystem::mount($class, $arguments, $mountpoint);
- }
-
- /**
- * return the path to a local version of the file
- * we need this because we can't know if a file is stored local or not from
- * outside the filestorage and for some purposes a local file is needed
- *
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- * @param string $path
- * @return string
- */
- static public function getLocalFile($path) {
- return \OC\Files\Filesystem::getLocalFile($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- * @param string $path
- * @return string
- */
- static public function getLocalFolder($path) {
- return \OC\Files\Filesystem::getLocalFolder($path);
- }
-
- /**
- * return path to file which reflects one visible in browser
- *
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- * @param string $path
- * @return string
- */
- static public function getLocalPath($path) {
- return \OC\Files\Filesystem::getLocalPath($path);
- }
-
- /**
- * check if the requested path is valid
- *
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- * @param string $path
- * @return bool
- */
- static public function isValidPath($path) {
- return \OC\Files\Filesystem::isValidPath($path);
- }
-
- /**
- * checks if a file is blacklisted for storage in the filesystem
- * Listens to write and rename hooks
- *
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- * @param array $data from hook
- */
- static public function isBlacklisted($data) {
- \OC\Files\Filesystem::isBlacklisted($data);
- }
-
- /**
- * following functions are equivalent to their php builtin equivalents for arguments/return values.
- *
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function mkdir($path) {
- return \OC\Files\Filesystem::mkdir($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function rmdir($path) {
- return \OC\Files\Filesystem::rmdir($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function opendir($path) {
- return \OC\Files\Filesystem::opendir($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function readdir($path) {
- return \OC\Files\Filesystem::readdir($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function is_dir($path) {
- return \OC\Files\Filesystem::is_dir($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function is_file($path) {
- return \OC\Files\Filesystem::is_file($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function stat($path) {
- return \OC\Files\Filesystem::stat($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function filetype($path) {
- return \OC\Files\Filesystem::filetype($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function filesize($path) {
- return \OC\Files\Filesystem::filesize($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function readfile($path) {
- return \OC\Files\Filesystem::readfile($path);
- }
-
- /**
- * @deprecated Replaced by isReadable() as part of CRUDS
- */
- static public function is_readable($path) {
- return \OC\Files\Filesystem::isReadable($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function isCreatable($path) {
- return \OC\Files\Filesystem::isCreatable($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function isReadable($path) {
- return \OC\Files\Filesystem::isReadable($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function isUpdatable($path) {
- return \OC\Files\Filesystem::isUpdatable($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function isDeletable($path) {
- return \OC\Files\Filesystem::isDeletable($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function isSharable($path) {
- return \OC\Files\Filesystem::isSharable($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function file_exists($path) {
- return \OC\Files\Filesystem::file_exists($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function filemtime($path) {
- return \OC\Files\Filesystem::filemtime($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function touch($path, $mtime = null) {
- return \OC\Files\Filesystem::touch($path, $mtime);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function file_get_contents($path) {
- return \OC\Files\Filesystem::file_get_contents($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function file_put_contents($path, $data) {
- return \OC\Files\Filesystem::file_put_contents($path, $data);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function unlink($path) {
- return \OC\Files\Filesystem::unlink($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function rename($path1, $path2) {
- return \OC\Files\Filesystem::rename($path1, $path2);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function copy($path1, $path2) {
- return \OC\Files\Filesystem::copy($path1, $path2);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function fopen($path, $mode) {
- return \OC\Files\Filesystem::fopen($path, $mode);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function toTmpFile($path) {
- return \OC\Files\Filesystem::toTmpFile($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function fromTmpFile($tmpFile, $path) {
- return \OC\Files\Filesystem::fromTmpFile($tmpFile, $path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function getMimeType($path) {
- return \OC\Files\Filesystem::getMimeType($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function hash($type, $path, $raw = false) {
- return \OC\Files\Filesystem::hash($type, $path, $raw);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function free_space($path = '/') {
- return \OC\Files\Filesystem::free_space($path);
- }
-
- /**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
- static public function search($query) {
- return \OC\Files\Filesystem::search($query);
- }
-
- /**
- * check if a file or folder has been updated since $time
- *
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- * @param string $path
- * @param int $time
- * @return bool
- */
- static public function hasUpdated($path, $time) {
- return \OC\Files\Filesystem::hasUpdated($path, $time);
- }
-
- /**
- * normalize a path
- *
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- * @param string $path
- * @param bool $stripTrailingSlash
- * @return string
- */
- public static function normalizePath($path, $stripTrailingSlash = true) {
- return \OC\Files\Filesystem::normalizePath($path, $stripTrailingSlash);
- }
-}
diff --git a/lib/private/legacy/filesystemview.php b/lib/private/legacy/filesystemview.php
deleted file mode 100644
index d6bca62e06a7d91dfc49bd842aa90b3ea34f21ee..0000000000000000000000000000000000000000
--- a/lib/private/legacy/filesystemview.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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. */
-
-class OC_FilesystemView extends \OC\Files\View {}
diff --git a/lib/private/legacy/preferences.php b/lib/private/legacy/preferences.php
index fcde12796ca1cdd7b108117222cf0aa8f2081a5b..71d0b749f43f7d3734ff07fecf8eec52fde62fb3 100644
--- a/lib/private/legacy/preferences.php
+++ b/lib/private/legacy/preferences.php
@@ -28,8 +28,8 @@ 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
+ * Get all users using the preferences
+ * @return array an array of user ids
*
* This function returns a list of all users that have at least one entry
* in the preferences table.
@@ -39,7 +39,7 @@ class OC_Preferences{
}
/**
- * @brief Get all apps of a user
+ * Get all apps of a user
* @param string $user user
* @return integer[] with app ids
*
@@ -51,10 +51,10 @@ class OC_Preferences{
}
/**
- * @brief Get the available keys for an app
+ * 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
+ * @return array an array of key names
*
* This function gets all keys of an app of an user. Please note that the
* values are not returned.
@@ -64,7 +64,7 @@ class OC_Preferences{
}
/**
- * @brief Gets the preference
+ * Gets the preference
* @param string $user user
* @param string $app app
* @param string $key key
@@ -79,7 +79,7 @@ class OC_Preferences{
}
/**
- * @brief sets a value in the preferences
+ * sets a value in the preferences
* @param string $user user
* @param string $app app
* @param string $key key
@@ -95,7 +95,7 @@ class OC_Preferences{
}
/**
- * @brief Deletes a key
+ * Deletes a key
* @param string $user user
* @param string $app app
* @param string $key key
@@ -108,7 +108,7 @@ class OC_Preferences{
}
/**
- * @brief Remove app of user from preferences
+ * Remove app of user from preferences
* @param string $user user
* @param string $app app
* @return bool
@@ -121,7 +121,7 @@ class OC_Preferences{
}
/**
- * @brief Remove user from preferences
+ * Remove user from preferences
* @param string $user user
* @return bool
*
@@ -133,7 +133,7 @@ class OC_Preferences{
}
/**
- * @brief Remove app from all users
+ * Remove app from all users
* @param string $app app
* @return bool
*
diff --git a/lib/private/log.php b/lib/private/log.php
index e0b9fe3c696a85e72c2ae02e76251921703c9d69..98465ec40eae8f5b80b94ed9264d5fe678f5c597 100644
--- a/lib/private/log.php
+++ b/lib/private/log.php
@@ -8,6 +8,8 @@
namespace OC;
+use \OCP\ILogger;
+
/**
* logging utilities
*
@@ -18,8 +20,24 @@ namespace OC;
* MonoLog is an example implementing this interface.
*/
-class Log {
- private $logClass;
+class Log implements ILogger {
+
+ private $logger;
+
+ /**
+ * @param string $logger The logger that should be used
+ */
+ public function __construct($logger=null) {
+ // FIXME: Add this for backwards compatibility, should be fixed at some point probably
+ if($logger === null) {
+ $this->logger = 'OC_Log_'.ucfirst(\OC_Config::getValue('log_type', 'owncloud'));
+ call_user_func(array($this->logger, 'init'));
+ } else {
+ $this->logger = $logger;
+ }
+
+ }
+
/**
* System is unusable.
@@ -112,10 +130,6 @@ class Log {
$this->log(\OC_Log::DEBUG, $message, $context);
}
- public function __construct() {
- $this->logClass = 'OC_Log_'.ucfirst(\OC_Config::getValue('log_type', 'owncloud'));
- call_user_func(array($this->logClass, 'init'));
- }
/**
* Logs with an arbitrary level.
@@ -130,7 +144,16 @@ class Log {
} else {
$app = 'no app in context';
}
- $logClass=$this->logClass;
- $logClass::write($app, $message, $level);
+ // interpolate $message as defined in PSR-3
+ $replace = array();
+ foreach ($context as $key => $val) {
+ $replace['{' . $key . '}'] = $val;
+ }
+
+ // interpolate replacement values into the message and return
+ $message = strtr($message, $replace);
+
+ $logger = $this->logger;
+ $logger::write($app, $message, $level);
}
}
diff --git a/lib/private/log/errorhandler.php b/lib/private/log/errorhandler.php
index 1dde6b507fcd78587b977e313cd9cf2973435868..4345b3f6b70b7e468c475a20ad7b3ddce4f8f7e8 100644
--- a/lib/private/log/errorhandler.php
+++ b/lib/private/log/errorhandler.php
@@ -15,7 +15,7 @@ class ErrorHandler {
private static $logger;
/**
- * @brief remove password in URLs
+ * remove password in URLs
* @param string $msg
* @return string
*/
diff --git a/lib/private/mail.php b/lib/private/mail.php
index f9083cc4e64f83a38f077c37381b4c9fdebfc91d..81bcb3d8deb938e346a2a7237e80ab18b023687c 100644
--- a/lib/private/mail.php
+++ b/lib/private/mail.php
@@ -12,8 +12,6 @@
* A class to handle mail sending.
*/
-require_once 'class.phpmailer.php';
-
class OC_Mail {
/**
diff --git a/lib/private/memcache/memcached.php b/lib/private/memcache/memcached.php
index 075828eebad2c562257a2e1cf18284ee05a5e6c7..cd8e2e8d0b65713b2aae6209d95f700a52e1bf2d 100644
--- a/lib/private/memcache/memcached.php
+++ b/lib/private/memcache/memcached.php
@@ -57,7 +57,7 @@ class Memcached extends Cache {
public function hasKey($key) {
self::$cache->get($this->getNamespace() . $key);
- return self::$cache->getResultCode() !== \Memcached::RES_NOTFOUND;
+ return self::$cache->getResultCode() === \Memcached::RES_SUCCESS;
}
public function remove($key) {
diff --git a/lib/private/migrate.php b/lib/private/migrate.php
index 5bcc11b061bda624bd64e67eed4138b8ffa14788..8d88181ca195fb63a35a3ec0ea0cc7cd37aaf89a 100644
--- a/lib/private/migrate.php
+++ b/lib/private/migrate.php
@@ -53,7 +53,7 @@ class OC_Migrate{
}
/**
- * @brief finds and loads the providers
+ * finds and loads the providers
*/
static private function findProviders() {
// Find the providers
@@ -68,7 +68,7 @@ class OC_Migrate{
}
/**
- * @brief exports a user, or owncloud instance
+ * exports a user, or owncloud instance
* @param string $uid user id of user to export if export type is user, defaults to current
* @param string $type type of export, defualts to user
* @param string $path path to zip output folder
@@ -192,7 +192,7 @@ class OC_Migrate{
}
/**
- * @brief imports a user, or owncloud instance
+ * imports a user, or owncloud instance
* @param string $path path to zip
* @param string $type type of import (user or instance)
* @param string|null|int $uid userid of new user
@@ -307,7 +307,7 @@ class OC_Migrate{
}
/**
- * @brief recursively deletes a directory
+ * recursively deletes a directory
* @param string $dir path of dir to delete
* @param bool $deleteRootToo delete the root directory
* @return bool
@@ -332,8 +332,8 @@ class OC_Migrate{
}
/**
- * @brief tries to extract the import zip
- * @param $path string path to the zip
+ * tries to extract the import zip
+ * @param string $path path to the zip
* @return string path to extract location (with a trailing slash) or false on failure
*/
static private function extractZip( $path ) {
@@ -356,7 +356,7 @@ class OC_Migrate{
}
/**
- * @brief creates a migration.db in the users data dir with their app data in
+ * creates a migration.db in the users data dir with their app data in
* @return bool whether operation was successfull
*/
private static function exportAppData( ) {
@@ -406,7 +406,7 @@ class OC_Migrate{
/**
- * @brief generates json containing export info, and merges any data supplied
+ * generates json containing export info, and merges any data supplied
* @param array $array of data to include in the returned json
* @return string
*/
@@ -430,7 +430,7 @@ class OC_Migrate{
}
/**
- * @brief connects to migration.db, or creates if not found
+ * connects to migration.db, or creates if not found
* @param string $path to migration.db, defaults to user data dir
* @return bool whether the operation was successful
*/
@@ -460,7 +460,7 @@ class OC_Migrate{
}
/**
- * @brief creates the tables in migration.db from an apps database.xml
+ * creates the tables in migration.db from an apps database.xml
* @param string $appid id of the app
* @return bool whether the operation was successful
*/
@@ -498,7 +498,7 @@ class OC_Migrate{
}
/**
- * @brief tries to create the zip
+ * tries to create the zip
* @return bool
*/
static private function createZip() {
@@ -519,7 +519,7 @@ class OC_Migrate{
}
/**
- * @brief returns an array of apps that support migration
+ * returns an array of apps that support migration
* @return array
*/
static public function getApps() {
@@ -534,11 +534,11 @@ class OC_Migrate{
}
/**
- * @brief imports a new user
+ * imports a new user
* @param string $db string path to migration.db
- * @param $info object of migration info
+ * @param object $info object of migration info
* @param string|null|int $uid uid to use
- * @return array of apps with import statuses, or false on failure.
+ * @return array an array of apps with import statuses, or false on failure.
*/
public static function importAppData( $db, $info, $uid=null ) {
// Check if the db exists
diff --git a/lib/private/migration/content.php b/lib/private/migration/content.php
index b0e7a4e9528630c16cb4de0a13b69fdee1878bb3..cb5d9ad14729e56676f2697a49aa8d3655592946 100644
--- a/lib/private/migration/content.php
+++ b/lib/private/migration/content.php
@@ -33,9 +33,9 @@ class OC_Migration_Content{
private $tmpfiles=array();
/**
- * @brief sets up the
+ * sets up the
* @param ZipArchive $zip ZipArchive object
- * @param $db a database object (required for exporttype user)
+ * @param object $db a database object (required for exporttype user)
* @return bool|null
*/
public function __construct( $zip, $db=null ) {
@@ -45,11 +45,9 @@ class OC_Migration_Content{
}
- // @brief prepares the db
- // @param $query the sql query to prepare
-
/**
- * @param string $query
+ * prepares the db
+ * @param string $query the sql query to prepare
*/
public function prepare( $query ) {
@@ -73,7 +71,7 @@ class OC_Migration_Content{
}
/**
- * @brief processes the db query
+ * processes the db query
* @param string $query the query to process
* @return string of processed query
*/
@@ -87,8 +85,8 @@ class OC_Migration_Content{
}
/**
- * @brief copys rows to migration.db from the main database
- * @param $options array of options.
+ * copys rows to migration.db from the main database
+ * @param array $options array of options.
* @return bool
*/
public function copyRows( $options ) {
@@ -129,9 +127,9 @@ class OC_Migration_Content{
}
/**
- * @brief saves a sql data set into migration.db
+ * saves a sql data set into migration.db
* @param OC_DB_StatementWrapper $data a sql data set returned from self::prepare()->query()
- * @param $options array of copyRows options
+ * @param array $options array of copyRows options
* @return void
*/
private function insertData( $data, $options ) {
@@ -168,10 +166,10 @@ class OC_Migration_Content{
}
/**
- * @brief adds a directory to the zip object
+ * adds a directory to the zip object
* @param boolean|string $dir string path of the directory to add
- * @param $recursive bool
- * @param $internaldir string path of folder to add dir to in zip
+ * @param bool $recursive
+ * @param string $internaldir path of folder to add dir to in zip
* @return bool
*/
public function addDir( $dir, $recursive=true, $internaldir='' ) {
@@ -203,7 +201,7 @@ class OC_Migration_Content{
}
/**
- * @brief adds a file to the zip from a given string
+ * adds a file to the zip from a given string
* @param string $data string of data to add
* @param string $path the relative path inside of the zip to save the file to
* @return bool
@@ -222,7 +220,7 @@ class OC_Migration_Content{
}
/**
- * @brief closes the zip, removes temp files
+ * closes the zip, removes temp files
* @return bool
*/
public function finish() {
@@ -237,7 +235,7 @@ class OC_Migration_Content{
}
/**
- * @brief cleans up after the zip
+ * cleans up after the zip
*/
private function cleanup() {
// Delete tmp files
diff --git a/lib/private/migration/provider.php b/lib/private/migration/provider.php
index 2829a97a776f2d4623e4cada016b7e42cb212a9b..a7c611dcdd492401f3a7b5972035a344a17e3a4a 100644
--- a/lib/private/migration/provider.php
+++ b/lib/private/migration/provider.php
@@ -17,19 +17,19 @@ abstract class OC_Migration_Provider{
}
/**
- * @brief exports data for apps
+ * exports data for apps
* @return array appdata to be exported
*/
abstract function export( );
/**
- * @brief imports data for the app
+ * imports data for the app
* @return void
*/
abstract function import( );
/**
- * @brief sets the OC_Migration_Content object to $this->content
+ * sets the OC_Migration_Content object to $this->content
* @param OC_Migration_Content $content a OC_Migration_Content object
*/
public function setData( $uid, $content, $info=null ) {
@@ -43,7 +43,7 @@ abstract class OC_Migration_Provider{
}
/**
- * @brief returns the appid of the provider
+ * returns the appid of the provider
* @return string
*/
public function getID() {
diff --git a/lib/private/navigationmanager.php b/lib/private/navigationmanager.php
index 1f657b9ad80fd8b47edf0c381efd09132dd1ae15..8ad2f4c8f63f2df8d1a10ef1beb2256d758885fd 100644
--- a/lib/private/navigationmanager.php
+++ b/lib/private/navigationmanager.php
@@ -29,15 +29,15 @@ class NavigationManager implements \OCP\INavigationManager {
}
/**
- * @brief returns all the added Menu entries
- * @return array of the added entries
+ * returns all the added Menu entries
+ * @return array an array of the added entries
*/
public function getAll() {
return $this->entries;
}
/**
- * @brief removes all the entries
+ * removes all the entries
*/
public function clear() {
$this->entries = array();
@@ -52,7 +52,7 @@ class NavigationManager implements \OCP\INavigationManager {
}
/**
- * @brief gets the active Menu entry
+ * gets the active Menu entry
* @return string id or empty string
*
* This function returns the id of the active navigation entry (set by
diff --git a/lib/private/ocs.php b/lib/private/ocs.php
index 211e8222145c29add0b4140e46318b835b78f905..aeb3d259b30c697296bedf7f5d88dedc8d693bff 100644
--- a/lib/private/ocs.php
+++ b/lib/private/ocs.php
@@ -213,8 +213,8 @@ class OC_OCS {
}
/**
- * @param $writer
- * @param $data
+ * @param resource $writer
+ * @param array $data
* @param string $node
*/
public static function toXml($writer, $data, $node) {
diff --git a/lib/private/ocs/cloud.php b/lib/private/ocs/cloud.php
index c8bb9425f1a1292f33d977c4c2096e6f8b25b0fa..3ced0af8ee129be2680857cf4a05bb861280f2fc 100644
--- a/lib/private/ocs/cloud.php
+++ b/lib/private/ocs/cloud.php
@@ -57,8 +57,8 @@ class OC_OCS_Cloud {
* </quota>
* </data>
*
- * @param $parameters object should contain parameter 'userid' which identifies
- * the user from whom the information will be returned
+ * @param array $parameters should contain parameter 'userid' which identifies
+ * the user from whom the information will be returned
*/
public static function getUser($parameters) {
$return = array();
diff --git a/lib/private/ocs/result.php b/lib/private/ocs/result.php
index 0e3b85d5905b1de2e1fedaae9224d36c537098a7..567fe7f87feee820c08860e5ba9bac560a76144f 100644
--- a/lib/private/ocs/result.php
+++ b/lib/private/ocs/result.php
@@ -26,7 +26,7 @@ class OC_OCS_Result{
/**
* create the OCS_Result object
- * @param $data mixed the data to return
+ * @param mixed $data the data to return
*/
public function __construct($data=null, $code=100, $message=null) {
if ($data === null) {
@@ -42,7 +42,7 @@ class OC_OCS_Result{
/**
* optionally set the total number of items available
- * @param $items int
+ * @param int $items
*/
public function setTotalItems(int $items) {
$this->items = $items;
@@ -50,7 +50,7 @@ class OC_OCS_Result{
/**
* optionally set the the number of items per page
- * @param $items int
+ * @param int $items
*/
public function setItemsPerPage(int $items) {
$this->perPage = $items;
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
index b0480caf028d63a342173d436cd825f4147d30e9..39d7e9ccccdf66f1cb18bc0b0115500eed46e2f8 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -29,8 +29,8 @@
class OC_OCSClient{
/**
- * @brief Get the url of the OCS AppStore server.
- * @returns string of the AppStore server
+ * Get the url of the OCS AppStore server.
+ * @return string of the AppStore server
*
* This function returns the url of the OCS AppStore server. It´s possible
* to set it in the config file or it will fallback to the default
@@ -47,8 +47,8 @@ class OC_OCSClient{
/**
- * @brief Get the content of an OCS url call.
- * @returns string of the response
+ * Get the content of an OCS url call.
+ * @return string of the response
* This function calls an OCS server and returns the response. It also sets a sane timeout
* @param string $url
*/
@@ -58,8 +58,8 @@ class OC_OCSClient{
}
/**
- * @brief Get all the categories from the OCS server
- * @returns array with category ids
+ * Get all the categories from the OCS server
+ * @return array an array of category ids
* @note returns NULL if config value appstoreenabled is set to false
* This function returns a list of all the application categories on the OCS server
*/
@@ -91,11 +91,11 @@ class OC_OCSClient{
}
/**
- * @brief Get all the applications from the OCS server
- * @returns array with application data
+ * Get all the applications from the OCS server
+ * @return array an array of application data
*
* This function returns a list of all the applications on the OCS server
- * @param $categories
+ * @param array|string $categories
* @param int $page
* @param string $filter
*/
@@ -148,9 +148,9 @@ class OC_OCSClient{
/**
- * @brief Get an the applications from the OCS server
+ * Get an the applications from the OCS server
* @param string $id
- * @returns array with application data
+ * @return array an array of application data
*
* This function returns an applications from the OCS server
*/
@@ -191,8 +191,8 @@ class OC_OCSClient{
}
/**
- * @brief Get the download url for an application from the OCS server
- * @returns array with application data
+ * Get the download url for an application from the OCS server
+ * @return array an array of application data
*
* This function returns an download url for an applications from the OCS server
* @param string $id
diff --git a/lib/private/preferences.php b/lib/private/preferences.php
index d45e6e77089dea6fabfbb71141b54d0fc5d3dcaf..a4bfc650d08b467dc7141f8b80e0d21c3b98db54 100644
--- a/lib/private/preferences.php
+++ b/lib/private/preferences.php
@@ -68,8 +68,8 @@ class Preferences {
}
/**
- * @brief Get all users using the preferences
- * @return array with user ids
+ * Get all users using the preferences
+ * @return array an array of user ids
*
* This function returns a list of all users that have at least one entry
* in the preferences table.
@@ -109,7 +109,7 @@ class Preferences {
}
/**
- * @brief Get all apps of an user
+ * Get all apps of an user
* @param string $user user
* @return integer[] with app ids
*
@@ -122,10 +122,10 @@ class Preferences {
}
/**
- * @brief Get the available keys for an app
+ * 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
+ * @return array an array of key names
*
* This function gets all keys of an app of an user. Please note that the
* values are not returned.
@@ -140,7 +140,7 @@ class Preferences {
}
/**
- * @brief Gets the preference
+ * Gets the preference
* @param string $user user
* @param string $app app
* @param string $key key
@@ -160,7 +160,7 @@ class Preferences {
}
/**
- * @brief sets a value in the preferences
+ * sets a value in the preferences
* @param string $user user
* @param string $app app
* @param string $key key
@@ -206,7 +206,44 @@ class Preferences {
}
/**
- * @brief Deletes a key
+ * Gets the preference for an array of users
+ * @param string $app
+ * @param string $key
+ * @param array $users
+ * @return array Mapped values: userid => value
+ */
+ public function getValueForUsers($app, $key, $users) {
+ if (empty($users) || !is_array($users)) {
+ return array();
+ }
+
+ $chunked_users = array_chunk($users, 50, true);
+ $placeholders_50 = implode(',', array_fill(0, 50, '?'));
+
+ $userValues = array();
+ foreach ($chunked_users as $chunk) {
+ $queryParams = $chunk;
+ array_unshift($queryParams, $key);
+ array_unshift($queryParams, $app);
+
+ $placeholders = (sizeof($chunk) == 50) ? $placeholders_50 : implode(',', array_fill(0, sizeof($chunk), '?'));
+
+ $query = 'SELECT `userid`, `configvalue` '
+ . ' FROM `*PREFIX*preferences` '
+ . ' WHERE `appid` = ? AND `configkey` = ?'
+ . ' AND `userid` IN (' . $placeholders . ')';
+ $result = $this->conn->executeQuery($query, $queryParams);
+
+ while ($row = $result->fetch()) {
+ $userValues[$row['userid']] = $row['configvalue'];
+ }
+ }
+
+ return $userValues;
+ }
+
+ /**
+ * Deletes a key
* @param string $user user
* @param string $app app
* @param string $key key
@@ -227,7 +264,7 @@ class Preferences {
}
/**
- * @brief Remove app of user from preferences
+ * Remove app of user from preferences
* @param string $user user
* @param string $app app
*
@@ -246,7 +283,7 @@ class Preferences {
}
/**
- * @brief Remove user from preferences
+ * Remove user from preferences
* @param string $user user
*
* Removes all keys in preferences belonging to the user.
@@ -261,7 +298,7 @@ class Preferences {
}
/**
- * @brief Remove app from all users
+ * Remove app from all users
* @param string $app app
*
* Removes all keys in preferences belonging to the app.
diff --git a/lib/private/preview.php b/lib/private/preview.php
index 2964b83c5081498fdb1a9c7905937e6e296c8801..8089379bde5ba20d195baf329543c96800b0c3f9 100755
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -66,7 +66,7 @@ class Preview {
protected $info;
/**
- * @brief check if thumbnail or bigger version of thumbnail of file is cached
+ * 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
@@ -111,7 +111,7 @@ class Preview {
}
/**
- * @brief returns the path of the file you want a thumbnail from
+ * returns the path of the file you want a thumbnail from
* @return string
*/
public function getFile() {
@@ -119,7 +119,7 @@ class Preview {
}
/**
- * @brief returns the max width of the preview
+ * returns the max width of the preview
* @return integer
*/
public function getMaxX() {
@@ -127,7 +127,7 @@ class Preview {
}
/**
- * @brief returns the max height of the preview
+ * returns the max height of the preview
* @return integer
*/
public function getMaxY() {
@@ -135,7 +135,7 @@ class Preview {
}
/**
- * @brief returns whether or not scalingup is enabled
+ * returns whether or not scalingup is enabled
* @return bool
*/
public function getScalingUp() {
@@ -143,7 +143,7 @@ class Preview {
}
/**
- * @brief returns the name of the thumbnailfolder
+ * returns the name of the thumbnailfolder
* @return string
*/
public function getThumbnailsFolder() {
@@ -151,7 +151,7 @@ class Preview {
}
/**
- * @brief returns the max scale factor
+ * returns the max scale factor
* @return string
*/
public function getMaxScaleFactor() {
@@ -159,7 +159,7 @@ class Preview {
}
/**
- * @brief returns the max width set in ownCloud's config
+ * returns the max width set in ownCloud's config
* @return string
*/
public function getConfigMaxX() {
@@ -167,7 +167,7 @@ class Preview {
}
/**
- * @brief returns the max height set in ownCloud's config
+ * returns the max height set in ownCloud's config
* @return string
*/
public function getConfigMaxY() {
@@ -189,9 +189,9 @@ class Preview {
}
/**
- * @brief set the path of the file you want a thumbnail from
+ * set the path of the file you want a thumbnail from
* @param string $file
- * @return $this
+ * @return \OC\Preview $this
*/
public function setFile($file) {
$this->file = $file;
@@ -206,7 +206,7 @@ class Preview {
}
/**
- * @brief set mime type explicitly
+ * set mime type explicitly
* @param string $mimeType
*/
public function setMimetype($mimeType) {
@@ -214,10 +214,10 @@ class Preview {
}
/**
- * @brief set the the max width of the preview
+ * set the the max width of the preview
* @param int $maxX
* @throws \Exception
- * @return $this
+ * @return \OC\Preview $this
*/
public function setMaxX($maxX = 1) {
if ($maxX <= 0) {
@@ -235,10 +235,10 @@ class Preview {
}
/**
- * @brief set the the max height of the preview
+ * set the the max height of the preview
* @param int $maxY
* @throws \Exception
- * @return $this
+ * @return \OC\Preview $this
*/
public function setMaxY($maxY = 1) {
if ($maxY <= 0) {
@@ -256,9 +256,9 @@ class Preview {
}
/**
- * @brief set whether or not scalingup is enabled
+ * set whether or not scalingup is enabled
* @param bool $scalingUp
- * @return $this
+ * @return \OC\Preview $this
*/
public function setScalingup($scalingUp) {
if ($this->getMaxScaleFactor() === 1) {
@@ -274,7 +274,7 @@ class Preview {
}
/**
- * @brief check if all parameters are valid
+ * check if all parameters are valid
* @return bool
*/
public function isFileValid() {
@@ -293,7 +293,7 @@ class Preview {
}
/**
- * @brief deletes previews of a file with specific x and y
+ * deletes previews of a file with specific x and y
* @return bool
*/
public function deletePreview() {
@@ -310,7 +310,7 @@ class Preview {
}
/**
- * @brief deletes all previews of a file
+ * deletes all previews of a file
* @return bool
*/
public function deleteAllPreviews() {
@@ -328,7 +328,7 @@ class Preview {
}
/**
- * @brief check if thumbnail or bigger version of thumbnail of file is cached
+ * check if thumbnail or bigger version of thumbnail of file is cached
* @param int $fileId fileId of the original image
* @return string|false path to thumbnail if it exists or false
*/
@@ -348,7 +348,7 @@ class Preview {
}
/**
- * @brief check if a bigger version of thumbnail of file is cached
+ * check if a bigger version of thumbnail of file is cached
* @param int $fileId fileId of the original image
* @return string|false path to bigger thumbnail if it exists or false
*/
@@ -380,9 +380,9 @@ class Preview {
}
/**
- * @brief get possible bigger thumbnails of the given image
+ * get possible bigger thumbnails of the given image
* @param int $fileId fileId of the original image
- * @return array of paths to bigger thumbnails
+ * @return array an array of paths to bigger thumbnails
*/
private function getPossibleThumbnails($fileId) {
@@ -433,12 +433,12 @@ class Preview {
* @return bool
*/
private function unscalable($x, $y) {
-
+
$maxX = $this->getMaxX();
$maxY = $this->getMaxY();
$scalingUp = $this->getScalingUp();
$maxScaleFactor = $this->getMaxScaleFactor();
-
+
if ($x < $maxX || $y < $maxY) {
if ($scalingUp) {
$scalefactor = $maxX / $x;
@@ -453,7 +453,7 @@ class Preview {
}
/**
- * @brief return a preview of a file
+ * return a preview of a file
* @return \OC_Image
*/
public function getPreview() {
@@ -529,7 +529,7 @@ class Preview {
}
/**
- * @brief show preview
+ * show preview
* @return void
*/
public function showPreview($mimeType = null) {
@@ -541,7 +541,7 @@ class Preview {
}
/**
- * @brief resize, crop and fix orientation
+ * resize, crop and fix orientation
* @return void
*/
private function resizeAndCrop() {
@@ -652,7 +652,7 @@ class Preview {
}
/**
- * @brief register a new preview provider to be used
+ * register a new preview provider to be used
* @param array $options
* @return void
*/
@@ -661,7 +661,7 @@ class Preview {
}
/**
- * @brief create instances of all the registered preview providers
+ * create instances of all the registered preview providers
* @return void
*/
private static function initProviders() {
@@ -750,7 +750,7 @@ class Preview {
}
/**
- * @param $fileId
+ * @param int $fileId
* @return string
*/
private function buildCachePath($fileId) {
diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php
index 59aaa27ef3456f8006343b6806ab6aaca8c1a83f..cec5d7c0170182d17cf15e1c95ac75f4f8b96420 100644
--- a/lib/private/preview/image.php
+++ b/lib/private/preview/image.php
@@ -22,12 +22,13 @@ class Image extends Provider {
}
$image = new \OC_Image();
- //check if file is encrypted
+
if($fileInfo['encrypted'] === true) {
- $image->loadFromData(stream_get_contents($fileview->fopen($path, 'r')));
- }else{
- $image->loadFromFile($fileview->getLocalFile($path));
+ $fileName = $fileview->toTmpFile($path);
+ } else {
+ $fileName = $fileview->getLocalFile($path);
}
+ $image->loadFromFile($fileName);
return $image->valid() ? $image : false;
}
diff --git a/lib/private/previewmanager.php b/lib/private/previewmanager.php
index ac9a866a75b71d04f86afe114df11e4dbe58d89d..23dbee13c7d465d6d8b6f1d906a3b188ddc4287a 100755
--- a/lib/private/previewmanager.php
+++ b/lib/private/previewmanager.php
@@ -13,7 +13,7 @@ use OCP\IPreview;
class PreviewManager implements IPreview {
/**
- * @brief return a preview of a file
+ * 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
@@ -27,7 +27,7 @@ class PreviewManager implements IPreview {
}
/**
- * @brief returns true if the passed mime type is supported
+ * returns true if the passed mime type is supported
* @param string $mimeType
* @return boolean
*/
diff --git a/lib/private/request.php b/lib/private/request.php
index 90f7488eea5b1e0a22e95867668c924343fb49ce..09928021a7f5d073095062284f6384e21f10a40c 100755
--- a/lib/private/request.php
+++ b/lib/private/request.php
@@ -16,9 +16,9 @@ class OC_Request {
const REGEX_LOCALHOST = '/^(127\.0\.0\.1|localhost)(:[0-9]+|)$/';
/**
- * @brief Check overwrite condition
+ * Check overwrite condition
* @param string $type
- * @returns bool
+ * @return bool
*/
private static function isOverwriteCondition($type = '') {
$regex = '/' . OC_Config::getValue('overwritecondaddr', '') . '/';
@@ -27,7 +27,7 @@ class OC_Request {
}
/**
- * @brief Checks whether a domain is considered as trusted from the list
+ * Checks whether a domain is considered as trusted from the list
* of trusted domains. If no trusted domains have been configured, returns
* true.
* This is used to prevent Host Header Poisoning.
@@ -47,9 +47,9 @@ class OC_Request {
}
/**
- * @brief Returns the unverified server host from the headers without checking
+ * Returns the unverified server host from the headers without checking
* whether it is a trusted domain
- * @returns string the server host
+ * @return string the server host
*
* Returns the server host, even if the website uses one or more
* reverse proxies
@@ -87,9 +87,9 @@ class OC_Request {
}
/**
- * @brief Returns the server host from the headers, or the first configured
+ * Returns the server host from the headers, or the first configured
* trusted domain if the host isn't in the trusted list
- * @returns string the server host
+ * @return string the server host
*
* Returns the server host, even if the website uses one or more
* reverse proxies
@@ -120,8 +120,8 @@ class OC_Request {
}
/**
- * @brief Returns the server protocol
- * @returns string the server protocol
+ * Returns the server protocol
+ * @return string the server protocol
*
* Returns the server protocol. It respects reverse proxy servers and load balancers
*/
@@ -142,8 +142,8 @@ class OC_Request {
}
/**
- * @brief Returns the request uri
- * @returns string the request uri
+ * Returns the request uri
+ * @return string the request uri
*
* Returns the request uri, even if the website uses one or more
* reverse proxies
@@ -158,7 +158,7 @@ class OC_Request {
}
/**
- * @brief Returns the script name
+ * Returns the script name
* @return string the script name
*
* Returns the script name, even if the website uses one or more
@@ -176,7 +176,7 @@ class OC_Request {
}
/**
- * @brief get Path info from request
+ * get Path info from request
* @return string Path info or false when not found
*/
public static function getPathInfo() {
@@ -200,7 +200,7 @@ class OC_Request {
}
/**
- * @brief get Path info from request, not urldecoded
+ * get Path info from request, not urldecoded
* @throws Exception
* @return string Path info or false when not found
*/
@@ -242,7 +242,7 @@ class OC_Request {
}
/**
- * @brief Check if the requester sent along an mtime
+ * Check if the requester sent along an mtime
* @return false or an mtime
*/
static public function hasModificationTime () {
diff --git a/lib/private/response.php b/lib/private/response.php
index 1aa5e629b8b764e6bd5e55b276ac5b00ab9e39b1..caa382af77696b856b5d88e0626cb810c568e743 100644
--- a/lib/private/response.php
+++ b/lib/private/response.php
@@ -10,12 +10,13 @@ class OC_Response {
const STATUS_FOUND = 304;
const STATUS_NOT_MODIFIED = 304;
const STATUS_TEMPORARY_REDIRECT = 307;
+ const STATUS_BAD_REQUEST = 400;
const STATUS_NOT_FOUND = 404;
const STATUS_INTERNAL_SERVER_ERROR = 500;
const STATUS_SERVICE_UNAVAILABLE = 503;
/**
- * @brief Enable response caching by sending correct HTTP headers
+ * Enable response caching by sending correct HTTP headers
* @param integer $cache_time time to cache the response
* >0 cache time in seconds
* 0 and <0 enable default browser caching
@@ -41,7 +42,7 @@ class OC_Response {
}
/**
- * @brief disable browser caching
+ * disable browser caching
* @see enableCaching with cache_time = 0
*/
static public function disableCaching() {
@@ -49,7 +50,7 @@ class OC_Response {
}
/**
- * @brief Set response status
+ * Set response status
* @param int $status a HTTP status code, see also the STATUS constants
*/
static public function setStatus($status) {
@@ -83,7 +84,7 @@ class OC_Response {
}
/**
- * @brief Send redirect response
+ * Send redirect response
* @param string $location to redirect to
*/
static public function redirect($location) {
@@ -92,8 +93,8 @@ class OC_Response {
}
/**
- * @brief Set reponse expire time
- * @param $expires date-time when the response expires
+ * Set reponse expire time
+ * @param string|DateTime $expires date-time when the response expires
* string for DateInterval from now
* DateTime object when to expire response
*/
@@ -113,7 +114,7 @@ class OC_Response {
/**
* Checks and set ETag header, when the request matches sends a
* 'not modified' response
- * @param $etag token to use for modification check
+ * @param string $etag token to use for modification check
*/
static public function setETagHeader($etag) {
if (empty($etag)) {
@@ -131,7 +132,7 @@ class OC_Response {
/**
* Checks and set Last-Modified header, when the request matches sends a
* 'not modified' response
- * @param $lastModified time when the reponse was last modified
+ * @param int|DateTime|string $lastModified time when the reponse was last modified
*/
static public function setLastModifiedHeader($lastModified) {
if (empty($lastModified)) {
@@ -170,7 +171,7 @@ class OC_Response {
}
/**
- * @brief Send file as response, checking and setting caching headers
+ * Send file as response, checking and setting caching headers
* @param string $filepath of file to send
*/
static public function sendFile($filepath) {
@@ -186,4 +187,36 @@ class OC_Response {
self::setStatus(self::STATUS_NOT_FOUND);
}
}
+
+ /*
+ * This function adds some security related headers to all requests served via base.php
+ * The implementation of this function has to happen here to ensure that all third-party
+ * components (e.g. SabreDAV) also benefit from this headers.
+ */
+ public static function addSecurityHeaders() {
+ header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters
+ header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE
+
+ // iFrame Restriction Policy
+ $xFramePolicy = OC_Config::getValue('xframe_restriction', true);
+ if ($xFramePolicy) {
+ header('X-Frame-Options: Sameorigin'); // Disallow iFraming from other domains
+ }
+
+ // Content Security Policy
+ // If you change the standard policy, please also change it in config.sample.php
+ $policy = OC_Config::getValue('custom_csp_policy',
+ 'default-src \'self\'; '
+ . 'script-src \'self\' \'unsafe-eval\'; '
+ . 'style-src \'self\' \'unsafe-inline\'; '
+ . 'frame-src *; '
+ . 'img-src *; '
+ . 'font-src \'self\' data:; '
+ . 'media-src *');
+ header('Content-Security-Policy:' . $policy);
+
+ // https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
+ header('X-Robots-Tag: none');
+ }
+
}
diff --git a/lib/private/route/route.php b/lib/private/route/route.php
index df80facf9c15e6e09aeedaed244127853f952686..87030ad78530ee7da657efe64e9eb99e7cffe6df 100644
--- a/lib/private/route/route.php
+++ b/lib/private/route/route.php
@@ -124,7 +124,7 @@ class Route extends SymfonyRoute implements IRoute {
/**
* The action to execute when this route matches, includes a file like
* it is called directly
- * @param $file
+ * @param string $file
* @return void
*/
public function actionInclude($file) {
diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index f7900362bec577a29d1ec7db2c9aea966c79d1c4..a72ac2bb3f16f732f7b9f8a48bd673d4319e42db 100644
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -90,7 +90,7 @@ class Router implements IRouter {
$files[] = 'settings/routes.php';
$files[] = 'core/routes.php';
$files[] = 'ocs/routes.php';
- $this->cacheKey = \OC_Cache::generateCacheKeyFromFiles($files);
+ $this->cacheKey = \OC\Cache::generateCacheKeyFromFiles($files);
}
return $this->cacheKey;
}
@@ -239,7 +239,7 @@ class Router implements IRouter {
/**
* To isolate the variable scope used inside the $file it is required in it's own method
- * @param $file
+ * @param string $file
*/
private function requireRouteFile($file) {
require_once $file;
diff --git a/lib/private/server.php b/lib/private/server.php
index 4c29092cf44e37de62ea8fb13fa6814bd36cab20..47bdee4b0f8bbbbeec3d666efc7147c3c6bebbd4 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -3,6 +3,7 @@
namespace OC;
use OC\AppFramework\Http\Request;
+use OC\AppFramework\Db\Db;
use OC\AppFramework\Utility\SimpleContainer;
use OC\Cache\UserCache;
use OC\DB\ConnectionWrapper;
@@ -30,9 +31,9 @@ class Server extends SimpleContainer implements IServerContainer {
}
if (\OC::$session->exists('requesttoken')) {
- $requesttoken = \OC::$session->get('requesttoken');
+ $requestToken = \OC::$session->get('requesttoken');
} else {
- $requesttoken = false;
+ $requestToken = false;
}
if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
@@ -54,7 +55,7 @@ class Server extends SimpleContainer implements IServerContainer {
? $_SERVER['REQUEST_METHOD']
: null,
'urlParams' => $urlParams,
- 'requesttoken' => $requesttoken,
+ 'requesttoken' => $requestToken,
), $stream
);
});
@@ -158,6 +159,14 @@ class Server extends SimpleContainer implements IServerContainer {
$this->registerService('AvatarManager', function($c) {
return new AvatarManager();
});
+ $this->registerService('Logger', function($c) {
+ /** @var $c SimpleContainer */
+ $logClass = $c->query('AllConfig')->getSystemValue('log_type', 'owncloud');
+ $logger = 'OC_Log_' . ucfirst($logClass);
+ call_user_func(array($logger, 'init'));
+
+ return new Log($logger);
+ });
$this->registerService('JobList', function ($c) {
/**
* @var Server $c
@@ -177,6 +186,9 @@ class Server extends SimpleContainer implements IServerContainer {
}
return $router;
});
+ $this->registerService('Db', function($c){
+ return new Db();
+ });
}
/**
@@ -325,14 +337,14 @@ class Server extends SimpleContainer implements IServerContainer {
}
/**
- * @return \OC\URLGenerator
+ * @return \OCP\IURLGenerator
*/
function getURLGenerator() {
return $this->query('URLGenerator');
}
/**
- * @return \OC\Helper
+ * @return \OCP\IHelper
*/
function getHelper() {
return $this->query('AppHelper');
@@ -392,6 +404,15 @@ class Server extends SimpleContainer implements IServerContainer {
return $this->query('JobList');
}
+ /**
+ * Returns a logger instance
+ *
+ * @return \OCP\ILogger
+ */
+ function getLogger() {
+ return $this->query('Logger');
+ }
+
/**
* Returns a router for generating and matching urls
*
@@ -400,4 +421,13 @@ class Server extends SimpleContainer implements IServerContainer {
function getRouter(){
return $this->query('Router');
}
+
+
+ /**
+ * Returns an instance of the db facade
+ * @return \OCP\IDb
+ */
+ function getDb() {
+ return $this->query('Db');
+ }
}
diff --git a/lib/private/setup.php b/lib/private/setup.php
index 4889f6033328b427efb8d4473692bd0776cc6680..7a08816c4b1f5e384875ea7dfe00f686f9e78b84 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -152,7 +152,7 @@ class OC_Setup {
}
/**
- * @brief Post installation checks
+ * Post installation checks
*/
public static function postSetupCheck($params) {
// setup was successful -> webdav testing now
diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php
index 515ec85909aa1ff11146205c1bd156b930d574dd..ab9e0ca4926ded5959d1c375ffe2b4e8d5c6c6d5 100644
--- a/lib/private/share/helper.php
+++ b/lib/private/share/helper.php
@@ -25,13 +25,14 @@ class Helper extends \OC\Share\Constants {
/**
* Generate a unique target for the item
- * @param string Item type
- * @param string Item source
- * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
- * @param string User or group the item is being shared with
- * @param string User that is the owner of shared item
- * @param string The suggested target originating from a reshare (optional)
- * @param int The id of the parent group share (optional)
+ * @param string $itemType
+ * @param string $itemSource
+ * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+ * @param string $shareWith User or group the item is being shared with
+ * @param string $uidOwner User that is the owner of shared item
+ * @param string $suggestedTarget The suggested target originating from a reshare (optional)
+ * @param int $groupParent The id of the parent group share (optional)
+ * @throws \Exception
* @return string Item target
*/
public static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
@@ -142,9 +143,9 @@ class Helper extends \OC\Share\Constants {
/**
* Delete all reshares of an item
- * @param int Id of item to delete
- * @param bool If true, exclude the parent from the delete (optional)
- * @param string The user that the parent was shared with (optinal)
+ * @param int $parent Id of item to delete
+ * @param bool $excludeParent If true, exclude the parent from the delete (optional)
+ * @param string $uidOwner The user that the parent was shared with (optional)
*/
public static function delete($parent, $excludeParent = false, $uidOwner = null) {
$ids = array($parent);
@@ -201,7 +202,7 @@ class Helper extends \OC\Share\Constants {
}
/**
- * @brief get default expire settings defined by the admin
+ * get default expire settings defined by the admin
* @return array contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
*/
public static function getDefaultExpireSetting() {
@@ -221,7 +222,7 @@ class Helper extends \OC\Share\Constants {
}
/**
- * @brief calculate expire date
+ * calculate expire date
* @param array $defaultExpireSettings contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
* @param int $creationTime timestamp when the share was created
* @param int $userExpireDate expire timestamp set by the user
@@ -231,7 +232,7 @@ class Helper extends \OC\Share\Constants {
$expires = false;
- if (isset($defaultExpireSettings['defaultExpireDateSet']) && $defaultExpireSettings['defaultExpireDateSet']) {
+ if (!empty($defaultExpireSettings['defaultExpireDateSet'])) {
$expires = $creationTime + $defaultExpireSettings['expireAfterDays'] * 86400;
}
@@ -239,8 +240,8 @@ class Helper extends \OC\Share\Constants {
if (isset($userExpireDate)) {
// if the admin decided to enforce the default expire date then we only take
// the user defined expire date of it is before the default expire date
- if ($expires && isset($defaultExpireSettings['enforceExpireDate']) && $defaultExpireSettings['enforceExpireDate']) {
- $expires = ($userExpireDate < $expires) ? $userExpireDate : $expires;
+ if ($expires && !empty($defaultExpireSettings['enforceExpireDate'])) {
+ $expires = min($userExpireDate, $expires);
} else {
$expires = $userExpireDate;
}
diff --git a/lib/private/share/hooks.php b/lib/private/share/hooks.php
index a33c71eedd2f80baf04a6907166a54b2a8b00a0a..9ac64d888ea8be7538ee15a00c588da8de015d86 100644
--- a/lib/private/share/hooks.php
+++ b/lib/private/share/hooks.php
@@ -22,9 +22,9 @@
namespace OC\Share;
class Hooks extends \OC\Share\Constants {
- /**
+ /**
* Function that is called after a user is deleted. Cleans up the shares of that user.
- * @param array arguments
+ * @param array $arguments
*/
public static function post_deleteUser($arguments) {
// Delete any items shared with the deleted user
@@ -42,7 +42,7 @@ class Hooks extends \OC\Share\Constants {
/**
* Function that is called after a user is added to a group.
* TODO what does it do?
- * @param array arguments
+ * @param array $arguments
*/
public static function post_addToGroup($arguments) {
// Find the group shares and check if the user needs a unique target
@@ -76,7 +76,7 @@ class Hooks extends \OC\Share\Constants {
/**
* Function that is called after a user is removed from a group. Shares are cleaned up.
- * @param array arguments
+ * @param array $arguments
*/
public static function post_removeFromGroup($arguments) {
$sql = 'SELECT `id`, `share_type` FROM `*PREFIX*share`'
@@ -95,7 +95,7 @@ class Hooks extends \OC\Share\Constants {
/**
* Function that is called after a group is removed. Cleans up the shares to that group.
- * @param array arguments
+ * @param array $arguments
*/
public static function post_deleteGroup($arguments) {
$sql = 'SELECT `id` FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?';
diff --git a/lib/private/share/mailnotifications.php b/lib/private/share/mailnotifications.php
index 4799db523303b682da3a832ece9e632554f89173..cb74dcf8b9065c80c7a228105ad37dca36ad9706 100644
--- a/lib/private/share/mailnotifications.php
+++ b/lib/private/share/mailnotifications.php
@@ -21,11 +21,30 @@
namespace OC\Share;
+use DateTime;
+
class MailNotifications {
- private $senderId; // sender userId
- private $from; // sender email address
+ /**
+ * sender userId
+ * @var null|string
+ */
+ private $senderId;
+
+ /**
+ * sender email address
+ * @var string
+ */
+ private $from;
+
+ /**
+ * @var string
+ */
private $senderDisplayName;
+
+ /**
+ * @var \OC_L10N
+ */
private $l;
/**
@@ -47,11 +66,11 @@ class MailNotifications {
}
/**
- * @brief inform users if a file was shared with them
+ * inform users if a file was shared with them
*
* @param array $recipientList list of recipients
- * @param type $itemSource shared item source
- * @param type $itemType shared item type
+ * @param string $itemSource shared item source
+ * @param string $itemType shared item type
* @return array list of user to whom the mail send operation failed
*/
public function sendInternalShareMail($recipientList, $itemSource, $itemType) {
@@ -106,7 +125,7 @@ class MailNotifications {
}
/**
- * @brief inform recipient about public link share
+ * inform recipient about public link share
*
* @param string $recipient recipient email address
* @param string $filename the shared file
@@ -131,12 +150,12 @@ class MailNotifications {
}
/**
- * @brief create mail body for plain text and html mail
+ * create mail body for plain text and html mail
*
* @param string $filename the shared file
* @param string $link link to the shared file
* @param int $expiration expiration date (timestamp)
- * @return array with the html mail body and the plain text mail body
+ * @return array an array of the html mail body and the plain text mail body
*/
private function createMailBody($filename, $link, $expiration) {
diff --git a/lib/private/share/searchresultsorter.php b/lib/private/share/searchresultsorter.php
index 76abbf308460d076ad9ae5968e72c702f82c502c..91709902fffdf72ce000ec7a5dc0a9bf89aec62b 100644
--- a/lib/private/share/searchresultsorter.php
+++ b/lib/private/share/searchresultsorter.php
@@ -18,8 +18,8 @@ class SearchResultSorter {
* @param string $search the search term as was given by the user
* @param string $key the array key containing the value that should be compared
* against
- * @param $encoding optional, encoding to use, defaults to UTF-8
- * @param $log optional, an \OC\Log instance
+ * @param string $encoding optional, encoding to use, defaults to UTF-8
+ * @param \OC\Log $log optional
*/
public function __construct($search, $key, \OC\Log $log = null, $encoding = 'UTF-8') {
$this->encoding = $encoding;
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index b12d62e8439a7f7fd2821f280b715d8d3ab4835e..46796c263703e2de17d7d490c8cd1993e0cf45d4 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -48,11 +48,11 @@ class Share extends \OC\Share\Constants {
/**
* Register a sharing backend class that implements OCP\Share_Backend for an item type
- * @param string Item type
- * @param string Backend class
- * @param string (optional) Depends on item type
- * @param array (optional) List of supported file extensions if this item type depends on files
- * @return Returns true if backend is registered or false if error
+ * @param string $itemType Item type
+ * @param string $class Backend class
+ * @param string $collectionOf (optional) Depends on item type
+ * @param array $supportedFileExtensions (optional) List of supported file extensions if this item type depends on files
+ * @return boolean true if backend is registered or false if error
*/
public static function registerBackend($itemType, $class, $collectionOf = null, $supportedFileExtensions = null) {
if (self::isEnabled()) {
@@ -78,7 +78,7 @@ class Share extends \OC\Share\Constants {
/**
* Check if the Share API is enabled
- * @return Returns true if enabled or false
+ * @return boolean true if enabled or false
*
* The Share API is enabled by default if not configured
*/
@@ -93,8 +93,8 @@ class Share extends \OC\Share\Constants {
* Find which users can access a shared item
* @param string $path to the file
* @param string $ownerUser owner of the file
- * @param bool $includeOwner include owner to the list of users with access to the file
- * @param bool $returnUserPaths Return an array with the user => path map
+ * @param boolean $includeOwner include owner to the list of users with access to the file
+ * @param boolean $returnUserPaths Return an array with the user => path map
* @return array
* @note $path needs to be relative to user data dir, e.g. 'file.txt'
* not '/admin/data/file.txt'
@@ -239,12 +239,12 @@ class Share extends \OC\Share\Constants {
/**
* Get the items of item type shared with the current user
- * @param string Item type
- * @param int Format (optional) Format type must be defined by the backend
- * @param mixed Parameters (optional)
- * @param int Number of items to return (optional) Returns all by default
- * @param bool include collections (optional)
- * @return Return depends on format
+ * @param string $itemType
+ * @param int $format (optional) Format type must be defined by the backend
+ * @param mixed $parameters (optional)
+ * @param int $limit Number of items to return (optional) Returns all by default
+ * @param boolean $includeCollections (optional)
+ * @return mixed Return depends on format
*/
public static function getItemsSharedWith($itemType, $format = self::FORMAT_NONE,
$parameters = null, $limit = -1, $includeCollections = false) {
@@ -254,13 +254,13 @@ class Share extends \OC\Share\Constants {
/**
* Get the items of item type shared with a user
- * @param string Item type
- * @param sting user id for which user we want the shares
- * @param int Format (optional) Format type must be defined by the backend
- * @param mixed Parameters (optional)
- * @param int Number of items to return (optional) Returns all by default
- * @param bool include collections (optional)
- * @return Return depends on format
+ * @param string $itemType
+ * @param string $user id for which user we want the shares
+ * @param int $format (optional) Format type must be defined by the backend
+ * @param mixed $parameters (optional)
+ * @param int $limit Number of items to return (optional) Returns all by default
+ * @param boolean $includeCollections (optional)
+ * @return mixed Return depends on format
*/
public static function getItemsSharedWithUser($itemType, $user, $format = self::FORMAT_NONE,
$parameters = null, $limit = -1, $includeCollections = false) {
@@ -273,9 +273,9 @@ class Share extends \OC\Share\Constants {
* @param string $itemType
* @param string $itemTarget
* @param int $format (optional) Format type must be defined by the backend
- * @param mixed Parameters (optional)
- * @param bool include collections (optional)
- * @return Return depends on format
+ * @param mixed $parameters (optional)
+ * @param boolean $includeCollections (optional)
+ * @return mixed Return depends on format
*/
public static function getItemSharedWith($itemType, $itemTarget, $format = self::FORMAT_NONE,
$parameters = null, $includeCollections = false) {
@@ -334,12 +334,12 @@ class Share extends \OC\Share\Constants {
/**
* Get the item of item type shared with the current user by source
- * @param string Item type
- * @param string Item source
- * @param int Format (optional) Format type must be defined by the backend
- * @param mixed Parameters
- * @param bool include collections
- * @return Return depends on format
+ * @param string $itemType
+ * @param string $itemSource
+ * @param int $format (optional) Format type must be defined by the backend
+ * @param mixed $parameters
+ * @param boolean $includeCollections
+ * @return mixed Return depends on format
*/
public static function getItemSharedWithBySource($itemType, $itemSource, $format = self::FORMAT_NONE,
$parameters = null, $includeCollections = false) {
@@ -349,10 +349,10 @@ class Share extends \OC\Share\Constants {
/**
* Get the item of item type shared by a link
- * @param string Item type
- * @param string Item source
- * @param string Owner of link
- * @return Item
+ * @param string $itemType
+ * @param string $itemSource
+ * @param string $uidOwner Owner of link
+ * @return array
*/
public static function getItemSharedWithByLink($itemType, $itemSource, $uidOwner) {
return self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null, $uidOwner, self::FORMAT_NONE,
@@ -362,7 +362,7 @@ class Share extends \OC\Share\Constants {
/**
* Based on the given token the share information will be returned - password protected shares will be verified
* @param string $token
- * @return array | bool false will be returned in case the token is unknown or unauthorized
+ * @return array|boolean false will be returned in case the token is unknown or unauthorized
*/
public static function getShareByToken($token, $checkPasswordProtection = true) {
$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `token` = ?', 1);
@@ -388,8 +388,8 @@ class Share extends \OC\Share\Constants {
/**
* resolves reshares down to the last real share
- * @param $linkItem
- * @return $fileOwner
+ * @param array $linkItem
+ * @return array file owner
*/
public static function resolveReShare($linkItem)
{
@@ -411,12 +411,12 @@ class Share extends \OC\Share\Constants {
/**
* Get the shared items of item type owned by the current user
- * @param string Item type
- * @param int Format (optional) Format type must be defined by the backend
- * @param mixed Parameters
- * @param int Number of items to return (optional) Returns all by default
- * @param bool include collections
- * @return Return depends on format
+ * @param string $itemType
+ * @param int $format (optional) Format type must be defined by the backend
+ * @param mixed $parameters
+ * @param int $limit Number of items to return (optional) Returns all by default
+ * @param boolean $includeCollections
+ * @return mixed Return depends on format
*/
public static function getItemsShared($itemType, $format = self::FORMAT_NONE, $parameters = null,
$limit = -1, $includeCollections = false) {
@@ -426,12 +426,12 @@ class Share extends \OC\Share\Constants {
/**
* Get the shared item of item type owned by the current user
- * @param string Item type
- * @param string Item source
- * @param int Format (optional) Format type must be defined by the backend
- * @param mixed Parameters
- * @param bool include collections
- * @return Return depends on format
+ * @param string $itemType
+ * @param string $itemSource
+ * @param int $format (optional) Format type must be defined by the backend
+ * @param mixed $parameters
+ * @param boolean $includeCollections
+ * @return mixed Return depends on format
*/
public static function getItemShared($itemType, $itemSource, $format = self::FORMAT_NONE,
$parameters = null, $includeCollections = false) {
@@ -441,12 +441,12 @@ class Share extends \OC\Share\Constants {
/**
* Get all users an item is shared with
- * @param string Item type
- * @param string Item source
- * @param string Owner
- * @param bool Include collections
- * @praram bool check expire date
- * @return Return array of users
+ * @param string $itemType
+ * @param string $itemSource
+ * @param string $uidOwner
+ * @param boolean $includeCollections
+ * @param boolean $checkExpireDate
+ * @return array Return array of users
*/
public static function getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections = false, $checkExpireDate = true) {
@@ -471,16 +471,12 @@ class Share extends \OC\Share\Constants {
* @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
* @param string $shareWith User or group the item is being shared with
* @param int $permissions CRUDS
- * @param null $itemSourceName
+ * @param string $itemSourceName
+ * @param \DateTime $expirationDate
+ * @return boolean|string Returns true on success or false on failure, Returns token on success for links
* @throws \Exception
- * @internal param \OCP\Item $string type
- * @internal param \OCP\Item $string source
- * @internal param \OCP\SHARE_TYPE_USER $int , SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
- * @internal param \OCP\User $string or group the item is being shared with
- * @internal param \OCP\CRUDS $int permissions
- * @return bool|string Returns true on success or false on failure, Returns token on success for links
*/
- public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName = null) {
+ public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName = null, \DateTime $expirationDate = null) {
$uidOwner = \OC_User::getUser();
$sharingPolicy = \OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global');
$l = \OC_L10N::get('lib');
@@ -489,16 +485,23 @@ class Share extends \OC\Share\Constants {
$itemSourceName = $itemSource;
}
-
- // verify that the file exists before we try to share it
+ // check if file can be shared
if ($itemType === 'file' or $itemType === 'folder') {
$path = \OC\Files\Filesystem::getPath($itemSource);
+ // verify that the file exists before we try to share it
if (!$path) {
$message = 'Sharing %s failed, because the file does not exist';
$message_t = $l->t('Sharing %s failed, because the file does not exist', array($itemSourceName));
\OC_Log::write('OCP\Share', sprintf($message, $itemSourceName), \OC_Log::ERROR);
throw new \Exception($message_t);
}
+ // verify that the user has share permission
+ if (!\OC\Files\Filesystem::isSharable($path)) {
+ $message = 'You are not allowed to share %s';
+ $message_t = $l->t('You are not allowed to share %s', array($itemSourceName));
+ \OC_Log::write('OCP\Share', sprintf($message, $itemSourceName), \OC_Log::ERROR);
+ throw new \Exception($message_t);
+ }
}
//verify that we don't share a folder which already contains a share mount point
@@ -588,7 +591,9 @@ class Share extends \OC\Share\Constants {
$shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner));
} else if ($shareType === self::SHARE_TYPE_LINK) {
if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') == 'yes') {
+
// when updating a link share
+ // FIXME Don't delete link if we update it
if ($checkExists = self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null,
$uidOwner, self::FORMAT_NONE, null, 1)) {
// remember old token
@@ -599,7 +604,7 @@ class Share extends \OC\Share\Constants {
}
// Generate hash of password - same method as user passwords
- if (isset($shareWith)) {
+ if (!empty($shareWith)) {
$forcePortable = (CRYPT_BLOWFISH != 1);
$hasher = new \PasswordHash(8, $forcePortable);
$shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));
@@ -611,6 +616,13 @@ class Share extends \OC\Share\Constants {
}
}
+ if (\OCP\Util::isPublicLinkPasswordRequired() && empty($shareWith)) {
+ $message = 'You need to provide a password to create a public link, only protected links are allowed';
+ $message_t = $l->t('You need to provide a password to create a public link, only protected links are allowed');
+ \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+ throw new \Exception($message_t);
+ }
+
// Generate token
if (isset($oldToken)) {
$token = $oldToken;
@@ -618,7 +630,7 @@ class Share extends \OC\Share\Constants {
$token = \OC_Util::generateRandomBytes(self::TOKEN_LENGTH);
}
$result = self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions,
- null, $token, $itemSourceName);
+ null, $token, $itemSourceName, $expirationDate);
if ($result) {
return $token;
} else {
@@ -637,17 +649,18 @@ class Share extends \OC\Share\Constants {
\OC_Log::write('OCP\Share', sprintf($message, $shareType, $itemSource), \OC_Log::ERROR);
throw new \Exception($message_t);
}
- // Put the item into the database
- return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, null, null, $itemSourceName);
+
+ // Put the item into the database
+ return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, null, null, $itemSourceName, $expirationDate);
}
/**
* Unshare an item from a user, group, or delete a private link
- * @param string Item type
- * @param string Item source
- * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
- * @param string User or group the item is being shared with
- * @return Returns true on success or false on failure
+ * @param string $itemType
+ * @param string $itemSource
+ * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+ * @param string $shareWith User or group the item is being shared with
+ * @return boolean true on success or false on failure
*/
public static function unshare($itemType, $itemSource, $shareType, $shareWith) {
$item = self::getItems($itemType, $itemSource, $shareType, $shareWith, \OC_User::getUser(),self::FORMAT_NONE, null, 1);
@@ -660,9 +673,9 @@ class Share extends \OC\Share\Constants {
/**
* Unshare an item from all users, groups, and remove all links
- * @param string Item type
- * @param string Item source
- * @return Returns true on success or false on failure
+ * @param string $itemType
+ * @param string $itemSource
+ * @return boolean true on success or false on failure
*/
public static function unshareAll($itemType, $itemSource) {
// Get all of the owners of shares of this item.
@@ -692,9 +705,9 @@ class Share extends \OC\Share\Constants {
/**
* Unshare an item shared with the current user
- * @param string Item type
- * @param string Item target
- * @return Returns true on success or false on failure
+ * @param string $itemType
+ * @param string $itemTarget
+ * @return boolean true on success or false on failure
*
* Unsharing from self is not allowed for items inside collections
*/
@@ -727,12 +740,13 @@ class Share extends \OC\Share\Constants {
}
return false;
}
+
/**
* sent status if users got informed by mail about share
* @param string $itemType
* @param string $itemSource
* @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
- * @param bool $status
+ * @param boolean $status
*/
public static function setSendMailStatus($itemType, $itemSource, $shareType, $status) {
$status = $status ? 1 : 0;
@@ -751,12 +765,12 @@ class Share extends \OC\Share\Constants {
/**
* Set the permissions of an item for a specific user or group
- * @param string Item type
- * @param string Item source
- * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
- * @param string User or group the item is being shared with
- * @param int CRUDS permissions
- * @return Returns true on success or false on failure
+ * @param string $itemType
+ * @param string $itemSource
+ * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+ * @param string $shareWith User or group the item is being shared with
+ * @param int $permissions CRUDS permissions
+ * @return boolean true on success or false on failure
*/
public static function setPermissions($itemType, $itemSource, $shareType, $shareWith, $permissions) {
$l = \OC_L10N::get('lib');
@@ -842,7 +856,7 @@ class Share extends \OC\Share\Constants {
* @param string $itemType
* @param string $itemSource
* @param string $date expiration date
- * @return \OCP\Share_Backend
+ * @return boolean
*/
public static function setExpirationDate($itemType, $itemSource, $date) {
$user = \OC_User::getUser();
@@ -873,20 +887,24 @@ class Share extends \OC\Share\Constants {
/**
* Checks whether a share has expired, calls unshareItem() if yes.
* @param array $item Share data (usually database row)
- * @return bool True if item was expired, false otherwise.
+ * @return boolean True if item was expired, false otherwise.
*/
protected static function expireItem(array $item) {
- // get default expire settings
- $defaultSettings = Helper::getDefaultExpireSetting();
// calculate expire date
if (!empty($item['expiration'])) {
$userDefinedExpire = new \DateTime($item['expiration']);
- $userDefinedExpireTimestamp = $userDefinedExpire->getTimestamp();
+ $expires = $userDefinedExpire->getTimestamp();
} else {
- $userDefinedExpireTimestamp = null;
+ $expires = null;
+ }
+
+ // only use default expire date for link shares
+ if((int)$item['share_type'] === self::SHARE_TYPE_LINK) {
+ // get default expire settings
+ $defaultSettings = Helper::getDefaultExpireSetting();
+ $expires = Helper::calculateExpireDate($defaultSettings, $item['stime'], $expires);
}
- $expires = Helper::calculateExpireDate($defaultSettings, $item['stime'], $userDefinedExpireTimestamp);
if (is_int($expires)) {
$now = time();
@@ -925,6 +943,7 @@ class Share extends \OC\Share\Constants {
/**
* Get the backend class for the specified item type
* @param string $itemType
+ * @throws \Exception
* @return \OCP\Share_Backend
*/
public static function getBackend($itemType) {
@@ -957,7 +976,7 @@ class Share extends \OC\Share\Constants {
/**
* Check if resharing is allowed
- * @return Returns true if allowed or false
+ * @return boolean true if allowed or false
*
* Resharing is allowed by default if not configured
*/
@@ -974,7 +993,7 @@ class Share extends \OC\Share\Constants {
/**
* Get a list of collection item types for the specified item type
- * @param string Item type
+ * @param string $itemType
* @return array
*/
private static function getCollectionItemTypes($itemType) {
@@ -998,17 +1017,17 @@ class Share extends \OC\Share\Constants {
/**
* Get shared items from the database
- * @param string Item type
- * @param string Item source or target (optional)
- * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, SHARE_TYPE_LINK, $shareTypeUserAndGroups, or $shareTypeGroupUserUnique
- * @param string User or group the item is being shared with
- * @param string User that is the owner of shared items (optional)
- * @param int Format to convert items to with formatItems()
- * @param mixed Parameters to pass to formatItems()
- * @param int Number of items to return, -1 to return all matches (optional)
- * @param bool Include collection item types (optional)
- * @param bool TODO (optional)
- * @prams bool check expire date
+ * @param string $itemType
+ * @param string $item Item source or target (optional)
+ * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, SHARE_TYPE_LINK, $shareTypeUserAndGroups, or $shareTypeGroupUserUnique
+ * @param string $shareWith User or group the item is being shared with
+ * @param string $uidOwner User that is the owner of shared items (optional)
+ * @param int $format Format to convert items to with formatItems() (optional)
+ * @param mixed $parameters to pass to formatItems() (optional)
+ * @param int $limit Number of items to return, -1 to return all matches (optional)
+ * @param boolean $includeCollections Include collection item types (optional)
+ * @param boolean $itemShareWithBySource (optional)
+ * @param boolean $checkExpireDate
* @return array
*
* See public functions getItem(s)... for parameter usage
@@ -1343,19 +1362,21 @@ class Share extends \OC\Share\Constants {
/**
* Put shared item into the database
- * @param string Item type
- * @param string Item source
- * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
- * @param string User or group the item is being shared with
- * @param string User that is the owner of shared item
- * @param int CRUDS permissions
- * @param bool|array Parent folder target (optional)
- * @param string token (optional)
- * @param string name of the source item (optional)
- * @return bool Returns true on success or false on failure
+ * @param string $itemType Item type
+ * @param string $itemSource Item source
+ * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+ * @param string $shareWith User or group the item is being shared with
+ * @param string $uidOwner User that is the owner of shared item
+ * @param int $permissions CRUDS permissions
+ * @param boolean|array $parentFolder Parent folder target (optional)
+ * @param string $token (optional)
+ * @param string $itemSourceName name of the source item (optional)
+ * @param \DateTime $expirationDate (optional)
+ * @throws \Exception
+ * @return boolean Returns true on success or false on failure
*/
private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
- $permissions, $parentFolder = null, $token = null, $itemSourceName = null) {
+ $permissions, $parentFolder = null, $token = null, $itemSourceName = null, \DateTime $expirationDate = null) {
$backend = self::getBackend($itemType);
$l = \OC_L10N::get('lib');
// Check if this is a reshare
@@ -1385,6 +1406,7 @@ class Share extends \OC\Share\Constants {
$suggestedItemTarget = $checkReshare['item_target'];
$suggestedFileTarget = $checkReshare['file_target'];
$filePath = $checkReshare['file_target'];
+ $expirationDate = min($expirationDate, $checkReshare['expiration']);
}
} else {
$message = 'Sharing %s failed, because resharing is not allowed';
@@ -1424,9 +1446,7 @@ class Share extends \OC\Share\Constants {
$fileSource = null;
}
}
- $query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`,'
- .' `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`,'
- .' `file_target`, `token`, `parent`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)');
+
// Share with a group
if ($shareType == self::SHARE_TYPE_GROUP) {
$groupItemTarget = Helper::generateTarget($itemType, $itemSource, $shareType, $shareWith['group'],
@@ -1442,6 +1462,7 @@ class Share extends \OC\Share\Constants {
'uidOwner' => $uidOwner,
'permissions' => $permissions,
'fileSource' => $fileSource,
+ 'expiration' => $expirationDate,
'token' => $token,
'run' => &$run,
'error' => &$error
@@ -1471,8 +1492,21 @@ class Share extends \OC\Share\Constants {
$groupFileTarget = null;
}
$queriesToExecute = array();
- $queriesToExecute['groupShare'] = array($itemType, $itemSource, $groupItemTarget, $shareType,
- $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget, $token, $parent);
+ $queriesToExecute['groupShare'] = array(
+ 'itemType' => $itemType,
+ 'itemSource' => $itemSource,
+ 'itemTarget' => $groupItemTarget,
+ 'shareType' => $shareType,
+ 'shareWith' => $shareWith['group'],
+ 'uidOwner' => $uidOwner,
+ 'permissions' => $permissions,
+ 'shareTime' => time(),
+ 'fileSource' => $fileSource,
+ 'fileTarget' => $groupFileTarget,
+ 'token' => $token,
+ 'parent' => $parent,
+ 'expiration' => $expirationDate,
+ );
// Loop through all users of this group in case we need to add an extra row
foreach ($shareWith['users'] as $uid) {
$itemTarget = Helper::generateTarget($itemType, $itemSource, self::SHARE_TYPE_USER, $uid,
@@ -1498,19 +1532,32 @@ class Share extends \OC\Share\Constants {
}
// Insert an extra row for the group share if the item or file target is unique for this user
if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
- $queriesToExecute[] = array($itemType, $itemSource, $itemTarget,
- self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(),
- $fileSource, $fileTarget, $token);
- $id = \OC_DB::insertid('*PREFIX*share');
+ $queriesToExecute[] = array(
+ 'itemType' => $itemType,
+ 'itemSource' => $itemSource,
+ 'itemTarget' => $itemTarget,
+ 'shareType' => self::$shareTypeGroupUserUnique,
+ 'shareWith' => $uid,
+ 'uidOwner' => $uidOwner,
+ 'permissions' => $permissions,
+ 'shareTime' => time(),
+ 'fileSource' => $fileSource,
+ 'fileTarget' => $fileTarget,
+ 'token' => $token,
+ //'parent' => $parent,
+ 'expiration' => $expirationDate,
+ );
}
}
- $query->execute($queriesToExecute['groupShare']);
+
+ self::insertShare($queriesToExecute['groupShare']);
// Save this id, any extra rows for this group share will need to reference it
$parent = \OC_DB::insertid('*PREFIX*share');
unset($queriesToExecute['groupShare']);
- foreach ($queriesToExecute as $qe) {
- $qe[] = $parent;
- $query->execute($qe);
+
+ foreach ($queriesToExecute as $shareQuery) {
+ $shareQuery['parent'] = $parent;
+ self::insertShare($shareQuery);
}
\OC_Hook::emit('OCP\Share', 'post_shared', array(
@@ -1525,7 +1572,8 @@ class Share extends \OC\Share\Constants {
'fileSource' => $fileSource,
'fileTarget' => $groupFileTarget,
'id' => $parent,
- 'token' => $token
+ 'token' => $token,
+ 'expirationDate' => $expirationDate,
));
if ($parentFolder === true) {
@@ -1547,8 +1595,9 @@ class Share extends \OC\Share\Constants {
'permissions' => $permissions,
'fileSource' => $fileSource,
'token' => $token,
+ 'expirationDate' => $expirationDate,
'run' => &$run,
- 'error' => &$error
+ 'error' => &$error,
));
if ($run === false) {
@@ -1572,8 +1621,23 @@ class Share extends \OC\Share\Constants {
} else {
$fileTarget = null;
}
- $query->execute(array($itemType, $itemSource, $itemTarget, $shareType, $shareWith, $uidOwner,
- $permissions, time(), $fileSource, $fileTarget, $token, $parent));
+
+ self::insertShare(array(
+ 'itemType' => $itemType,
+ 'itemSource' => $itemSource,
+ 'itemTarget' => $itemTarget,
+ 'shareType' => $shareType,
+ 'shareWith' => $shareWith,
+ 'uidOwner' => $uidOwner,
+ 'permissions' => $permissions,
+ 'shareTime' => time(),
+ 'fileSource' => $fileSource,
+ 'fileTarget' => $fileTarget,
+ 'token' => $token,
+ 'parent' => $parent,
+ 'expiration' => $expirationDate,
+ ));
+
$id = \OC_DB::insertid('*PREFIX*share');
\OC_Hook::emit('OCP\Share', 'post_shared', array(
'itemType' => $itemType,
@@ -1587,7 +1651,8 @@ class Share extends \OC\Share\Constants {
'fileSource' => $fileSource,
'fileTarget' => $fileTarget,
'id' => $id,
- 'token' => $token
+ 'token' => $token,
+ 'expirationDate' => $expirationDate,
));
if ($parentFolder === true) {
$parentFolders['id'] = $id;
@@ -1598,6 +1663,27 @@ class Share extends \OC\Share\Constants {
return true;
}
+ private static function insertShare(array $shareData)
+ {
+ $query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` ('
+ .' `item_type`, `item_source`, `item_target`, `share_type`,'
+ .' `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`,'
+ .' `file_target`, `token`, `parent`, `expiration`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)');
+ $query->bindValue(1, $shareData['itemType']);
+ $query->bindValue(2, $shareData['itemSource']);
+ $query->bindValue(3, $shareData['itemTarget']);
+ $query->bindValue(4, $shareData['shareType']);
+ $query->bindValue(5, $shareData['shareWith']);
+ $query->bindValue(6, $shareData['uidOwner']);
+ $query->bindValue(7, $shareData['permissions']);
+ $query->bindValue(8, $shareData['shareTime']);
+ $query->bindValue(9, $shareData['fileSource']);
+ $query->bindValue(10, $shareData['fileTarget']);
+ $query->bindValue(11, $shareData['token']);
+ $query->bindValue(12, $shareData['parent']);
+ $query->bindValue(13, $shareData['expiration'], 'datetime');
+ $query->execute();
+ }
/**
* Delete all shares with type SHARE_TYPE_LINK
*/
@@ -1614,7 +1700,7 @@ class Share extends \OC\Share\Constants {
* In case a password protected link is not yet authenticated this function will return false
*
* @param array $linkItem
- * @return bool
+ * @return boolean
*/
public static function checkPasswordProtectedShare(array $linkItem) {
if (!isset($linkItem['share_with'])) {
@@ -1640,9 +1726,9 @@ class Share extends \OC\Share\Constants {
}
/**
- * @breif construct select statement
+ * construct select statement
* @param int $format
- * @param bool $fileDependent ist it a file/folder share or a generla share
+ * @param boolean $fileDependent ist it a file/folder share or a generla share
* @param string $uidOwner
* @return string select statement
*/
@@ -1684,7 +1770,7 @@ class Share extends \OC\Share\Constants {
/**
- * @brief transform db results
+ * transform db results
* @param array $row result
*/
private static function transformDBResults(&$row) {
@@ -1715,13 +1801,13 @@ class Share extends \OC\Share\Constants {
}
/**
- * @brief format result
+ * format result
* @param array $items result
- * @prams string $column is it a file share or a general share ('file_target' or 'item_target')
- * @params \OCP\Share_Backend $backend sharing backend
+ * @param string $column is it a file share or a general share ('file_target' or 'item_target')
+ * @param \OCP\Share_Backend $backend sharing backend
* @param int $format
- * @param array additional format parameters
- * @return array formate result
+ * @param array $parameters additional format parameters
+ * @return array format result
*/
private static function formatResult($items, $column, $backend, $format = self::FORMAT_NONE , $parameters = null) {
if ($format === self::FORMAT_NONE) {
diff --git a/lib/private/subadmin.php b/lib/private/subadmin.php
index 5b6072987ad54eb459f2beafd2b92f33a9942c57..f5ef00ce4fedc93d9e39fad0bb5670d082b77b27 100644
--- a/lib/private/subadmin.php
+++ b/lib/private/subadmin.php
@@ -31,7 +31,7 @@ OC_Hook::connect('OC_User', 'post_deleteGroup', 'OC_SubAdmin', 'post_deleteGroup
class OC_SubAdmin{
/**
- * @brief add a SubAdmin
+ * add a SubAdmin
* @param string $uid uid of the SubAdmin
* @param string $gid gid of the group
* @return boolean
@@ -44,7 +44,7 @@ class OC_SubAdmin{
}
/**
- * @brief delete a SubAdmin
+ * delete a SubAdmin
* @param string $uid uid of the SubAdmin
* @param string $gid gid of the group
* @return boolean
@@ -57,7 +57,7 @@ class OC_SubAdmin{
}
/**
- * @brief get groups of a SubAdmin
+ * get groups of a SubAdmin
* @param string $uid uid of the SubAdmin
* @return array
*/
@@ -72,7 +72,7 @@ class OC_SubAdmin{
}
/**
- * @brief get SubAdmins of a group
+ * get SubAdmins of a group
* @param string $gid gid of the group
* @return array
*/
@@ -87,7 +87,7 @@ class OC_SubAdmin{
}
/**
- * @brief get all SubAdmins
+ * get all SubAdmins
* @return array
*/
public static function getAllSubAdmins() {
@@ -101,7 +101,7 @@ class OC_SubAdmin{
}
/**
- * @brief checks if a user is a SubAdmin of a group
+ * checks if a user is a SubAdmin of a group
* @param string $uid uid of the subadmin
* @param string $gid gid of the group
* @return bool
@@ -117,7 +117,7 @@ class OC_SubAdmin{
}
/**
- * @brief checks if a user is a SubAdmin
+ * checks if a user is a SubAdmin
* @param string $uid uid of the subadmin
* @return bool
*/
@@ -137,7 +137,7 @@ class OC_SubAdmin{
}
/**
- * @brief checks if a user is a accessible by a subadmin
+ * checks if a user is a accessible by a subadmin
* @param string $subadmin uid of the subadmin
* @param string $user uid of the user
* @return bool
@@ -159,15 +159,15 @@ class OC_SubAdmin{
}
/*
- * @brief alias for self::isSubAdminofGroup()
+ * alias for self::isSubAdminofGroup()
*/
public static function isGroupAccessible($subadmin, $group) {
return self::isSubAdminofGroup($subadmin, $group);
}
/**
- * @brief delete all SubAdmins by uid
- * @param $parameters
+ * delete all SubAdmins by uid
+ * @param array $parameters
* @return boolean
*/
public static function post_deleteUser($parameters) {
@@ -177,8 +177,8 @@ class OC_SubAdmin{
}
/**
- * @brief delete all SubAdmins by gid
- * @param $parameters
+ * delete all SubAdmins by gid
+ * @param array $parameters
* @return boolean
*/
public static function post_deleteGroup($parameters) {
diff --git a/lib/private/tags.php b/lib/private/tags.php
index 06550068f768242c20add26a2d1fa13c9062f4e9..0b62caf2dd89102d280228878b9d9e3fc4bb7481 100644
--- a/lib/private/tags.php
+++ b/lib/private/tags.php
@@ -121,21 +121,7 @@ class Tags implements \OCP\ITags {
* @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;
- }
+ return count($this->tags) === 0;
}
/**
@@ -184,6 +170,10 @@ class Tags implements \OCP\ITags {
$tagId = $tag;
} elseif(is_string($tag)) {
$tag = trim($tag);
+ if($tag === '') {
+ \OCP\Util::writeLog('core', __METHOD__.', Cannot use empty tag names', \OCP\Util::DEBUG);
+ return false;
+ }
$tagId = $this->array_searchi($tag, $this->tags);
}
@@ -234,11 +224,15 @@ class Tags implements \OCP\ITags {
* Add a new tag.
*
* @param string $name A string with a name of the tag
- * @return false|string the id of the added tag or false if it already exists.
+ * @return false|string the id of the added tag or false on error.
*/
public function add($name) {
$name = trim($name);
+ if($name === '') {
+ \OCP\Util::writeLog('core', __METHOD__.', Cannot add an empty tag', \OCP\Util::DEBUG);
+ return false;
+ }
if($this->hasTag($name)) {
\OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', \OCP\Util::DEBUG);
return false;
@@ -280,6 +274,12 @@ class Tags implements \OCP\ITags {
public function rename($from, $to) {
$from = trim($from);
$to = trim($to);
+
+ if($to === '' || $from === '') {
+ \OCP\Util::writeLog('core', __METHOD__.', Cannot use empty tag names', \OCP\Util::DEBUG);
+ return false;
+ }
+
$id = $this->array_searchi($from, $this->tags);
if($id === false) {
\OCP\Util::writeLog('core', __METHOD__.', tag: ' . $from. ' does not exist', \OCP\Util::DEBUG);
@@ -318,6 +318,8 @@ class Tags implements \OCP\ITags {
$names = array($names);
}
$names = array_map('trim', $names);
+ array_filter($names);
+
$newones = array();
foreach($names as $name) {
if(($this->in_arrayi(
@@ -391,7 +393,7 @@ class Tags implements \OCP\ITags {
*
* For hooking up on post_deleteUser
*
- * @param array
+ * @param array $arguments
*/
public static function post_deleteUser($arguments) {
// Find all objectid/tagId pairs.
@@ -492,9 +494,9 @@ class Tags implements \OCP\ITags {
*/
public function addToFavorites($objid) {
if(!$this->hasTag(self::TAG_FAVORITE)) {
- $this->add(self::TAG_FAVORITE, true);
+ $this->add(self::TAG_FAVORITE);
}
- return $this->tagAs($objid, self::TAG_FAVORITE, $this->type);
+ return $this->tagAs($objid, self::TAG_FAVORITE);
}
/**
@@ -504,7 +506,7 @@ class Tags implements \OCP\ITags {
* @return boolean
*/
public function removeFromFavorites($objid) {
- return $this->unTag($objid, self::TAG_FAVORITE, $this->type);
+ return $this->unTag($objid, self::TAG_FAVORITE);
}
/**
@@ -512,13 +514,17 @@ class Tags implements \OCP\ITags {
*
* @param int $objid The id of the object
* @param string $tag The id or name of the tag
- * @return boolean Returns false on database error.
+ * @return boolean Returns false on error.
*/
public function tagAs($objid, $tag) {
if(is_string($tag) && !is_numeric($tag)) {
$tag = trim($tag);
+ if($tag === '') {
+ \OCP\Util::writeLog('core', __METHOD__.', Cannot add an empty tag', \OCP\Util::DEBUG);
+ return false;
+ }
if(!$this->hasTag($tag)) {
- $this->add($tag, true);
+ $this->add($tag);
}
$tagId = $this->array_searchi($tag, $this->tags);
} else {
@@ -549,6 +555,10 @@ class Tags implements \OCP\ITags {
public function unTag($objid, $tag) {
if(is_string($tag) && !is_numeric($tag)) {
$tag = trim($tag);
+ if($tag === '') {
+ \OCP\Util::writeLog('core', __METHOD__.', Tag name is empty', \OCP\Util::DEBUG);
+ return false;
+ }
$tagId = $this->array_searchi($tag, $this->tags);
} else {
$tagId = $tag;
@@ -579,6 +589,7 @@ class Tags implements \OCP\ITags {
}
$names = array_map('trim', $names);
+ array_filter($names);
\OCP\Util::writeLog('core', __METHOD__ . ', before: '
. print_r($this->tags, true), \OCP\Util::DEBUG);
diff --git a/lib/private/template.php b/lib/private/template.php
index 3d18b52bac905ff0e9ae5ad7255d6758b19a51e6..eaa58b769d7af6adaf895a3ac6dd910b2cb6553b 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -30,9 +30,10 @@ class OC_Template extends \OC\Template\Base {
private $renderas; // Create a full page?
private $path; // The path to the template
private $headers=array(); //custom headers
+ protected $app; // app id
/**
- * @brief Constructor
+ * Constructor
* @param string $app app providing the template
* @param string $name of the template file (without suffix)
* @param string $renderas = ""; produce a full page
@@ -62,6 +63,7 @@ class OC_Template extends \OC\Template\Base {
// Set the private data
$this->renderas = $renderas;
$this->path = $path;
+ $this->app = $app;
parent::__construct($template, $requesttoken, $l10n, $themeDefaults);
}
@@ -95,7 +97,7 @@ class OC_Template extends \OC\Template\Base {
}
/**
- * @brief Returns the formfactor extension for current formfactor
+ * Returns the formfactor extension for current formfactor
*/
static public function getFormFactorExtension()
{
@@ -128,7 +130,7 @@ class OC_Template extends \OC\Template\Base {
}
/**
- * @brief find the template with the given name
+ * find the template with the given name
* @param string $name of the template file (without suffix)
*
* Will select the template file for the selected theme and formfactor.
@@ -152,7 +154,7 @@ class OC_Template extends \OC\Template\Base {
}
/**
- * @brief Add a custom element to the header
+ * Add a custom element to the header
* @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
@@ -162,7 +164,7 @@ class OC_Template extends \OC\Template\Base {
}
/**
- * @brief Process the template
+ * Process the template
* @return boolean|string
*
* This function process the template. If $this->renderas is set, it
@@ -172,7 +174,7 @@ class OC_Template extends \OC\Template\Base {
$data = parent::fetchPage();
if( $this->renderas ) {
- $page = new OC_TemplateLayout($this->renderas);
+ $page = new OC_TemplateLayout($this->renderas, $this->app);
// Add custom headers
$page->assign('headers', $this->headers, false);
@@ -189,7 +191,7 @@ class OC_Template extends \OC\Template\Base {
}
/**
- * @brief Include template
+ * Include template
* @return string returns content of included template
*
* Includes another template. use <?php echo $this->inc('template'); ?> to
@@ -200,7 +202,7 @@ class OC_Template extends \OC\Template\Base {
}
/**
- * @brief Shortcut to print a simple page for users
+ * Shortcut to print a simple page for users
* @param string $application The application we render the template for
* @param string $name Name of the template
* @param array $parameters Parameters for the template
@@ -215,7 +217,7 @@ class OC_Template extends \OC\Template\Base {
}
/**
- * @brief Shortcut to print a simple page for admins
+ * Shortcut to print a simple page for admins
* @param string $application The application we render the template for
* @param string $name Name of the template
* @param array $parameters Parameters for the template
@@ -230,7 +232,7 @@ class OC_Template extends \OC\Template\Base {
}
/**
- * @brief Shortcut to print a simple page for guests
+ * Shortcut to print a simple page for guests
* @param string $application The application we render the template for
* @param string $name Name of the template
* @param array|string $parameters Parameters for the template
@@ -245,7 +247,7 @@ class OC_Template extends \OC\Template\Base {
}
/**
- * @brief Print a fatal error page and terminates the script
+ * Print a fatal error page and terminates the script
* @param string $error_msg The error message to show
* @param string $hint An optional hint message
* Warning: All data passed to $hint needs to get sanitized using OC_Util::sanitizeHTML
@@ -257,7 +259,7 @@ class OC_Template extends \OC\Template\Base {
$content->printPage();
die();
}
-
+
/**
* print error page using Exception details
* @param Exception $exception
diff --git a/lib/private/template/base.php b/lib/private/template/base.php
index 3d7c685c1cf5ce60c6d803b2d2adbe9744e53ea0..dbdfce24324e6da6101c3d3ed971bb3062b80688 100644
--- a/lib/private/template/base.php
+++ b/lib/private/template/base.php
@@ -59,7 +59,7 @@ class Base {
}
/**
- * @brief Assign variables
+ * Assign variables
* @param string $key key
* @param array|bool|integer|string $value value
* @return bool
@@ -75,7 +75,7 @@ class Base {
}
/**
- * @brief Appends a variable
+ * Appends a variable
* @param string $key key
* @param mixed $value value
* @return boolean|null
@@ -94,7 +94,7 @@ class Base {
}
/**
- * @brief Prints the proceeded template
+ * Prints the proceeded template
* @return bool
*
* This function proceeds the template and prints its output.
@@ -111,7 +111,7 @@ class Base {
}
/**
- * @brief Process the template
+ * Process the template
* @return string
*
* This function processes the template.
@@ -121,7 +121,7 @@ class Base {
}
/**
- * @brief doing the actual work
+ * doing the actual work
* @param string $file
* @return string content
*
diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php
index 3c42d441efacb2944aadd8778baecfeb597cacb1..46e48274001ac45662312e10b1a5cbf14e745cbd 100644
--- a/lib/private/template/functions.php
+++ b/lib/private/template/functions.php
@@ -24,7 +24,7 @@ function print_unescaped($string) {
}
/**
- * @brief make OC_Helper::linkTo available as a simple function
+ * make OC_Helper::linkTo available as a simple function
* @param string $app app
* @param string $file file
* @param array $args array with param=>value, will be appended to the returned url
@@ -45,7 +45,7 @@ function link_to_docs($key) {
}
/**
- * @brief make OC_Helper::imagePath available as a simple function
+ * make OC_Helper::imagePath available as a simple function
* @param string $app app
* @param string $image image
* @return string link to the image
@@ -57,7 +57,7 @@ function image_path( $app, $image ) {
}
/**
- * @brief make OC_Helper::mimetypeIcon available as a simple function
+ * make OC_Helper::mimetypeIcon available as a simple function
* @param string $mimetype mimetype
* @return string link to the image
*
@@ -68,10 +68,10 @@ function mimetype_icon( $mimetype ) {
}
/**
- * @brief make preview_icon available as a simple function
+ * 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
+ * @param string $path path of file
+ * @return link to the preview
*
* For further information have a look at OC_Helper::previewIcon
*/
@@ -87,7 +87,7 @@ function publicPreview_icon ( $path, $token ) {
}
/**
- * @brief make OC_Helper::humanFileSize available as a simple function
+ * make OC_Helper::humanFileSize available as a simple function
* @param int $bytes size in bytes
* @return string size as string
*
@@ -98,7 +98,7 @@ function human_file_size( $bytes ) {
}
/**
- * @brief Strips the timestamp of its time value
+ * Strips the timestamp of its time value
* @param int $timestamp UNIX timestamp to strip
* @return $timestamp without time value
*/
@@ -109,7 +109,7 @@ function strip_time($timestamp){
}
/**
- * @brief Formats timestamp relatively to the current time using
+ * Formats timestamp relatively to the current time using
* a human-friendly format like "x minutes ago" or "yesterday"
* @param int $timestamp timestamp to format
* @param int $fromTime timestamp to compare from, defaults to current time
diff --git a/lib/private/template/resourcelocator.php b/lib/private/template/resourcelocator.php
index 8a3dd5e7fa90e5c0ed47f3e08634fa4062362ddf..7976c4159222fbcedbdb337ace412f5bd070edbb 100644
--- a/lib/private/template/resourcelocator.php
+++ b/lib/private/template/resourcelocator.php
@@ -52,14 +52,10 @@ abstract class ResourceLocator {
}
/*
- * @brief append the $file resource if exist at $root
- * @param $root path to check
- * @param $file the filename
- * @param $web base for path, default map $root to $webroot
- */
- /**
- * @param string $file
- * @param string|false $webroot
+ * append the $file resource if exist at $root
+ * @param string $root path to check
+ * @param string $file the filename
+ * @param string|null $webroot base for path, default map $root to $webroot
*/
protected function appendIfExist($root, $file, $webroot = null) {
if (is_file($root.'/'.$file)) {
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index b7ac02a753d27f06474f48b1bad475f678d57890..a5dd9a0c614af5de8e497d7c4517aa30bd33acff 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -15,8 +15,9 @@ class OC_TemplateLayout extends OC_Template {
/**
* @param string $renderas
+ * @param string $appid application id
*/
- public function __construct( $renderas ) {
+ public function __construct( $renderas, $appid = '' ) {
// Decide which page we show
if( $renderas == 'user' ) {
@@ -43,6 +44,7 @@ class OC_TemplateLayout extends OC_Template {
// Add navigation entry
$this->assign( 'application', '', false );
+ $this->assign( 'appid', $appid );
$navigation = OC_App::getNavigation();
$this->assign( 'navigation', $navigation);
$this->assign( 'settingsnavigation', OC_App::getSettingsNavigation());
@@ -98,7 +100,7 @@ class OC_TemplateLayout extends OC_Template {
}
/**
- * @param $styles
+ * @param array $styles
* @return array
*/
static public function findStylesheetFiles($styles) {
@@ -116,7 +118,7 @@ class OC_TemplateLayout extends OC_Template {
}
/**
- * @param $scripts
+ * @param array $scripts
* @return array
*/
static public function findJavascriptFiles($scripts) {
@@ -175,7 +177,7 @@ class OC_TemplateLayout extends OC_Template {
}
/**
- * @param $files
+ * @param array $files
* @return string
*/
private static function hashScriptNames($files)
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 7b09f58017615a2e0bb13df251152bb52adc782c..58d3cab73aa0a0e8ce65a4d9e5944d34a5fd76fc 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -35,7 +35,7 @@ class Updater extends BasicEmitter {
/**
* Check if a new version is available
* @param string $updaterUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php'
- * @return array | bool
+ * @return array|bool
*/
public function check($updaterUrl) {
@@ -134,7 +134,10 @@ class Updater extends BasicEmitter {
$this->emit('\OC\Updater', 'failure', array($exception->getMessage()));
}
\OC_Config::setValue('version', implode('.', \OC_Util::getVersion()));
- \OC_App::checkAppsRequirements();
+ $disabledApps = \OC_App::checkAppsRequirements();
+ if (!empty($disabledApps)) {
+ $this->emit('\OC\Updater', 'disabledApps', array($disabledApps));
+ }
// load all apps to also upgrade enabled apps
\OC_App::loadApps();
diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php
index a56b0fe3378040d3cc618d66e0cb862e042ed3e6..af5d977eeabb2709821d2074a64076cdb137c186 100644
--- a/lib/private/urlgenerator.php
+++ b/lib/private/urlgenerator.php
@@ -29,8 +29,8 @@ class URLGenerator implements IURLGenerator {
}
/**
- * @brief Creates an url using a defined route
- * @param $route
+ * Creates an url using a defined route
+ * @param string $route
* @param array $parameters
* @internal param array $args with param=>value, will be appended to the returned url
* @return string the url
@@ -43,7 +43,7 @@ class URLGenerator implements IURLGenerator {
}
/**
- * @brief Creates an url
+ * Creates an url
* @param string $app app
* @param string $file file
* @param array $args array with param=>value, will be appended to the returned url
@@ -92,7 +92,7 @@ class URLGenerator implements IURLGenerator {
}
/**
- * @brief Creates path to an image
+ * Creates path to an image
* @param string $app app
* @param string $image image name
* @throws \RuntimeException If the image does not exist
diff --git a/lib/private/user.php b/lib/private/user.php
index 7106d664aca74a672f4bfe4829a5b5da75f4b65b..5d3ebb57c8c42a8de9481497db40d43d65e71b6c 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -62,7 +62,7 @@ class OC_User {
private static $incognitoMode = false;
/**
- * @brief registers backend
+ * registers backend
* @param string $backend name of the backend
* @deprecated Add classes by calling useBackend with a class instance instead
* @return bool
@@ -75,9 +75,9 @@ class OC_User {
}
/**
- * @brief gets available backends
+ * gets available backends
* @deprecated
- * @returns array of backends
+ * @return array an array of backends
*
* Returns the names of all backends.
*/
@@ -86,9 +86,9 @@ class OC_User {
}
/**
- * @brief gets used backends
+ * gets used backends
* @deprecated
- * @returns array of backends
+ * @return array an array of backends
*
* Returns the names of all used backends.
*/
@@ -97,8 +97,8 @@ class OC_User {
}
/**
- * @brief Adds the backend to the list of used backends
- * @param string | OC_User_Backend $backend default: database The backend to use for user management
+ * Adds the backend to the list of used backends
+ * @param string|OC_User_Interface $backend default: database The backend to use for user management
* @return bool
*
* Set the User Authentication Module
@@ -169,7 +169,7 @@ class OC_User {
}
/**
- * @brief Create a new user
+ * Create a new user
* @param string $uid The username of the user to create
* @param string $password The password of the new user
* @throws Exception
@@ -185,7 +185,7 @@ class OC_User {
}
/**
- * @brief delete a user
+ * delete a user
* @param string $uid The username of the user to delete
* @return bool
*
@@ -223,7 +223,7 @@ class OC_User {
}
/**
- * @brief Try to login a user
+ * Try to login a user
* @param string $uid The username of the user to log in
* @param string $password The password of the user
* @return boolean|null
@@ -236,7 +236,18 @@ class OC_User {
}
/**
- * @brief Try to login a user, assuming authentication
+ * Try to login a user using the magic cookie (remember login)
+ *
+ * @param string $uid The username of the user to log in
+ * @param string $token
+ * @return bool
+ */
+ public static function loginWithCookie($uid, $token) {
+ return self::getUserSession()->loginWithCookie($uid, $token);
+ }
+
+ /**
+ * Try to login a user, assuming authentication
* has already happened (e.g. via Single Sign On).
*
* Log in a user and regenerate a new session.
@@ -262,7 +273,7 @@ class OC_User {
}
/**
- * @brief Verify with Apache whether user is authenticated.
+ * Verify with Apache whether user is authenticated.
*
* @return boolean|null
* true: authenticated
@@ -286,14 +297,14 @@ class OC_User {
/**
- * @brief Sets user id for session and triggers emit
+ * Sets user id for session and triggers emit
*/
public static function setUserId($uid) {
OC::$session->set('user_id', $uid);
}
/**
- * @brief Sets user display name for session
+ * Sets user display name for session
* @param string $uid
* @param null $displayName
* @return bool Whether the display name could get set
@@ -311,7 +322,7 @@ class OC_User {
}
/**
- * @brief Logs the current user out and kills all the session data
+ * Logs the current user out and kills all the session data
*
* Logout, destroys session
*/
@@ -320,8 +331,8 @@ class OC_User {
}
/**
- * @brief Check if the user is logged in
- * @returns bool
+ * Check if the user is logged in
+ * @return bool
*
* Checks if the user is logged in
*/
@@ -333,7 +344,7 @@ class OC_User {
}
/**
- * @brief set incognito mode, e.g. if a user wants to open a public link
+ * set incognito mode, e.g. if a user wants to open a public link
* @param bool $status
*/
public static function setIncognitoMode($status) {
@@ -358,7 +369,7 @@ class OC_User {
}
/**
- * @brief Check if the user is an admin user
+ * Check if the user is an admin user
* @param string $uid uid of the admin
* @return bool
*/
@@ -371,7 +382,7 @@ class OC_User {
/**
- * @brief get the user id of the user currently logged in.
+ * get the user id of the user currently logged in.
* @return string uid or false
*/
public static function getUser() {
@@ -384,7 +395,7 @@ class OC_User {
}
/**
- * @brief get the display name of the user currently logged in.
+ * get the display name of the user currently logged in.
* @param string $uid
* @return string uid or false
*/
@@ -407,7 +418,7 @@ class OC_User {
}
/**
- * @brief Autogenerate a password
+ * Autogenerate a password
* @return string
*
* generates a password
@@ -417,7 +428,7 @@ class OC_User {
}
/**
- * @brief Set password
+ * Set password
* @param string $uid The username
* @param string $password The new password
* @param string $recoveryPassword for the encryption app to reset encryption keys
@@ -435,7 +446,7 @@ class OC_User {
}
/**
- * @brief Check whether user can change his avatar
+ * Check whether user can change his avatar
* @param string $uid The username
* @return bool
*
@@ -451,7 +462,7 @@ class OC_User {
}
/**
- * @brief Check whether user can change his password
+ * Check whether user can change his password
* @param string $uid The username
* @return bool
*
@@ -467,7 +478,7 @@ class OC_User {
}
/**
- * @brief Check whether user can change his display name
+ * Check whether user can change his display name
* @param string $uid The username
* @return bool
*
@@ -483,7 +494,7 @@ class OC_User {
}
/**
- * @brief Check if the password is correct
+ * Check if the password is correct
* @param string $uid The username
* @param string $password The password
* @return string|false user id a string on success, false otherwise
@@ -516,8 +527,8 @@ class OC_User {
}
/**
- * @brief Get a list of all users
- * @returns array with all uids
+ * Get a list of all users
+ * @return array an array of all uids
*
* Get a list of all users.
* @param string $search
@@ -534,7 +545,7 @@ class OC_User {
}
/**
- * @brief Get a list of all users display name
+ * Get a list of all users display name
* @param string $search
* @param int $limit
* @param int $offset
@@ -552,7 +563,7 @@ class OC_User {
}
/**
- * @brief check if a user exists
+ * check if a user exists
* @param string $uid the username
* @return boolean
*/
@@ -600,7 +611,7 @@ class OC_User {
}
/**
- * @brief Set cookie value to use in next page load
+ * Set cookie value to use in next page load
* @param string $username username to be set
* @param string $token
*/
@@ -609,14 +620,14 @@ class OC_User {
}
/**
- * @brief Remove cookie for "remember username"
+ * Remove cookie for "remember username"
*/
public static function unsetMagicInCookie() {
self::getUserSession()->unsetMagicInCookie();
}
/**
- * @brief Returns the first active backend from self::$_usedBackends.
+ * Returns the first active backend from self::$_usedBackends.
* @return OCP\Authentication\IApacheBackend|null if no backend active, otherwise OCP\Authentication\IApacheBackend
*/
private static function findFirstActiveUsedBackend() {
diff --git a/lib/private/user/backend.php b/lib/private/user/backend.php
index f4e5618e04ad11c93dff1e626596cc1fd3d900bb..56c63085f187de2a332e09d8fbdf0e7ea4d4ec0f 100644
--- a/lib/private/user/backend.php
+++ b/lib/private/user/backend.php
@@ -61,7 +61,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
);
/**
- * @brief Get all supported actions
+ * Get all supported actions
* @return int bitwise-or'ed actions
*
* Returns the supported actions as int to be
@@ -79,7 +79,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
}
/**
- * @brief Check if backend implements actions
+ * Check if backend implements actions
* @param int $actions bitwise-or'ed actions
* @return boolean
*
@@ -91,7 +91,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
}
/**
- * @brief delete a user
+ * delete a user
* @param string $uid The username of the user to delete
* @return bool
*
@@ -102,8 +102,8 @@ abstract class OC_User_Backend implements OC_User_Interface {
}
/**
- * @brief Get a list of all users
- * @returns array with all uids
+ * Get a list of all users
+ * @return array an array of all uids
*
* Get a list of all users.
*/
@@ -112,7 +112,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
}
/**
- * @brief check if a user exists
+ * check if a user exists
* @param string $uid the username
* @return boolean
*/
@@ -121,7 +121,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
}
/**
- * @brief get the user's home directory
+ * get the user's home directory
* @param string $uid the username
* @return boolean
*/
@@ -130,7 +130,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
}
/**
- * @brief get display name of the user
+ * get display name of the user
* @param string $uid user ID of the user
* @return string display name
*/
@@ -139,8 +139,8 @@ abstract class OC_User_Backend implements OC_User_Interface {
}
/**
- * @brief Get a list of all display names
- * @returns array with all displayNames (value) and the corresponding uids (key)
+ * Get a list of all display names
+ * @return array an array of all displayNames (value) and the corresponding uids (key)
*
* Get a list of all display names and user ids.
*/
@@ -154,7 +154,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
}
/**
- * @brief Check if a user list is available or not
+ * Check if a user list is available or not
* @return boolean if users can be listed or not
*/
public function hasUserListings() {
diff --git a/lib/private/user/database.php b/lib/private/user/database.php
index 681f03981f5a97435a8f44014a5523c93a88768e..d9263f6b5de3cbee59ce4d8e0c27f199aface482 100644
--- a/lib/private/user/database.php
+++ b/lib/private/user/database.php
@@ -56,10 +56,10 @@ class OC_User_Database extends OC_User_Backend {
}
/**
- * @brief Create a new user
- * @param $uid The username of the user to create
- * @param $password The password of the new user
- * @returns true/false
+ * Create a new user
+ * @param string $uid The username of the user to create
+ * @param string $password The password of the new user
+ * @return bool
*
* Creates a new user. Basic checking of username is done in OC_User
* itself, not in its subclasses.
@@ -78,9 +78,9 @@ class OC_User_Database extends OC_User_Backend {
}
/**
- * @brief delete a user
- * @param $uid The username of the user to delete
- * @returns true/false
+ * delete a user
+ * @param string $uid The username of the user to delete
+ * @return bool
*
* Deletes a user
*/
@@ -97,10 +97,10 @@ class OC_User_Database extends OC_User_Backend {
}
/**
- * @brief Set password
- * @param $uid The username
- * @param $password The new password
- * @returns true/false
+ * Set password
+ * @param string $uid The username
+ * @param string $password The new password
+ * @return bool
*
* Change the password of a user
*/
@@ -118,10 +118,10 @@ class OC_User_Database extends OC_User_Backend {
}
/**
- * @brief Set display name
- * @param $uid The username
- * @param $displayName The new display name
- * @returns true/false
+ * Set display name
+ * @param string $uid The username
+ * @param string $displayName The new display name
+ * @return bool
*
* Change the display name of a user
*/
@@ -138,8 +138,8 @@ class OC_User_Database extends OC_User_Backend {
}
/**
- * @brief get display name of the user
- * @param $uid user ID of the user
+ * get display name of the user
+ * @param string $uid user ID of the user
* @return string display name
*/
public function getDisplayName($uid) {
@@ -148,8 +148,8 @@ class OC_User_Database extends OC_User_Backend {
}
/**
- * @brief Get a list of all display names
- * @returns array with all displayNames (value) and the correspondig uids (key)
+ * Get a list of all display names
+ * @return array an array of all displayNames (value) and the correspondig uids (key)
*
* Get a list of all display names and user ids.
*/
@@ -168,10 +168,10 @@ class OC_User_Database extends OC_User_Backend {
}
/**
- * @brief Check if the password is correct
- * @param $uid The username
- * @param $password The password
- * @returns string
+ * Check if the password is correct
+ * @param string $uid The username
+ * @param string $password The password
+ * @return string
*
* Check if the password is correct without logging in the user
* returns the user id or false
@@ -183,14 +183,14 @@ class OC_User_Database extends OC_User_Backend {
$row = $result->fetchRow();
if ($row) {
$storedHash = $row['password'];
- if ($storedHash[0] == '$') { //the new phpass based hashing
+ if ($storedHash[0] === '$') { //the new phpass based hashing
$hasher = $this->getHasher();
if ($hasher->CheckPassword($password . OC_Config::getValue('passwordsalt', ''), $storedHash)) {
return $row['uid'];
}
//old sha1 based hashing
- } elseif (sha1($password) == $storedHash) {
+ } elseif (sha1($password) === $storedHash) {
//upgrade to new hashing
$this->setPassword($row['uid'], $password);
return $row['uid'];
@@ -201,9 +201,9 @@ class OC_User_Database extends OC_User_Backend {
}
/**
- * @brief Load an user in the cache
+ * Load an user in the cache
* @param string $uid the username
- * @returns boolean
+ * @return boolean
*/
private function loadUser($uid) {
if (empty($this->cache[$uid])) {
@@ -225,8 +225,8 @@ class OC_User_Database extends OC_User_Backend {
}
/**
- * @brief Get a list of all users
- * @returns array with all uids
+ * Get a list of all users
+ * @return array an array of all uids
*
* Get a list of all users.
*/
@@ -241,7 +241,7 @@ class OC_User_Database extends OC_User_Backend {
}
/**
- * @brief check if a user exists
+ * check if a user exists
* @param string $uid the username
* @return boolean
*/
@@ -251,7 +251,7 @@ class OC_User_Database extends OC_User_Backend {
}
/**
- * @brief get the user's home directory
+ * get the user's home directory
* @param string $uid the username
* @return string|false
*/
@@ -273,7 +273,7 @@ class OC_User_Database extends OC_User_Backend {
/**
* counts the users in the database
*
- * @return int | bool
+ * @return int|bool
*/
public function countUsers() {
$query = OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`');
diff --git a/lib/private/user/dummy.php b/lib/private/user/dummy.php
index 2fb51d02de39ac24bcc5a65d0ef1d4e7b974b340..776168048f6cfaacc6b7d95ea1d7945ee26b9909 100644
--- a/lib/private/user/dummy.php
+++ b/lib/private/user/dummy.php
@@ -28,7 +28,7 @@ class OC_User_Dummy extends OC_User_Backend {
private $users = array();
/**
- * @brief Create a new user
+ * Create a new user
* @param string $uid The username of the user to create
* @param string $password The password of the new user
* @return bool
@@ -46,7 +46,7 @@ class OC_User_Dummy extends OC_User_Backend {
}
/**
- * @brief delete a user
+ * delete a user
* @param string $uid The username of the user to delete
* @return bool
*
@@ -62,7 +62,7 @@ class OC_User_Dummy extends OC_User_Backend {
}
/**
- * @brief Set password
+ * Set password
* @param string $uid The username
* @param string $password The new password
* @return bool
@@ -79,7 +79,7 @@ class OC_User_Dummy extends OC_User_Backend {
}
/**
- * @brief Check if the password is correct
+ * Check if the password is correct
* @param string $uid The username
* @param string $password The password
* @return string
@@ -96,7 +96,7 @@ class OC_User_Dummy extends OC_User_Backend {
}
/**
- * @brief Get a list of all users
+ * Get a list of all users
* @param string $search
* @param int $limit
* @param int $offset
@@ -109,7 +109,7 @@ class OC_User_Dummy extends OC_User_Backend {
}
/**
- * @brief check if a user exists
+ * check if a user exists
* @param string $uid the username
* @return boolean
*/
@@ -127,7 +127,7 @@ class OC_User_Dummy extends OC_User_Backend {
/**
* counts the users in the database
*
- * @return int | bool
+ * @return int|bool
*/
public function countUsers() {
return 0;
diff --git a/lib/private/user/example.php b/lib/private/user/example.php
index b2d0dc2541036554630b1e93ca6837eaa05d4439..db21d6f9e52e489d4fbcc73e83dca8f721c2b94b 100644
--- a/lib/private/user/example.php
+++ b/lib/private/user/example.php
@@ -27,10 +27,10 @@
*/
abstract class OC_User_Example extends OC_User_Backend {
/**
- * @brief Create a new user
- * @param $uid The username of the user to create
- * @param $password The password of the new user
- * @returns true/false
+ * Create a new user
+ * @param string $uid The username of the user to create
+ * @param string $password The password of the new user
+ * @return bool
*
* Creates a new user. Basic checking of username is done in OC_User
* itself, not in its subclasses.
@@ -38,20 +38,20 @@ abstract class OC_User_Example extends OC_User_Backend {
abstract public function createUser($uid, $password);
/**
- * @brief Set password
- * @param $uid The username
- * @param $password The new password
- * @returns true/false
+ * Set password
+ * @param string $uid The username
+ * @param string $password The new password
+ * @return bool
*
* Change the password of a user
*/
abstract public function setPassword($uid, $password);
/**
- * @brief Check if the password is correct
- * @param $uid The username
- * @param $password The password
- * @returns string
+ * Check if the password is correct
+ * @param string $uid The username
+ * @param string $password The password
+ * @return string
*
* Check if the password is correct without logging in the user
* returns the user id or false
@@ -59,9 +59,9 @@ abstract class OC_User_Example extends OC_User_Backend {
abstract public function checkPassword($uid, $password);
/**
- * @brief get the user's home directory
- * @param $uid The username
- * @returns string
+ * get the user's home directory
+ * @param string $uid The username
+ * @return string
*
* get the user's home directory
* returns the path or false
diff --git a/lib/private/user/http.php b/lib/private/user/http.php
index a03945210120cd646e525d891dd629ca4355dd9b..2bb8b4c864a88d575632f629d9fd2c4246714dd7 100644
--- a/lib/private/user/http.php
+++ b/lib/private/user/http.php
@@ -27,7 +27,7 @@
class OC_User_HTTP extends OC_User_Backend {
/**
* split http://user@host/path into a user and url part
- * @param string path
+ * @param string $url
* @return array
*/
private function parseUrl($url) {
@@ -46,7 +46,7 @@ class OC_User_HTTP extends OC_User_Backend {
/**
* check if an url is a valid login
- * @param string url
+ * @param string $url
* @return boolean
*/
private function matchUrl($url) {
@@ -54,10 +54,10 @@ class OC_User_HTTP extends OC_User_Backend {
}
/**
- * @brief Check if the password is correct
- * @param $uid The username
- * @param $password The password
- * @returns string
+ * Check if the password is correct
+ * @param string $uid The username
+ * @param string $password The password
+ * @return string
*
* Check if the password is correct without logging in the user
* returns the user id or false
@@ -87,7 +87,7 @@ class OC_User_HTTP extends OC_User_Backend {
}
/**
- * @brief check if a user exists
+ * check if a user exists
* @param string $uid the username
* @return boolean
*/
@@ -96,7 +96,7 @@ class OC_User_HTTP extends OC_User_Backend {
}
/**
- * @brief get the user's home directory
+ * get the user's home directory
* @param string $uid the username
* @return string|false
*/
diff --git a/lib/private/user/interface.php b/lib/private/user/interface.php
index cdcab3e5d00d9b58a29b0fc623579f33d4335ea8..4cdc47479a31f02d25b4ee8e14ff9d4799f8c79e 100644
--- a/lib/private/user/interface.php
+++ b/lib/private/user/interface.php
@@ -24,58 +24,54 @@
interface OC_User_Interface {
/**
- * @brief Check if backend implements actions
+ * Check if backend implements actions
* @param $actions bitwise-or'ed actions
- * @returns boolean
+ * @return boolean
*
* Returns the supported actions as int to be
* compared with OC_USER_BACKEND_CREATE_USER etc.
- * @return boolean
*/
public function implementsActions($actions);
/**
- * @brief delete a user
- * @param $uid The username of the user to delete
- * @returns true/false
- *
- * Deletes a user
- * @return boolean
+ * delete a user
+ * @param string $uid The username of the user to delete
+ * @return bool
*/
public function deleteUser($uid);
/**
- * @brief Get a list of all users
- * @returns array with all uids
+ * Get a list of all users
+ * @return array an array of all uids
*
* Get a list of all users.
*/
public function getUsers($search = '', $limit = null, $offset = null);
/**
- * @brief check if a user exists
+ * check if a user exists
* @param string $uid the username
* @return boolean
*/
public function userExists($uid);
/**
- * @brief get display name of the user
- * @param $uid user ID of the user
- * @return display name
+ * get display name of the user
+ * @param string $uid user ID of the user
+ * @return string display name
*/
public function getDisplayName($uid);
/**
- * @brief Get a list of all display names
- * @returns array with all displayNames (value) and the corresponding uids (key)
+ * Get a list of all display names
+ * @return array an array of all displayNames (value) and the corresponding uids (key)
*
* Get a list of all display names and user ids.
*/
public function getDisplayNames($search = '', $limit = null, $offset = null);
/**
- * @brief Check if a user list is available or not
+ * Check if a user list is available or not
* @return boolean if users can be listed or not
*/
public function hasUserListings();
diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php
index 6f6fd80a8ef4dc2c0866323e38c17e5538351a60..f2964fecca3a3b5cba87070f85b5bdf648c0b520 100644
--- a/lib/private/user/manager.php
+++ b/lib/private/user/manager.php
@@ -26,7 +26,7 @@ use OC\Hooks\PublicEmitter;
*/
class Manager extends PublicEmitter {
/**
- * @var \OC_User_Backend[] $backends
+ * @var \OC_User_Interface[] $backends
*/
private $backends = array();
@@ -52,12 +52,18 @@ class Manager extends PublicEmitter {
unset($cachedUsers[$i]);
}
});
+ $this->listen('\OC\User', 'postLogin', function ($user) {
+ $user->updateLastLoginTimestamp();
+ });
+ $this->listen('\OC\User', 'postRememberedLogin', function ($user) {
+ $user->updateLastLoginTimestamp();
+ });
}
/**
* register a user backend
*
- * @param \OC_User_Backend $backend
+ * @param \OC_User_Interface $backend
*/
public function registerBackend($backend) {
$this->backends[] = $backend;
@@ -66,7 +72,7 @@ class Manager extends PublicEmitter {
/**
* remove a user backend
*
- * @param \OC_User_Backend $backend
+ * @param \OC_User_Interface $backend
*/
public function removeBackend($backend) {
$this->cachedUsers = array();
@@ -105,7 +111,7 @@ class Manager extends PublicEmitter {
* get or construct the user object
*
* @param string $uid
- * @param \OC_User_Backend $backend
+ * @param \OC_User_Interface $backend
* @return \OC\User\User
*/
protected function getUserObject($uid, $backend) {
@@ -222,7 +228,7 @@ class Manager extends PublicEmitter {
* @param string $uid
* @param string $password
* @throws \Exception
- * @return bool | \OC\User\User the created user of false
+ * @return bool|\OC\User\User the created user of false
*/
public function createUser($uid, $password) {
$l = \OC_L10N::get('lib');
@@ -261,7 +267,7 @@ class Manager extends PublicEmitter {
/**
* returns how many users per backend exist (if supported by backend)
*
- * @return array with backend class as key and count number as value
+ * @return array an array of backend class as key and count number as value
*/
public function countUsers() {
$userCountStatistics = array();
diff --git a/lib/private/user/session.php b/lib/private/user/session.php
index 1740bad5abec22b1fdfa0aaf078e1c7dbb4b7fb8..5f0dee607ae43dcd0c11898db7010cc081c006fa 100644
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -22,7 +22,9 @@ use OC\Hooks\Emitter;
* - preCreateUser(string $uid, string $password)
* - postCreateUser(\OC\User\User $user)
* - preLogin(string $user, string $password)
- * - postLogin(\OC\User\User $user)
+ * - postLogin(\OC\User\User $user, string $password)
+ * - preRememberedLogin(string $uid)
+ * - postRememberedLogin(\OC\User\User $user)
* - logout()
*
* @package OC\User
@@ -82,7 +84,7 @@ class Session implements Emitter, \OCP\IUserSession {
/**
* set the currently active user
*
- * @param \OC\User\User $user
+ * @param \OC\User\User|null $user
*/
public function setUser($user) {
if (is_null($user)) {
@@ -115,7 +117,7 @@ class Session implements Emitter, \OCP\IUserSession {
/**
* set the login name
*
- * @param string $loginName for the logged in user
+ * @param string|null $loginName for the logged in user
*/
public function setLoginName($loginName) {
if (is_null($loginName)) {
@@ -170,6 +172,39 @@ class Session implements Emitter, \OCP\IUserSession {
}
}
+ /**
+ * perform login using the magic cookie (remember login)
+ *
+ * @param string $uid the username
+ * @param string $currentToken
+ * @return bool
+ */
+ public function loginWithCookie($uid, $currentToken) {
+ $this->manager->emit('\OC\User', 'preRememberedLogin', array($uid));
+ $user = $this->manager->get($uid);
+ if(is_null($user)) {
+ // user does not exist
+ return false;
+ }
+
+ // get stored tokens
+ $tokens = \OC_Preferences::getKeys($uid, 'login_token');
+ // test cookies token against stored tokens
+ if(!in_array($currentToken, $tokens, true)) {
+ return false;
+ }
+ // replace successfully used token with a new one
+ \OC_Preferences::deleteKey($uid, 'login_token', $currentToken);
+ $newToken = \OC_Util::generateRandomBytes(32);
+ \OC_Preferences::setValue($uid, 'login_token', $newToken, time());
+ $this->setMagicInCookie($user->getUID(), $newToken);
+
+ //login
+ $this->setUser($user);
+ $this->manager->emit('\OC\User', 'postRememberedLogin', array($user));
+ return true;
+ }
+
/**
* logout the user from the session
*/
@@ -191,7 +226,7 @@ class Session implements Emitter, \OCP\IUserSession {
$expires = time() + \OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
setcookie("oc_username", $username, $expires, \OC::$WEBROOT, '', $secure_cookie);
setcookie("oc_token", $token, $expires, \OC::$WEBROOT, '', $secure_cookie, true);
- setcookie("oc_remember_login", true, $expires, \OC::$WEBROOT, '', $secure_cookie);
+ setcookie("oc_remember_login", "1", $expires, \OC::$WEBROOT, '', $secure_cookie);
}
/**
diff --git a/lib/private/user/user.php b/lib/private/user/user.php
index ef5364cbf7b50d3c0fdbd8332194a134ae5d8e21..8aba7188e24feaed711b1710d6765afa91c28206 100644
--- a/lib/private/user/user.php
+++ b/lib/private/user/user.php
@@ -23,7 +23,7 @@ class User {
private $displayName;
/**
- * @var \OC_User_Backend $backend
+ * @var \OC_User_Interface $backend
*/
private $backend;
@@ -33,7 +33,7 @@ class User {
private $enabled;
/**
- * @var Emitter | Manager $emitter
+ * @var Emitter|Manager $emitter
*/
private $emitter;
@@ -42,6 +42,11 @@ class User {
*/
private $home;
+ /**
+ * @var int $lastLogin
+ */
+ private $lastLogin;
+
/**
* @var \OC\AllConfig $config
*/
@@ -49,17 +54,12 @@ class User {
/**
* @param string $uid
- * @param \OC_User_Backend $backend
+ * @param \OC_User_Interface $backend
* @param \OC\Hooks\Emitter $emitter
* @param \OC\AllConfig $config
*/
public function __construct($uid, $backend, $emitter = null, $config = null) {
$this->uid = $uid;
- if ($backend and $backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) {
- $this->displayName = $backend->getDisplayName($uid);
- } else {
- $this->displayName = $uid;
- }
$this->backend = $backend;
$this->emitter = $emitter;
$this->config = $config;
@@ -69,6 +69,7 @@ class User {
} else {
$this->enabled = true;
}
+ $this->lastLogin = \OC_Preferences::getValue($uid, 'login', 'lastLogin', 0);
}
/**
@@ -86,6 +87,13 @@ class User {
* @return string
*/
public function getDisplayName() {
+ if (!isset($this->displayName)) {
+ if ($this->backend and $this->backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) {
+ $this->displayName = $this->backend->getDisplayName($this->uid);
+ } else {
+ $this->displayName = $this->uid;
+ }
+ }
return $this->displayName;
}
@@ -105,6 +113,25 @@ class User {
}
}
+ /**
+ * returns the timestamp of the user's last login or 0 if the user did never
+ * login
+ *
+ * @return int
+ */
+ public function getLastLogin() {
+ return $this->lastLogin;
+ }
+
+ /**
+ * updates the timestamp of the most recent login of this user
+ */
+ public function updateLastLoginTimestamp() {
+ $this->lastLogin = time();
+ \OC_Preferences::setValue(
+ $this->uid, 'login', 'lastLogin', $this->lastLogin);
+ }
+
/**
* Delete the user
*
diff --git a/lib/private/util.php b/lib/private/util.php
index e2005d31c381a7aca448cb28dc2a4ab4de3e0aba..306e37b947841cd43fda6803016ebca37c407265 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -13,7 +13,7 @@ class OC_Util {
private static $fsSetup=false;
/**
- * @brief Can be set up
+ * Can be set up
* @param string $user
* @return boolean
* @description configure the initial filesystem based on the configuration
@@ -57,7 +57,10 @@ class OC_Util {
// set up quota for home storages, even for other users
// which can happen when using sharing
- if ($storage instanceof \OC\Files\Storage\Home) {
+ /**
+ * @var \OC\Files\Storage\Storage $storage
+ */
+ if ($storage->instanceOfStorage('\OC\Files\Storage\Home')) {
$user = $storage->getUser()->getUID();
$quota = OC_Util::getUserQuota($user);
if ($quota !== \OC\Files\SPACE_UNLIMITED) {
@@ -86,6 +89,39 @@ class OC_Util {
return true;
}
+ /**
+ * check if a password is required for each public link
+ * @return boolean
+ */
+ public static function isPublicLinkPasswordRequired() {
+ $appConfig = \OC::$server->getAppConfig();
+ $enforcePassword = $appConfig->getValue('core', 'shareapi_enforce_links_password', 'no');
+ return ($enforcePassword === 'yes') ? true : false;
+ }
+
+ /**
+ * check if sharing is disabled for the current user
+ *
+ * @return boolean
+ */
+ public static function isSharingDisabledForUser() {
+ if (\OC_Appconfig::getValue('core', 'shareapi_exclude_groups', 'no') === 'yes') {
+ $user = \OCP\User::getUser();
+ $groupsList = \OC_Appconfig::getValue('core', 'shareapi_exclude_groups_list', '');
+ $excludedGroups = explode(',', $groupsList);
+ $usersGroups = \OC_Group::getUserGroups($user);
+ if (!empty($usersGroups)) {
+ $remainingGroups = array_diff($usersGroups, $excludedGroups);
+ // if the user is only in groups which are disabled for sharing then
+ // sharing is also disabled for the user
+ if (empty($remainingGroups)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
/**
* Get the quota of a user
* @param string $user
@@ -105,7 +141,7 @@ class OC_Util {
}
/**
- * @brief copies the user skeleton files into the fresh user home files
+ * copies the user skeleton files into the fresh user home files
* @param string $userDirectory
*/
public static function copySkeleton($userDirectory) {
@@ -113,7 +149,7 @@ class OC_Util {
}
/**
- * @brief copies a directory recursively
+ * copies a directory recursively
* @param string $source
* @param string $target
* @return void
@@ -143,7 +179,7 @@ class OC_Util {
}
/**
- * @brief get the current installed version of ownCloud
+ * get the current installed version of ownCloud
* @return array
*/
public static function getVersion() {
@@ -152,7 +188,7 @@ class OC_Util {
}
/**
- * @brief get the current installed version string of ownCloud
+ * get the current installed version string of ownCloud
* @return string
*/
public static function getVersionString() {
@@ -213,7 +249,7 @@ class OC_Util {
}
/**
- * @brief add a javascript file
+ * add a javascript file
*
* @param string $application
* @param string|null $file filename
@@ -232,7 +268,7 @@ class OC_Util {
}
/**
- * @brief add a css file
+ * add a css file
*
* @param string $application
* @param string|null $file filename
@@ -251,7 +287,7 @@ class OC_Util {
}
/**
- * @brief Add a custom element to the header
+ * Add a custom element to the header
* @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
@@ -266,7 +302,7 @@ class OC_Util {
}
/**
- * @brief formats a timestamp in the "right" way
+ * formats a timestamp in the "right" way
*
* @param int $timestamp
* @param bool $dateOnly option to omit time from the result
@@ -286,7 +322,7 @@ class OC_Util {
}
/**
- * @brief check if the current server configuration is suitable for ownCloud
+ * check if the current server configuration is suitable for ownCloud
* @return array arrays with error messages and hints
*/
public static function checkServer() {
@@ -480,6 +516,12 @@ class OC_Util {
);
$webServerRestart = true;
}
+ if (!self::isAnnotationsWorking()) {
+ $errors[] = array(
+ 'error'=>'PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.',
+ 'hint'=>'This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.'
+ );
+ }
if($webServerRestart) {
$errors[] = array(
@@ -530,7 +572,7 @@ class OC_Util {
/**
- * @brief check if there are still some encrypted files stored
+ * check if there are still some encrypted files stored
* @return boolean
*/
public static function encryptedFiles() {
@@ -551,7 +593,28 @@ class OC_Util {
}
/**
- * @brief Check for correct file permissions of data directory
+ * check if a backup from the encryption keys exists
+ * @return boolean
+ */
+ public static function backupKeysExists() {
+ //check if encryption was enabled in the past
+ $backupExists = false;
+ if (OC_App::isEnabled('files_encryption') === false) {
+ $view = new OC\Files\View('/' . OCP\User::getUser());
+ $backupPath = '/files_encryption/keyfiles.backup';
+ if ($view->is_dir($backupPath)) {
+ $dircontent = $view->getDirectoryContent($backupPath);
+ if (!empty($dircontent)) {
+ $backupExists = true;
+ }
+ }
+ }
+
+ return $backupExists;
+ }
+
+ /**
+ * Check for correct file permissions of data directory
* @param string $dataDirectory
* @return array arrays with error messages and hints
*/
@@ -624,7 +687,7 @@ class OC_Util {
/**
- * @brief Check if the app is enabled, redirects to home if not
+ * Check if the app is enabled, redirects to home if not
* @param string $app
* @return void
*/
@@ -651,7 +714,7 @@ class OC_Util {
}
/**
- * @brief Check if the user is a admin, redirects to home if not
+ * Check if the user is a admin, redirects to home if not
* @return void
*/
public static function checkAdminUser() {
@@ -684,7 +747,7 @@ class OC_Util {
}
/**
- * @brief Check if the user is a subadmin, redirects to home if not
+ * Check if the user is a subadmin, redirects to home if not
* @return null|boolean $groups where the current user is subadmin
*/
public static function checkSubAdminUser() {
@@ -697,7 +760,7 @@ class OC_Util {
}
/**
- * @brief Redirect to the user default page
+ * Redirect to the user default page
* @return void
*/
public static function redirectToDefaultPage() {
@@ -721,7 +784,7 @@ class OC_Util {
}
/**
- * @brief get an id unique for this instance
+ * get an id unique for this instance
* @return string
*/
public static function getInstanceId() {
@@ -735,7 +798,7 @@ class OC_Util {
}
/**
- * @brief Static lifespan (in seconds) when a request token expires.
+ * Static lifespan (in seconds) when a request token expires.
* @see OC_Util::callRegister()
* @see OC_Util::isCallRegistered()
* @description
@@ -746,7 +809,7 @@ class OC_Util {
public static $callLifespan = 3600; // 3600 secs = 1 hour
/**
- * @brief Register an get/post call. Important to prevent CSRF attacks.
+ * Register an get/post call. Important to prevent CSRF attacks.
* @todo Write howto: CSRF protection guide
* @return string Generated token.
* @description
@@ -771,7 +834,7 @@ class OC_Util {
}
/**
- * @brief Check an ajax get/post call if the request token is valid.
+ * Check an ajax get/post call if the request token is valid.
* @return boolean False if request token is not set or is invalid.
* @see OC_Util::$callLifespan
* @see OC_Util::callRegister()
@@ -781,7 +844,7 @@ class OC_Util {
}
/**
- * @brief Check an ajax get/post call if the request token is valid. Exit if not.
+ * Check an ajax get/post call if the request token is valid. Exit if not.
* @todo Write howto
* @return void
*/
@@ -792,13 +855,13 @@ class OC_Util {
}
/**
- * @brief Public function to sanitize HTML
+ * Public function to sanitize HTML
*
* 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|array of strings
- * @return array with sanitized strings or a single sanitized string, depends on the input parameter.
+ * @param string|array &$value
+ * @return string|array an array of sanitized strings or a single sanitized string, depends on the input parameter.
*/
public static function sanitizeHTML( &$value ) {
if (is_array($value)) {
@@ -811,7 +874,7 @@ class OC_Util {
}
/**
- * @brief Public function to encode url parameters
+ * 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:
@@ -827,7 +890,7 @@ class OC_Util {
}
/**
- * @brief Check if the .htaccess file is working
+ * Check if the .htaccess file is working
* @throws OC\HintException If the testfile can't get written.
* @return bool
* @description Check if the .htaccess file is working by creating a test
@@ -837,7 +900,7 @@ class OC_Util {
if (!\OC_Config::getValue("check_for_working_htaccess", true)) {
return true;
}
-
+
// testdata
$fileName = '/htaccesstest.txt';
$testContent = 'testcontent';
@@ -875,7 +938,7 @@ class OC_Util {
}
/**
- * @brief test if webDAV is working properly
+ * 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
@@ -939,7 +1002,19 @@ class OC_Util {
}
/**
- * @brief Check if the PHP module fileinfo is loaded.
+ * Check if it's possible to get the inline annotations
+ *
+ * @return bool
+ */
+ public static function isAnnotationsWorking() {
+ $reflection = new \ReflectionMethod(__METHOD__);
+ $docs = $reflection->getDocComment();
+
+ return (is_string($docs) && strlen($docs) > 50);
+ }
+
+ /**
+ * Check if the PHP module fileinfo is loaded.
* @return bool
*/
public static function fileInfoLoaded() {
@@ -947,7 +1022,7 @@ class OC_Util {
}
/**
- * @brief Check if a PHP version older then 5.3.8 is installed.
+ * Check if a PHP version older then 5.3.8 is installed.
* @return bool
*/
public static function isPHPoutdated() {
@@ -955,7 +1030,7 @@ class OC_Util {
}
/**
- * @brief Check if the ownCloud server can connect to the internet
+ * Check if the ownCloud server can connect to the internet
* @return bool
*/
public static function isInternetConnectionWorking() {
@@ -987,7 +1062,7 @@ class OC_Util {
}
/**
- * @brief Check if the connection to the internet is disabled on purpose
+ * Check if the connection to the internet is disabled on purpose
* @return string
*/
public static function isInternetConnectionEnabled(){
@@ -995,7 +1070,7 @@ class OC_Util {
}
/**
- * @brief clear all levels of output buffering
+ * clear all levels of output buffering
* @return void
*/
public static function obEnd(){
@@ -1006,9 +1081,9 @@ class OC_Util {
/**
- * @brief Generates a cryptographic secure pseudo-random string
- * @param Int $length of the random string
- * @return String
+ * Generates a cryptographic secure pseudo-random string
+ * @param int $length of the random string
+ * @return string
* Please also update secureRNGAvailable if you change something here
*/
public static function generateRandomBytes($length = 30) {
@@ -1043,7 +1118,7 @@ class OC_Util {
}
/**
- * @brief Checks if a secure random number generator is available
+ * Checks if a secure random number generator is available
* @return bool
*/
public static function secureRNGAvailable() {
@@ -1082,7 +1157,7 @@ class OC_Util {
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10);
curl_setopt($curl, CURLOPT_URL, $url);
-
+
curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler");
if(OC_Config::getValue('proxy', '') != '') {
@@ -1091,17 +1166,16 @@ class OC_Util {
if(OC_Config::getValue('proxyuserpwd', '') != '') {
curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('proxyuserpwd'));
}
-
- if (ini_get('open_basedir') === '' && ini_get('safe_mode' === 'Off')) {
+
+ if (ini_get('open_basedir') === '' && ini_get('safe_mode') === 'Off') {
curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($curl, CURLOPT_MAXREDIRS, $max_redirects);
$data = curl_exec($curl);
} else {
curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false);
$mr = $max_redirects;
- if ($mr > 0) {
+ if ($mr > 0) {
$newURL = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL);
-
$rcurl = curl_copy_handle($curl);
curl_setopt($rcurl, CURLOPT_HEADER, true);
curl_setopt($rcurl, CURLOPT_NOBODY, true);
@@ -1125,9 +1199,9 @@ class OC_Util {
curl_close($rcurl);
if ($mr > 0) {
curl_setopt($curl, CURLOPT_URL, $newURL);
- }
+ }
}
-
+
if($mr == 0 && $max_redirects > 0) {
$data = false;
} else {
@@ -1196,7 +1270,7 @@ class OC_Util {
}
/**
- * @brief Clear the opcode cache if one exists
+ * Clear the opcode cache if one exists
* This is necessary for writing to the config file
* in case the opcode cache does not re-validate files
* @return void
@@ -1267,7 +1341,7 @@ class OC_Util {
/**
* Returns whether the given file name is valid
- * @param $file string file name to check
+ * @param string $file file name to check
* @return bool true if the file name is valid, false otherwise
*/
public static function isValidFileName($file) {
diff --git a/lib/private/vobject.php b/lib/private/vobject.php
index a3e9f7ef790191f2655d891a3507c1c468230121..94e3470ff08ebad7833e770447192b6e603d35bb 100644
--- a/lib/private/vobject.php
+++ b/lib/private/vobject.php
@@ -25,28 +25,28 @@
*/
class OC_VObject{
/** @var Sabre\VObject\Component */
- protected $vobject;
+ protected $vObject;
/**
- * @returns Sabre\VObject\Component
+ * @return Sabre\VObject\Component
*/
public function getVObject() {
- return $this->vobject;
+ return $this->vObject;
}
/**
- * @brief Parses the VObject
+ * Parses the VObject
* @param string $data VObject as string
- * @returns Sabre\VObject\Reader|null
+ * @return Sabre\VObject\Reader|null
*/
public static function parse($data) {
try {
Sabre\VObject\Property::$classMap['LAST-MODIFIED'] = 'Sabre\VObject\Property\DateTime';
- $vobject = Sabre\VObject\Reader::read($data);
- if ($vobject instanceof Sabre\VObject\Component) {
- $vobject = new OC_VObject($vobject);
+ $vObject = Sabre\VObject\Reader::read($data);
+ if ($vObject instanceof Sabre\VObject\Component) {
+ $vObject = new OC_VObject($vObject);
}
- return $vobject;
+ return $vObject;
} catch (Exception $e) {
OC_Log::write('vobject', $e->getMessage(), OC_Log::ERROR);
return null;
@@ -54,7 +54,7 @@ class OC_VObject{
}
/**
- * @brief Escapes semicolons
+ * Escapes semicolons
* @param array $value
* @return string
*/
@@ -66,7 +66,7 @@ class OC_VObject{
}
/**
- * @brief Creates an array out of a multivalue property
+ * Creates an array out of a multivalue property
* @param string $value
* @return array
*/
@@ -89,34 +89,34 @@ class OC_VObject{
/**
* Constructor
- * @param Sabre\VObject\Component or string
+ * @param Sabre\VObject\Component|string $vobject_or_name
*/
public function __construct($vobject_or_name) {
if (is_object($vobject_or_name)) {
- $this->vobject = $vobject_or_name;
+ $this->vObject = $vobject_or_name;
} else {
- $this->vobject = new Sabre\VObject\Component($vobject_or_name);
+ $this->vObject = new Sabre\VObject\Component($vobject_or_name);
}
}
/**
* @todo Write documentation
- * @param $item
+ * @param \OC_VObject|\Sabre\VObject\Component $item
* @param null $itemValue
*/
public function add($item, $itemValue = null) {
if ($item instanceof OC_VObject) {
$item = $item->getVObject();
}
- $this->vobject->add($item, $itemValue);
+ $this->vObject->add($item, $itemValue);
}
/**
- * @brief Add property to vobject
+ * Add property to vobject
* @param object $name of property
* @param object $value of property
* @param array|object $parameters of property
- * @returns Sabre\VObject\Property newly created
+ * @return Sabre\VObject\Property newly created
*/
public function addProperty($name, $value, $parameters=array()) {
if(is_array($value)) {
@@ -127,26 +127,26 @@ class OC_VObject{
$property->parameters[] = new Sabre\VObject\Parameter($name, $value);
}
- $this->vobject->add($property);
+ $this->vObject->add($property);
return $property;
}
public function setUID() {
$uid = substr(md5(rand().time()), 0, 10);
- $this->vobject->add('UID', $uid);
+ $this->vObject->add('UID', $uid);
}
/**
* @todo Write documentation
- * @param mixed $name
+ * @param mixed $name
* @param string $string
*/
public function setString($name, $string) {
if ($string != '') {
$string = strtr($string, array("\r\n"=>"\n"));
- $this->vobject->__set($name, $string);
+ $this->vObject->__set($name, $string);
}else{
- $this->vobject->__unset($name);
+ $this->vObject->__unset($name);
}
}
@@ -167,31 +167,31 @@ class OC_VObject{
if ($datetime instanceof DateTime) {
$datetime_element = new Sabre\VObject\Property\DateTime($name);
$datetime_element->setDateTime($datetime, $dateType);
- $this->vobject->__set($name, $datetime_element);
+ $this->vObject->__set($name, $datetime_element);
}else{
- $this->vobject->__unset($name);
+ $this->vObject->__unset($name);
}
}
/**
* @todo Write documentation
- * @param $name
+ * @param string $name
* @return string
*/
public function getAsString($name) {
- return $this->vobject->__isset($name) ?
- $this->vobject->__get($name)->value :
+ return $this->vObject->__isset($name) ?
+ $this->vObject->__get($name)->value :
'';
}
/**
* @todo Write documentation
- * @param $name
+ * @param string $name
* @return array
*/
public function getAsArray($name) {
$values = array();
- if ($this->vobject->__isset($name)) {
+ if ($this->vObject->__isset($name)) {
$values = explode(',', $this->getAsString($name));
$values = array_map('trim', $values);
}
@@ -200,14 +200,14 @@ class OC_VObject{
/**
* @todo Write documentation
- * @param $name
+ * @param string $name
* @return array|OC_VObject|\Sabre\VObject\Property
*/
public function &__get($name) {
if ($name == 'children') {
- return $this->vobject->children;
+ return $this->vObject->children;
}
- $return = $this->vobject->__get($name);
+ $return = $this->vObject->__get($name);
if ($return instanceof Sabre\VObject\Component) {
$return = new OC_VObject($return);
}
@@ -220,7 +220,7 @@ class OC_VObject{
* @param string $value
*/
public function __set($name, $value) {
- return $this->vobject->__set($name, $value);
+ return $this->vObject->__set($name, $value);
}
/**
@@ -228,7 +228,7 @@ class OC_VObject{
* @param string $name
*/
public function __unset($name) {
- return $this->vobject->__unset($name);
+ return $this->vObject->__unset($name);
}
/**
@@ -237,16 +237,16 @@ class OC_VObject{
* @return bool
*/
public function __isset($name) {
- return $this->vobject->__isset($name);
+ return $this->vObject->__isset($name);
}
/**
* @todo Write documentation
- * @param $function
- * @param $arguments
+ * @param callable $function
+ * @param array $arguments
* @return mixed
*/
public function __call($function, $arguments) {
- return call_user_func_array(array($this->vobject, $function), $arguments);
+ return call_user_func_array(array($this->vObject, $function), $arguments);
}
}
diff --git a/lib/public/app.php b/lib/public/app.php
index 96162299ec492ea3ab42265a0df3a32c5d67550b..bef4e96ae02d0a5e605962df01646328416d5e2d 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -36,7 +36,7 @@ namespace OCP;
class App {
/**
* Makes ownCloud aware of this app
- * @param array with all information
+ * @param array $data with all information
* @return boolean
*
* @deprecated This method is deprecated. Do not call it anymore.
@@ -49,7 +49,7 @@ class App {
/**
* Adds an entry to the navigation
- * @param array containing the data
+ * @param array $data containing the data
* @return boolean
*
* This function adds a new entry to the navigation visible to users. $data
@@ -70,7 +70,7 @@ class App {
/**
* Marks a navigation entry as active
- * @param string id of the entry
+ * @param string $id id of the entry
* @return boolean
*
* This function sets a navigation entry as active and removes the 'active'
@@ -83,8 +83,8 @@ class App {
/**
* Register a Configuration Screen that should appear in the personal settings section.
- * @param $app string appid
- * @param $page string page to be included
+ * @param string $app appid
+ * @param string $page page to be included
* @return void
*/
public static function registerPersonal( $app, $page ) {
diff --git a/lib/public/appframework/apicontroller.php b/lib/public/appframework/apicontroller.php
new file mode 100644
index 0000000000000000000000000000000000000000..5272f3ed52919417e3cfdedc8af2129bced530af
--- /dev/null
+++ b/lib/public/appframework/apicontroller.php
@@ -0,0 +1,93 @@
+<?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/>.
+ *
+ */
+
+/**
+ * Public interface of ownCloud for apps to use.
+ * AppFramework\Controller class
+ */
+
+namespace OCP\AppFramework;
+
+use OCP\AppFramework\Http\Response;
+use OCP\IRequest;
+
+
+/**
+ * Base class to inherit your controllers from that are used for RESTful APIs
+ */
+abstract class ApiController extends Controller {
+
+ private $corsMethods;
+ private $corsAllowedHeaders;
+ private $corsMaxAge;
+
+ /**
+ * constructor of the controller
+ * @param string $appName the name of the app
+ * @param IRequest $request an instance of the request
+ * @param string $corsMethods: comma seperated string of HTTP verbs which
+ * should be allowed for websites or webapps when calling your API, defaults to
+ * 'PUT, POST, GET, DELETE, PATCH'
+ * @param string $corsAllowedHeaders: comma seperated string of HTTP headers
+ * which should be allowed for websites or webapps when calling your API,
+ * defaults to 'Authorization, Content-Type, Accept'
+ * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS
+ * request should be cached, defaults to 1728000 seconds
+ */
+ public function __construct($appName,
+ IRequest $request,
+ $corsMethods='PUT, POST, GET, DELETE, PATCH',
+ $corsAllowedHeaders='Authorization, Content-Type, Accept',
+ $corsMaxAge=1728000){
+ parent::__construct($appName, $request);
+ $this->corsMethods = $corsMethods;
+ $this->corsAllowedHeaders = $corsAllowedHeaders;
+ $this->corsMaxAge = $corsMaxAge;
+ }
+
+
+ /**
+ * This method implements a preflighted cors response for you that you can
+ * link to for the options request
+ *
+ * @NoAdminRequired
+ * @NoCSRFRequired
+ * @PublicPage
+ */
+ public function preflightedCors() {
+ if(isset($this->request->server['HTTP_ORIGIN'])) {
+ $origin = $this->request->server['HTTP_ORIGIN'];
+ } else {
+ $origin = '*';
+ }
+
+ $response = new Response();
+ $response->addHeader('Access-Control-Allow-Origin', $origin);
+ $response->addHeader('Access-Control-Allow-Methods', $this->corsMethods);
+ $response->addHeader('Access-Control-Max-Age', $this->corsMaxAge);
+ $response->addHeader('Access-Control-Allow-Headers', $this->corsAllowedHeaders);
+ $response->addHeader('Access-Control-Allow-Credentials', 'false');
+ return $response;
+ }
+
+
+}
diff --git a/lib/public/appframework/controller.php b/lib/public/appframework/controller.php
index 758f0a80083ce3adb3186759fb3dce762208a056..50b5ed3a80df1da24734d0ecfc682e4b1f2ce024 100644
--- a/lib/public/appframework/controller.php
+++ b/lib/public/appframework/controller.php
@@ -3,7 +3,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012, 2014 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -28,7 +28,8 @@
namespace OCP\AppFramework;
use OCP\AppFramework\Http\TemplateResponse;
-use OCP\AppFramework\IAppContainer;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Http\IResponseSerializer;
use OCP\IRequest;
@@ -49,19 +50,86 @@ abstract class Controller {
*/
protected $request;
+ private $serializer;
+ private $responders;
+
/**
* constructor of the controller
* @param string $appName the name of the app
* @param IRequest $request an instance of the request
+ * @param string $corsMethods: comma seperated string of HTTP verbs which
+ * should be allowed for websites or webapps when calling your API, defaults to
+ * 'PUT, POST, GET, DELETE, PATCH'
+ * @param string $corsAllowedHeaders: comma seperated string of HTTP headers
+ * which should be allowed for websites or webapps when calling your API,
+ * defaults to 'Authorization, Content-Type, Accept'
+ * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS
+ * request should be cached, defaults to 1728000 seconds
*/
- public function __construct($appName, IRequest $request){
+ public function __construct($appName,
+ IRequest $request){
$this->appName = $appName;
$this->request = $request;
+
+ // default responders
+ $this->responders = array(
+ 'json' => function ($response) {
+ return new JSONResponse($response);
+ }
+ );
+ }
+
+
+ /**
+ * Registers a serializer that is executed before a formatter is being
+ * called, useful for turning any data into PHP arrays that can be used
+ * by a JSONResponse for instance
+ * @param IResponseSerializer $serializer
+ */
+ protected function registerSerializer(IResponseSerializer $serializer) {
+ $this->serializer = $serializer;
+ }
+
+
+ /**
+ * Registers a formatter for a type
+ * @param string $format
+ * @param \Closure $responder
+ */
+ protected function registerResponder($format, \Closure $responder) {
+ $this->responders[$format] = $responder;
+ }
+
+
+ /**
+ * Serializes and formats a response
+ * @param mixed $response the value that was returned from a controller and
+ * is not a Response instance
+ * @param string $format the format for which a formatter has been registered
+ * @throws \DomainException if format does not match a registered formatter
+ * @return Response
+ */
+ public function buildResponse($response, $format='json') {
+ if(array_key_exists($format, $this->responders)) {
+
+ if ($this->serializer) {
+ $response = $this->serializer->serialize($response);
+ }
+
+ $responder = $this->responders[$format];
+
+ return $responder($response);
+
+ } else {
+ throw new \DomainException('No responder registered for format ' .
+ $format . '!');
+ }
}
/**
* Lets you access post and get parameters by the index
+ * @deprecated write your parameters as method arguments instead
* @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:
@@ -79,6 +147,7 @@ abstract class Controller {
/**
* Returns all params that were received, be it from the request
* (as GET or POST) or throuh the URL by the route
+ * @deprecated use $this->request instead
* @return array the array with all parameters
*/
public function getParams() {
@@ -88,6 +157,7 @@ abstract class Controller {
/**
* Returns the method of the request
+ * @deprecated use $this->request instead
* @return string the method of the request (POST, GET, etc)
*/
public function method() {
@@ -97,6 +167,7 @@ abstract class Controller {
/**
* Shortcut for accessing an uploaded file through the $_FILES array
+ * @deprecated use $this->request instead
* @param string $key the key that will be taken from the $_FILES array
* @return array the file in the $_FILES element
*/
@@ -107,6 +178,7 @@ abstract class Controller {
/**
* Shortcut for getting env variables
+ * @deprecated use $this->request instead
* @param string $key the key that will be taken from the $_ENV array
* @return array the value in the $_ENV element
*/
@@ -117,6 +189,7 @@ abstract class Controller {
/**
* Shortcut for getting cookie variables
+ * @deprecated use $this->request instead
* @param string $key the key that will be taken from the $_COOKIE array
* @return array the value in the $_COOKIE element
*/
@@ -127,6 +200,7 @@ abstract class Controller {
/**
* Shortcut for rendering a template
+ * @deprecated return a template response instead
* @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
diff --git a/tests/lib/appframework/utility/MethodAnnotationReaderTest.php b/lib/public/appframework/db/doesnotexistexception.php
similarity index 50%
rename from tests/lib/appframework/utility/MethodAnnotationReaderTest.php
rename to lib/public/appframework/db/doesnotexistexception.php
index c68812aa5c76dbcb3c76ea4a1d0e50893c368c98..5861e74f6c8d3d6c4c5c5e770db77860dc83c62e 100644
--- a/tests/lib/appframework/utility/MethodAnnotationReaderTest.php
+++ b/lib/public/appframework/db/doesnotexistexception.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -22,34 +22,21 @@
*/
-namespace OC\AppFramework\Utility;
+namespace OCP\AppFramework\Db;
-class MethodAnnotationReaderTest extends \PHPUnit_Framework_TestCase {
-
-
- /**
- * @Annotation
- */
- public function testReadAnnotation(){
- $reader = new MethodAnnotationReader('\OC\AppFramework\Utility\MethodAnnotationReaderTest',
- 'testReadAnnotation');
-
- $this->assertTrue($reader->hasAnnotation('Annotation'));
- }
-
+/**
+ * This is returned or should be returned when a find request does not find an
+ * entry in the database
+ */
+class DoesNotExistException extends \Exception {
/**
- * @Annotation
- * @param test
+ * Constructor
+ * @param string $msg the error message
*/
- public function testReadAnnotationNoLowercase(){
- $reader = new MethodAnnotationReader('\OC\AppFramework\Utility\MethodAnnotationReaderTest',
- 'testReadAnnotationNoLowercase');
-
- $this->assertTrue($reader->hasAnnotation('Annotation'));
- $this->assertFalse($reader->hasAnnotation('param'));
+ public function __construct($msg){
+ parent::__construct($msg);
}
-
-}
+}
\ No newline at end of file
diff --git a/lib/public/appframework/db/entity.php b/lib/public/appframework/db/entity.php
new file mode 100644
index 0000000000000000000000000000000000000000..8ab42bd9153576a1fdcdfa0538d03a7c8df92e43
--- /dev/null
+++ b/lib/public/appframework/db/entity.php
@@ -0,0 +1,236 @@
+<?php
+
+/**
+* ownCloud - App Framework
+*
+* @author Bernhard Posselt
+* @copyright 2012 Bernhard Posselt dev@bernhard-posselt.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\Db;
+
+
+/**
+ * @method integer getId()
+ * @method void setId(integer $id)
+ */
+abstract class Entity {
+
+ public $id;
+
+ private $_updatedFields = array();
+ private $_fieldTypes = array('id' => 'integer');
+
+
+ /**
+ * Simple alternative constructor for building entities from a request
+ * @param array $params the array which was obtained via $this->params('key')
+ * in the controller
+ * @return Entity
+ */
+ public static function fromParams(array $params) {
+ $instance = new static();
+
+ foreach($params as $key => $value) {
+ $method = 'set' . ucfirst($key);
+ $instance->$method($value);
+ }
+
+ return $instance;
+ }
+
+
+ /**
+ * Maps the keys of the row array to the attributes
+ * @param array $row the row to map onto the entity
+ */
+ public static function fromRow(array $row){
+ $instance = new static();
+
+ foreach($row as $key => $value){
+ $prop = ucfirst($instance->columnToProperty($key));
+ $setter = 'set' . $prop;
+ $instance->$setter($value);
+ }
+
+ $instance->resetUpdatedFields();
+
+ return $instance;
+ }
+
+
+ /**
+ * @return an array with attribute and type
+ */
+ public function getFieldTypes() {
+ return $this->_fieldTypes;
+ }
+
+
+ /**
+ * Marks the entity as clean needed for setting the id after the insertion
+ */
+ public function resetUpdatedFields(){
+ $this->_updatedFields = array();
+ }
+
+
+ protected function setter($name, $args) {
+ // setters should only work for existing attributes
+ if(property_exists($this, $name)){
+ if($this->$name === $args[0]) {
+ return;
+ }
+ $this->markFieldUpdated($name);
+
+ // if type definition exists, cast to correct type
+ if($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) {
+ settype($args[0], $this->_fieldTypes[$name]);
+ }
+ $this->$name = $args[0];
+
+ } else {
+ throw new \BadFunctionCallException($name .
+ ' is not a valid attribute');
+ }
+ }
+
+
+ protected function getter($name) {
+ // getters should only work for existing attributes
+ if(property_exists($this, $name)){
+ return $this->$name;
+ } else {
+ throw new \BadFunctionCallException($name .
+ ' is not a valid attribute');
+ }
+ }
+
+
+ /**
+ * Each time a setter is called, push the part after set
+ * into an array: for instance setId will save Id in the
+ * updated fields array so it can be easily used to create the
+ * getter method
+ */
+ public function __call($methodName, $args){
+ $attr = lcfirst( substr($methodName, 3) );
+
+ if(strpos($methodName, 'set') === 0){
+ $this->setter($attr, $args);
+ } elseif(strpos($methodName, 'get') === 0) {
+ return $this->getter($attr);
+ } else {
+ throw new \BadFunctionCallException($methodName .
+ ' does not exist');
+ }
+
+ }
+
+
+ /**
+ * Mark am attribute as updated
+ * @param string $attribute the name of the attribute
+ */
+ protected function markFieldUpdated($attribute){
+ $this->_updatedFields[$attribute] = true;
+ }
+
+
+ /**
+ * Transform a database columnname to a property
+ * @param string $columnName the name of the column
+ * @return string the property name
+ */
+ public function columnToProperty($columnName){
+ $parts = explode('_', $columnName);
+ $property = null;
+
+ foreach($parts as $part){
+ if($property === null){
+ $property = $part;
+ } else {
+ $property .= ucfirst($part);
+ }
+ }
+
+ return $property;
+ }
+
+
+ /**
+ * Transform a property to a database column name
+ * @param string $property the name of the property
+ * @return string the column name
+ */
+ public function propertyToColumn($property){
+ $parts = preg_split('/(?=[A-Z])/', $property);
+ $column = null;
+
+ foreach($parts as $part){
+ if($column === null){
+ $column = $part;
+ } else {
+ $column .= '_' . lcfirst($part);
+ }
+ }
+
+ return $column;
+ }
+
+
+ /**
+ * @return array array of updated fields for update query
+ */
+ public function getUpdatedFields(){
+ return $this->_updatedFields;
+ }
+
+
+ /**
+ * Adds type information for a field so that its automatically casted to
+ * that value once its being returned from the database
+ * @param string $fieldName the name of the attribute
+ * @param string $type the type which will be used to call settype()
+ */
+ protected function addType($fieldName, $type){
+ $this->_fieldTypes[$fieldName] = $type;
+ }
+
+
+ /**
+ * Slugify the value of a given attribute
+ * Warning: This doesn't result in a unique value
+ * @param string $attributeName the name of the attribute, which value should be slugified
+ * @return string slugified value
+ */
+ public function slugify($attributeName){
+ // toSlug should only work for existing attributes
+ if(property_exists($this, $attributeName)){
+ $value = $this->$attributeName;
+ // replace everything except alphanumeric with a single '-'
+ $value = preg_replace('/[^A-Za-z0-9]+/', '-', $value);
+ $value = strtolower($value);
+ // trim '-'
+ return trim($value, '-');
+ } else {
+ throw new \BadFunctionCallException($attributeName .
+ ' is not a valid attribute');
+ }
+ }
+
+}
diff --git a/lib/public/appframework/db/mapper.php b/lib/public/appframework/db/mapper.php
new file mode 100644
index 0000000000000000000000000000000000000000..a23149e796b52c82cb1cba564875565313114443
--- /dev/null
+++ b/lib/public/appframework/db/mapper.php
@@ -0,0 +1,291 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @author Morris Jobke
+ * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.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 OCP\AppFramework\Db;
+
+use \OCP\IDb;
+
+
+/**
+ * Simple parent class for inheriting your data access layer from. This class
+ * may be subject to change in the future
+ */
+abstract class Mapper {
+
+ protected $tableName;
+ protected $entityClass;
+ protected $db;
+
+ /**
+ * @param IDb $db Instance of the Db abstraction layer
+ * @param string $tableName the name of the table. set this to allow entity
+ * @param string $entityClass the name of the entity that the sql should be
+ * mapped to queries without using sql
+ */
+ public function __construct(IDb $db, $tableName, $entityClass=null){
+ $this->db = $db;
+ $this->tableName = '*PREFIX*' . $tableName;
+
+ // if not given set the entity name to the class without the mapper part
+ // cache it here for later use since reflection is slow
+ if($entityClass === null) {
+ $this->entityClass = str_replace('Mapper', '', get_class($this));
+ } else {
+ $this->entityClass = $entityClass;
+ }
+ }
+
+
+ /**
+ * @return string the table name
+ */
+ public function getTableName(){
+ return $this->tableName;
+ }
+
+
+ /**
+ * Deletes an entity from the table
+ * @param Entity $entity the entity that should be deleted
+ */
+ public function delete(Entity $entity){
+ $sql = 'DELETE FROM `' . $this->tableName . '` WHERE `id` = ?';
+ $this->execute($sql, array($entity->getId()));
+ }
+
+
+ /**
+ * Creates a new entry in the db from an entity
+ * @param Entity $entity the entity that should be created
+ * @return Entity the saved entity with the set id
+ */
+ public function insert(Entity $entity){
+ // get updated fields to save, fields have to be set using a setter to
+ // be saved
+ $properties = $entity->getUpdatedFields();
+ $values = '';
+ $columns = '';
+ $params = array();
+
+ // build the fields
+ $i = 0;
+ foreach($properties as $property => $updated) {
+ $column = $entity->propertyToColumn($property);
+ $getter = 'get' . ucfirst($property);
+
+ $columns .= '`' . $column . '`';
+ $values .= '?';
+
+ // only append colon if there are more entries
+ if($i < count($properties)-1){
+ $columns .= ',';
+ $values .= ',';
+ }
+
+ array_push($params, $entity->$getter());
+ $i++;
+
+ }
+
+ $sql = 'INSERT INTO `' . $this->tableName . '`(' .
+ $columns . ') VALUES(' . $values . ')';
+
+ $this->execute($sql, $params);
+
+ $entity->setId((int) $this->db->getInsertId($this->tableName));
+ return $entity;
+ }
+
+
+
+ /**
+ * Updates an entry in the db from an entity
+ * @throws \InvalidArgumentException if entity has no id
+ * @param Entity $entity the entity that should be created
+ */
+ public function update(Entity $entity){
+ // if entity wasn't changed it makes no sense to run a db query
+ $properties = $entity->getUpdatedFields();
+ if(count($properties) === 0) {
+ return $entity;
+ }
+
+ // entity needs an id
+ $id = $entity->getId();
+ if($id === null){
+ throw new \InvalidArgumentException(
+ 'Entity which should be updated has no id');
+ }
+
+ // get updated fields to save, fields have to be set using a setter to
+ // be saved
+ // dont update the id field
+ unset($properties['id']);
+
+ $columns = '';
+ $params = array();
+
+ // build the fields
+ $i = 0;
+ foreach($properties as $property => $updated) {
+
+ $column = $entity->propertyToColumn($property);
+ $getter = 'get' . ucfirst($property);
+
+ $columns .= '`' . $column . '` = ?';
+
+ // only append colon if there are more entries
+ if($i < count($properties)-1){
+ $columns .= ',';
+ }
+
+ array_push($params, $entity->$getter());
+ $i++;
+ }
+
+ $sql = 'UPDATE `' . $this->tableName . '` SET ' .
+ $columns . ' WHERE `id` = ?';
+ array_push($params, $id);
+
+ $this->execute($sql, $params);
+ }
+
+
+ /**
+ * Runs an sql query
+ * @param string $sql the prepare string
+ * @param array $params the params which should replace the ? in the sql query
+ * @param int $limit the maximum number of rows
+ * @param int $offset from which row we want to start
+ * @return \PDOStatement the database query result
+ */
+ protected function execute($sql, array $params=array(), $limit=null, $offset=null){
+ $query = $this->db->prepareQuery($sql, $limit, $offset);
+
+ $index = 1; // bindParam is 1 indexed
+ foreach($params as $param) {
+
+ switch (gettype($param)) {
+ case 'integer':
+ $pdoConstant = \PDO::PARAM_INT;
+ break;
+
+ case 'boolean':
+ $pdoConstant = \PDO::PARAM_BOOL;
+ break;
+
+ default:
+ $pdoConstant = \PDO::PARAM_STR;
+ break;
+ }
+
+ $query->bindValue($index, $param, $pdoConstant);
+
+ $index++;
+ }
+
+ return $query->execute();
+ }
+
+
+ /**
+ * Returns an db result and throws exceptions when there are more or less
+ * results
+ * @see findEntity
+ * @param string $sql the sql query
+ * @param array $params the parameters of the sql query
+ * @param int $limit the maximum number of rows
+ * @param int $offset from which row we want to start
+ * @throws DoesNotExistException if the item does not exist
+ * @throws MultipleObjectsReturnedException if more than one item exist
+ * @return array the result as row
+ */
+ protected function findOneQuery($sql, array $params=array(), $limit=null, $offset=null){
+ $result = $this->execute($sql, $params, $limit, $offset);
+ $row = $result->fetch();
+
+ if($row === false || $row === null){
+ throw new DoesNotExistException('No matching entry found');
+ }
+ $row2 = $result->fetch();
+ //MDB2 returns null, PDO and doctrine false when no row is available
+ if( ! ($row2 === false || $row2 === null )) {
+ throw new MultipleObjectsReturnedException('More than one result');
+ } else {
+ return $row;
+ }
+ }
+
+
+ /**
+ * Creates an entity from a row. Automatically determines the entity class
+ * from the current mapper name (MyEntityMapper -> MyEntity)
+ * @param array $row the row which should be converted to an entity
+ * @return Entity the entity
+ */
+ protected function mapRowToEntity($row) {
+ return call_user_func($this->entityClass .'::fromRow', $row);
+ }
+
+
+ /**
+ * Runs a sql query and returns an array of entities
+ * @param string $sql the prepare string
+ * @param array $params the params which should replace the ? in the sql query
+ * @param int $limit the maximum number of rows
+ * @param int $offset from which row we want to start
+ * @return array all fetched entities
+ */
+ protected function findEntities($sql, array $params=array(), $limit=null, $offset=null) {
+ $result = $this->execute($sql, $params, $limit, $offset);
+
+ $entities = array();
+
+ while($row = $result->fetch()){
+ $entities[] = $this->mapRowToEntity($row);
+ }
+
+ return $entities;
+ }
+
+
+ /**
+ * Returns an db result and throws exceptions when there are more or less
+ * results
+ * @param string $sql the sql query
+ * @param array $params the parameters of the sql query
+ * @param int $limit the maximum number of rows
+ * @param int $offset from which row we want to start
+ * @throws DoesNotExistException if the item does not exist
+ * @throws MultipleObjectsReturnedException if more than one item exist
+ * @return Entity the entity
+ */
+ protected function findEntity($sql, array $params=array(), $limit=null, $offset=null){
+ return $this->mapRowToEntity($this->findOneQuery($sql, $params, $limit, $offset));
+ }
+
+
+}
diff --git a/lib/public/appframework/db/multipleobjectsreturnedexception.php b/lib/public/appframework/db/multipleobjectsreturnedexception.php
new file mode 100644
index 0000000000000000000000000000000000000000..51d8d6bc7e1289a67356ed82a65127b6a5c08f62
--- /dev/null
+++ b/lib/public/appframework/db/multipleobjectsreturnedexception.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.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\Db;
+
+
+/**
+ * This is returned or should be returned when a find request finds more than one
+ * row
+ */
+class MultipleObjectsReturnedException extends \Exception {
+
+ /**
+ * Constructor
+ * @param string $msg the error message
+ */
+ public function __construct($msg){
+ parent::__construct($msg);
+ }
+
+}
\ No newline at end of file
diff --git a/lib/public/appframework/http.php b/lib/public/appframework/http.php
index 60f314202cc9e93f484cddf6901e5322196dde5c..c6e2ff8846fa5ad0220aee0623841315f92f7d50 100644
--- a/lib/public/appframework/http.php
+++ b/lib/public/appframework/http.php
@@ -3,7 +3,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/appframework/http/downloadresponse.php b/lib/public/appframework/http/downloadresponse.php
index d3c2818e8283ef4f7be516bba6102e5e23e5107f..6b61490341e567bcd0d6f2dfa4a9169ec8ca2696 100644
--- a/lib/public/appframework/http/downloadresponse.php
+++ b/lib/public/appframework/http/downloadresponse.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/appframework/http/iresponseserializer.php b/lib/public/appframework/http/iresponseserializer.php
new file mode 100644
index 0000000000000000000000000000000000000000..c16e106df3491d0c80f7a6d89fdc6c27c2c78d1a
--- /dev/null
+++ b/lib/public/appframework/http/iresponseserializer.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.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;
+
+interface IResponseSerializer {
+ function serialize($response);
+}
\ No newline at end of file
diff --git a/lib/public/appframework/http/jsonresponse.php b/lib/public/appframework/http/jsonresponse.php
index 6d029b7464aaface752b692b54f410bf23e15a31..c6360e0a0f5a111f38c92322b92789c5378cecb2 100644
--- a/lib/public/appframework/http/jsonresponse.php
+++ b/lib/public/appframework/http/jsonresponse.php
@@ -3,7 +3,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/appframework/http/redirectresponse.php b/lib/public/appframework/http/redirectresponse.php
index 416e15336353a089abde262010c62a24f784fa98..a1b482c6b3b30043e06db535c61ad11ed1b32587 100644
--- a/lib/public/appframework/http/redirectresponse.php
+++ b/lib/public/appframework/http/redirectresponse.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/appframework/http/response.php b/lib/public/appframework/http/response.php
index 45402d9b3b3290e860dea4166d8e1257f53687e1..20e936bb86063f1cd685c00beb79778fcf44d910 100644
--- a/lib/public/appframework/http/response.php
+++ b/lib/public/appframework/http/response.php
@@ -3,7 +3,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt, Thomas Tanghus, Bart Visscher
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -92,6 +92,10 @@ class Response {
* @return Response Reference to this object
*/
public function addHeader($name, $value) {
+ $name = trim($name); // always remove leading and trailing whitespace
+ // to be able to reliably check for security
+ // headers
+
if(is_null($value)) {
unset($this->headers[$name]);
} else {
diff --git a/lib/public/appframework/http/templateresponse.php b/lib/public/appframework/http/templateresponse.php
index f5baf788ada27d34d454eda3572fcf4ece9d93fa..02589f4e2a41667eb52adfecb6b22f8ef9913939 100644
--- a/lib/public/appframework/http/templateresponse.php
+++ b/lib/public/appframework/http/templateresponse.php
@@ -3,7 +3,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -61,12 +61,16 @@ class TemplateResponse extends Response {
* constructor of TemplateResponse
* @param string $appName the name of the app to load the template from
* @param string $templateName the name of the template
+ * @param array $params an array of parameters which should be passed to the
+ * template
+ * @param string $renderAs how the page should be rendered, defaults to user
*/
- public function __construct($appName, $templateName) {
+ public function __construct($appName, $templateName, array $params=array(),
+ $renderAs='user') {
$this->templateName = $templateName;
$this->appName = $appName;
- $this->params = array();
- $this->renderAs = 'user';
+ $this->params = $params;
+ $this->renderAs = $renderAs;
}
diff --git a/lib/public/appframework/iapi.php b/lib/public/appframework/iapi.php
index c4aeea2d4e5181a4d16e498b24e1a506b02cdda0..9af251be850180e351c64e2ea599e0ad4e75cd50 100644
--- a/lib/public/appframework/iapi.php
+++ b/lib/public/appframework/iapi.php
@@ -3,7 +3,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/appframework/middleware.php b/lib/public/appframework/middleware.php
index 24f3193993547fd12db0169de3439037a170fcdc..2e1111e9d5d863769cc5a4ff4d22a3620304d547 100644
--- a/lib/public/appframework/middleware.php
+++ b/lib/public/appframework/middleware.php
@@ -3,7 +3,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php
index 03b94403b4772995a8b248c865c2b27e4f135b22..562228e1e52f3e291d4245bda2cd45e3a453b913 100644
--- a/lib/public/backgroundjob.php
+++ b/lib/public/backgroundjob.php
@@ -94,7 +94,7 @@ class BackgroundJob {
/**
* @deprecated
* gets all regular tasks
- * @return associative array
+ * @return array
*
* key is string "$klass-$method", value is array( $klass, $method )
*/
@@ -115,7 +115,7 @@ class BackgroundJob {
* @deprecated
* Gets one queued task
* @param int $id ID of the task
- * @return BackgroundJob\IJob array
+ * @return BackgroundJob\IJob|null
*/
public static function findQueuedTask($id) {
$jobList = \OC::$server->getJobList();
@@ -125,7 +125,7 @@ class BackgroundJob {
/**
* @deprecated
* Gets all queued tasks
- * @return array with associative arrays
+ * @return array an array of associative arrays
*/
public static function allQueuedTasks() {
$jobList = \OC::$server->getJobList();
@@ -145,7 +145,7 @@ class BackgroundJob {
* @deprecated
* Gets all queued tasks of a specific app
* @param string $app app name
- * @return array with associative arrays
+ * @return array an array of associative arrays
*/
public static function queuedTaskWhereAppIs($app) {
$jobList = \OC::$server->getJobList();
diff --git a/lib/public/backgroundjob/ijoblist.php b/lib/public/backgroundjob/ijoblist.php
index c9b546605b8cd5ce60caf9b6be060997b87cce98..366b0e373683bc940da2e2ec0049dc9483eb3a3f 100644
--- a/lib/public/backgroundjob/ijoblist.php
+++ b/lib/public/backgroundjob/ijoblist.php
@@ -12,7 +12,7 @@ interface IJobList {
/**
* Add a job to the list
*
- * @param \OCP\BackgroundJob\IJob |string $job
+ * @param \OCP\BackgroundJob\IJob|string $job
* @param mixed $argument The argument to be passed to $job->run() when the job is exectured
* @param string $job
* @return void
@@ -22,7 +22,7 @@ interface IJobList {
/**
* Remove a job from the list
*
- * @param IJob $job
+ * @param \OCP\BackgroundJob\IJob|string $job
* @param mixed $argument
* @return void
*/
@@ -31,7 +31,7 @@ interface IJobList {
/**
* check if a job is in the list
*
- * @param $job
+ * @param \OCP\BackgroundJob\IJob|string $job
* @param mixed $argument
* @return bool
*/
diff --git a/lib/public/contacts.php b/lib/public/contacts.php
index 1b61d7aa4ff22b6201a8bfe407eaec0b7f8ddf9b..5311050d5c313d22dbb599022f873f79c9b6b525 100644
--- a/lib/public/contacts.php
+++ b/lib/public/contacts.php
@@ -87,7 +87,7 @@ namespace OCP {
* @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
+ * @return array an array of contacts which are arrays of key-value-pairs
*/
public static function search($pattern, $searchProperties = array(), $options = array()) {
$cm = \OC::$server->getContactsManager();
@@ -98,7 +98,7 @@ namespace OCP {
* 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
+ * @param string $address_book_key
* @return bool successful or not
*/
public static function delete($id, $address_book_key) {
@@ -111,12 +111,12 @@ namespace OCP {
* 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
+ * @param string $address_book_key identifier of the address book in which the contact shall be created or updated
+ * @return array an array representing the contact just created or updated
*/
public static function createOrUpdate($properties, $address_book_key) {
$cm = \OC::$server->getContactsManager();
- return $cm->search($properties, $address_book_key);
+ return $cm->createOrUpdate($properties, $address_book_key);
}
/**
@@ -134,7 +134,7 @@ namespace OCP {
*/
public static function registerAddressBook(\OCP\IAddressBook $address_book) {
$cm = \OC::$server->getContactsManager();
- return $cm->registerAddressBook($address_book);
+ $cm->registerAddressBook($address_book);
}
/**
@@ -142,7 +142,7 @@ namespace OCP {
*/
public static function unregisterAddressBook(\OCP\IAddressBook $address_book) {
$cm = \OC::$server->getContactsManager();
- return $cm->unregisterAddressBook($address_book);
+ $cm->unregisterAddressBook($address_book);
}
/**
diff --git a/lib/public/contacts/imanager.php b/lib/public/contacts/imanager.php
index 005b71f298bdfac8ee685b63d84f5e5c2b0195da..5a76585ead9adb11509418e657d5e8df71cb9dbb 100644
--- a/lib/public/contacts/imanager.php
+++ b/lib/public/contacts/imanager.php
@@ -88,7 +88,7 @@ namespace OCP\Contacts {
* @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
+ * @return array an array of contacts which are arrays of key-value-pairs
*/
function search($pattern, $searchProperties = array(), $options = array());
@@ -107,7 +107,7 @@ namespace OCP\Contacts {
*
* @param array $properties this array if key-value-pairs defines a contact
* @param string $address_book_key identifier of the address book in which the contact shall be created or updated
- * @return array representing the contact just created or updated
+ * @return array an array representing the contact just created or updated
*/
function createOrUpdate($properties, $address_book_key);
@@ -138,11 +138,10 @@ namespace OCP\Contacts {
* 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
* @return void
*/
- function register($key, \Closure $callable);
+ function register(\Closure $callable);
/**
* @return array
diff --git a/lib/public/db.php b/lib/public/db.php
index cb876b4d1f9f1a66a269812da79abba01fb8619e..ba3a4724ce012fe3ad13d24bfe2afbf44f1462e6 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -50,7 +50,7 @@ class DB {
/**
* Insert a row if a matching row doesn't exists.
* @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix
- * @param $input array
+ * @param array $input
*
* The input array if in the form:
*
diff --git a/lib/public/files/fileinfo.php b/lib/public/files/fileinfo.php
index 37162e09336ea79272a376df67ae7e6164ea0268..b9c8258f21eee7bf364468b39e2e31bae5d67a9b 100644
--- a/lib/public/files/fileinfo.php
+++ b/lib/public/files/fileinfo.php
@@ -104,7 +104,7 @@ interface FileInfo {
/**
* Check whether this is a file or a folder
*
- * @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER
+ * @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
*/
public function getType();
@@ -135,4 +135,18 @@ interface FileInfo {
* @return bool
*/
public function isShareable();
+
+ /**
+ * Check if a file or folder is shared
+ *
+ * @return bool
+ */
+ public function isShared();
+
+ /**
+ * Check if a file or folder is mounted
+ *
+ * @return bool
+ */
+ public function isMounted();
}
diff --git a/lib/public/files/storage.php b/lib/public/files/storage.php
index 5ec8ac6245cdb0027550f0fb17219ed9d0a0352c..323d20db564ee574448aeff584b6785cc8026988 100644
--- a/lib/public/files/storage.php
+++ b/lib/public/files/storage.php
@@ -327,4 +327,12 @@ interface Storage {
* @return bool true if the files are stored locally, false otherwise
*/
public function isLocal();
+
+ /**
+ * Check if the storage is an instance of $class or is a wrapper for a storage that is an instance of $class
+ *
+ * @param string $class
+ * @return bool
+ */
+ public function instanceOfStorage($class);
}
diff --git a/lib/public/iaddressbook.php b/lib/public/iaddressbook.php
index dcfe08012e67dbfc74a358883a30bcda976c90e4..70309e8c57a48082b72aeb982d823731e87bb4f7 100644
--- a/lib/public/iaddressbook.php
+++ b/lib/public/iaddressbook.php
@@ -45,7 +45,7 @@ namespace OCP {
* @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
+ * @return array an array of contacts which are arrays of key-value-pairs
*/
public function search($pattern, $searchProperties, $options);
// // dummy results
@@ -56,7 +56,7 @@ namespace OCP {
/**
* @param array $properties this array if key-value-pairs defines a contact
- * @return array representing the contact just created or updated
+ * @return array an array representing the contact just created or updated
*/
public function createOrUpdate($properties);
// // dummy
diff --git a/lib/public/iappconfig.php b/lib/public/iappconfig.php
index 2b014df2e420ded8bb221d7845c5948bb27d182c..d43eb70ee0450c7f85fa5c087b480e0df6644fc6 100644
--- a/lib/public/iappconfig.php
+++ b/lib/public/iappconfig.php
@@ -13,7 +13,7 @@ namespace OCP;
*/
interface IAppConfig {
/**
- * @brief check if a key is set in the appconfig
+ * check if a key is set in the appconfig
* @param string $app
* @param string $key
* @return bool
@@ -21,7 +21,7 @@ interface IAppConfig {
public function hasKey($app, $key);
/**
- * @brief Gets the config value
+ * Gets the config value
* @param string $app app
* @param string $key key
* @param string $default = null, default value if the key does not exist
@@ -33,7 +33,7 @@ interface IAppConfig {
public function getValue($app, $key, $default = null);
/**
- * @brief Deletes a key
+ * Deletes a key
* @param string $app app
* @param string $key key
* @return bool
@@ -43,9 +43,9 @@ interface IAppConfig {
public function deleteKey($app, $key);
/**
- * @brief Get the available keys for an app
+ * Get the available keys for an app
* @param string $app the app we are looking for
- * @return array with key names
+ * @return array an array of key names
*
* This function gets all keys of an app. Please note that the values are
* not returned.
@@ -62,7 +62,7 @@ interface IAppConfig {
public function getValues($app, $key);
/**
- * @brief sets a value in the appconfig
+ * sets a value in the appconfig
* @param string $app app
* @param string $key key
* @param string $value value
@@ -73,8 +73,8 @@ interface IAppConfig {
public function setValue($app, $key, $value);
/**
- * @brief Get all apps using the config
- * @return array with app ids
+ * Get all apps using the config
+ * @return array an array of app ids
*
* This function returns a list of all apps that have at least one
* entry in the appconfig table.
@@ -82,7 +82,7 @@ interface IAppConfig {
public function getApps();
/**
- * @brief Remove app from appconfig
+ * Remove app from appconfig
* @param string $app app
* @return bool
*
diff --git a/lib/public/iavatar.php b/lib/public/iavatar.php
index 43fa32556de5a8f284d6022035b9c45a5c9666b8..1e80682c4f749fb0ddc159bf3eea21e36abfd276 100644
--- a/lib/public/iavatar.php
+++ b/lib/public/iavatar.php
@@ -14,14 +14,14 @@ namespace OCP;
interface IAvatar {
/**
- * @brief get the users avatar
- * @param $size integer size in px of the avatar, avatars are square, defaults to 64
+ * get the users avatar
+ * @param int $size size in px of the avatar, avatars are square, defaults to 64
* @return boolean|\OC_Image containing the avatar or false if there's no image
*/
function get($size = 64);
/**
- * @brief sets the users avatar
+ * sets the users avatar
* @param Image $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
@@ -31,7 +31,7 @@ interface IAvatar {
function set($data);
/**
- * @brief remove the users avatar
+ * remove the users avatar
* @return void
*/
function remove();
diff --git a/lib/public/iavatarmanager.php b/lib/public/iavatarmanager.php
index 9b185ae0467b90897327993fd00bf9e5b7f62d35..1fd894059835d54a64eb0a55a3ca8eddad0c5d63 100644
--- a/lib/public/iavatarmanager.php
+++ b/lib/public/iavatarmanager.php
@@ -14,9 +14,9 @@ namespace OCP;
interface IAvatarManager {
/**
- * @brief return a user specific instance of \OCP\IAvatar
+ * return a user specific instance of \OCP\IAvatar
* @see \OCP\IAvatar
- * @param $user string the ownCloud user id
+ * @param string $user the ownCloud user id
* @return \OCP\IAvatar
*/
function getAvatar($user);
diff --git a/lib/public/idb.php b/lib/public/idb.php
new file mode 100644
index 0000000000000000000000000000000000000000..82a8a6815008f54b20e60c407a0ac0279e961fb8
--- /dev/null
+++ b/lib/public/idb.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.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;
+
+
+/**
+ * Small Facade for being able to inject the database connection for tests
+ */
+interface IDb {
+
+
+ /**
+ * 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 \OC_DB_StatementWrapper prepared SQL query
+ */
+ public function prepareQuery($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 getInsertId($tableName);
+
+
+}
diff --git a/lib/public/idbconnection.php b/lib/public/idbconnection.php
index 656b5e7e5b299723c76f6737f3a1a262d09509a5..3e6624e07e942079f2c2d771cc4f884d5203b76d 100644
--- a/lib/public/idbconnection.php
+++ b/lib/public/idbconnection.php
@@ -52,8 +52,8 @@ interface IDBConnection {
/**
* Insert a row if a matching row doesn't exists.
- * @param string The table name (will replace *PREFIX*) to perform the replace on.
- * @param array
+ * @param string $table The table name (will replace *PREFIX*) to perform the replace on.
+ * @param array $input
*
* The input array if in the form:
*
diff --git a/lib/public/il10n.php b/lib/public/il10n.php
index 1388274c21af4cd2e15379b2e1edafad2293ccf0..2c95ddfec181f88628a9f6aa4bd73060b6809d6b 100644
--- a/lib/public/il10n.php
+++ b/lib/public/il10n.php
@@ -53,7 +53,7 @@ interface IL10N {
* Localization
* @param string $type Type of localization
* @param array $data parameters for this localization
- * @return String or false
+ * @return string|false
*
* Returns the localized data.
*
@@ -72,4 +72,18 @@ interface IL10N {
* - params: timestamp (int/string)
*/
public function l($type, $data);
+
+
+ /**
+ * find the best language
+ * @param array|string $app details below
+ * @return string language
+ *
+ * If $app is an array, ownCloud assumes that these are the available
+ * languages. Otherwise ownCloud tries to find the files in the l10n
+ * folder.
+ *
+ * If nothing works it returns 'en'
+ */
+ public function getLanguageCode($app=null);
}
diff --git a/lib/public/ilogger.php b/lib/public/ilogger.php
new file mode 100644
index 0000000000000000000000000000000000000000..ad0fcd05a1deea665f1caad7cc5ee4eb625d12fa
--- /dev/null
+++ b/lib/public/ilogger.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright (c) 2014 Bernhard Posselt <dev@bernhard-posselt.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP;
+
+/**
+ * Interface ILogger
+ * @package OCP
+ *
+ * This logger interface follows the design guidelines of PSR-3
+ * https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#3-psrlogloggerinterface
+ */
+interface ILogger {
+ /**
+ * System is unusable.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ function emergency($message, array $context = array());
+
+ /**
+ * Action must be taken immediately.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ function alert($message, array $context = array());
+
+ /**
+ * Critical conditions.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ function critical($message, array $context = array());
+
+ /**
+ * Runtime errors that do not require immediate action but should typically
+ * be logged and monitored.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ function error($message, array $context = array());
+
+ /**
+ * Exceptional occurrences that are not errors.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ function warning($message, array $context = array());
+
+ /**
+ * Normal but significant events.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ function notice($message, array $context = array());
+
+ /**
+ * Interesting events.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ function info($message, array $context = array());
+
+ /**
+ * Detailed debug information.
+ *
+ * @param string $message
+ * @param array $context
+ * @return null
+ */
+ function debug($message, array $context = array());
+
+ /**
+ * Logs with an arbitrary level.
+ *
+ * @param mixed $level
+ * @param string $message
+ * @param array $context
+ * @return mixed
+ */
+ function log($level, $message, array $context = array());
+}
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 600d81d83af88297ab907168544fd33d63b61817..22176c36b8a39f206fa4553c3b3a75cafdffa2dd 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -113,6 +113,14 @@ interface IServerContainer {
*/
function getConfig();
+
+ /**
+ * Returns an instance of the db facade
+ * @return \OCP\IDb
+ */
+ function getDb();
+
+
/**
* Returns the app config manager
*
diff --git a/lib/public/itags.php b/lib/public/itags.php
index f8ebaa668f1fddaf55ff5e718c287d4be74248dc..1cba07e9b5377555730531404df0b22ef7b68193 100644
--- a/lib/public/itags.php
+++ b/lib/public/itags.php
@@ -62,7 +62,7 @@ interface ITags {
* ['id' => 1, 'name' = 'Second tag'],
* ]
*
- * @returns array
+ * @return array
*/
public function getTags();
diff --git a/lib/public/route/iroute.php b/lib/public/route/iroute.php
index d5610e762a82f0e94b701834155ce954448d41dc..f511e7af72097e28578bb92c926033623f07ed43 100644
--- a/lib/public/route/iroute.php
+++ b/lib/public/route/iroute.php
@@ -26,7 +26,7 @@ interface IRoute {
* The action to execute when this route matches, includes a file like
* it is called directly
*
- * @param $file
+ * @param string $file
* @return void
*/
public function actionInclude($file);
diff --git a/lib/public/share.php b/lib/public/share.php
index 230a517b5ee9f6351104e72d749e75cf765d7301..8566a38c61ef8eb3256e5ff61ec84f0f93340cb2 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -41,11 +41,11 @@ class Share extends \OC\Share\Constants {
/**
* Register a sharing backend class that implements OCP\Share_Backend for an item type
- * @param string Item type
- * @param string Backend class
- * @param string (optional) Depends on item type
- * @param array (optional) List of supported file extensions if this item type depends on files
- * @return Returns true if backend is registered or false if error
+ * @param string $itemType Item type
+ * @param string $class Backend class
+ * @param string $collectionOf (optional) Depends on item type
+ * @param array $supportedFileExtensions (optional) List of supported file extensions if this item type depends on files
+ * @return boolean true if backend is registered or false if error
*/
public static function registerBackend($itemType, $class, $collectionOf = null, $supportedFileExtensions = null) {
return \OC\Share\Share::registerBackend($itemType, $class, $collectionOf, $supportedFileExtensions);
@@ -53,7 +53,7 @@ class Share extends \OC\Share\Constants {
/**
* Check if the Share API is enabled
- * @return Returns true if enabled or false
+ * @return boolean true if enabled or false
*
* The Share API is enabled by default if not configured
*/
@@ -77,12 +77,12 @@ class Share extends \OC\Share\Constants {
/**
* Get the items of item type shared with the current user
- * @param string Item type
- * @param int Format (optional) Format type must be defined by the backend
- * @param mixed Parameters (optional)
- * @param int Number of items to return (optional) Returns all by default
- * @param bool include collections (optional)
- * @return Return depends on format
+ * @param string $itemType
+ * @param int $format (optional) Format type must be defined by the backend
+ * @param mixed $parameters (optional)
+ * @param int $limit Number of items to return (optional) Returns all by default
+ * @param bool $includeCollections (optional)
+ * @return mixed Return depends on format
*/
public static function getItemsSharedWith($itemType, $format = self::FORMAT_NONE,
$parameters = null, $limit = -1, $includeCollections = false) {
@@ -92,13 +92,13 @@ class Share extends \OC\Share\Constants {
/**
* Get the items of item type shared with a user
- * @param string Item type
- * @param sting user id for which user we want the shares
- * @param int Format (optional) Format type must be defined by the backend
- * @param mixed Parameters (optional)
- * @param int Number of items to return (optional) Returns all by default
- * @param bool include collections (optional)
- * @return Return depends on format
+ * @param string $itemType
+ * @param string $user for which user we want the shares
+ * @param int $format (optional) Format type must be defined by the backend
+ * @param mixed $parameters (optional)
+ * @param int $limit Number of items to return (optional) Returns all by default
+ * @param bool $includeCollections (optional)
+ * @return mixed Return depends on format
*/
public static function getItemsSharedWithUser($itemType, $user, $format = self::FORMAT_NONE,
$parameters = null, $limit = -1, $includeCollections = false) {
@@ -111,9 +111,9 @@ class Share extends \OC\Share\Constants {
* @param string $itemType
* @param string $itemTarget
* @param int $format (optional) Format type must be defined by the backend
- * @param mixed Parameters (optional)
- * @param bool include collections (optional)
- * @return Return depends on format
+ * @param mixed $parameters (optional)
+ * @param bool $includeCollections (optional)
+ * @return mixed Return depends on format
*/
public static function getItemSharedWith($itemType, $itemTarget, $format = self::FORMAT_NONE,
$parameters = null, $includeCollections = false) {
@@ -134,12 +134,12 @@ class Share extends \OC\Share\Constants {
/**
* Get the item of item type shared with the current user by source
- * @param string Item type
- * @param string Item source
- * @param int Format (optional) Format type must be defined by the backend
- * @param mixed Parameters
- * @param bool include collections
- * @return Return depends on format
+ * @param string $itemType
+ * @param string $itemSource
+ * @param int $format (optional) Format type must be defined by the backend
+ * @param mixed $parameters
+ * @param bool $includeCollections
+ * @return mixed Return depends on format
*/
public static function getItemSharedWithBySource($itemType, $itemSource, $format = self::FORMAT_NONE,
$parameters = null, $includeCollections = false) {
@@ -148,9 +148,9 @@ class Share extends \OC\Share\Constants {
/**
* Get the item of item type shared by a link
- * @param string Item type
- * @param string Item source
- * @param string Owner of link
+ * @param string $itemType
+ * @param string $itemSource
+ * @param string $uidOwner Owner of link
* @return Item
*/
public static function getItemSharedWithByLink($itemType, $itemSource, $uidOwner) {
@@ -160,7 +160,7 @@ class Share extends \OC\Share\Constants {
/**
* Based on the given token the share information will be returned - password protected shares will be verified
* @param string $token
- * @return array | bool false will be returned in case the token is unknown or unauthorized
+ * @return array|bool false will be returned in case the token is unknown or unauthorized
*/
public static function getShareByToken($token, $checkPasswordProtection = true) {
return \OC\Share\Share::getShareByToken($token, $checkPasswordProtection);
@@ -168,8 +168,8 @@ class Share extends \OC\Share\Constants {
/**
* resolves reshares down to the last real share
- * @param $linkItem
- * @return $fileOwner
+ * @param array $linkItem
+ * @return array file owner
*/
public static function resolveReShare($linkItem) {
return \OC\Share\Share::resolveReShare($linkItem);
@@ -178,12 +178,12 @@ class Share extends \OC\Share\Constants {
/**
* Get the shared items of item type owned by the current user
- * @param string Item type
- * @param int Format (optional) Format type must be defined by the backend
- * @param mixed Parameters
- * @param int Number of items to return (optional) Returns all by default
- * @param bool include collections
- * @return Return depends on format
+ * @param string $itemType
+ * @param int $format (optional) Format type must be defined by the backend
+ * @param mixed $parameters
+ * @param int $limit Number of items to return (optional) Returns all by default
+ * @param bool $includeCollections
+ * @return mixed Return depends on format
*/
public static function getItemsShared($itemType, $format = self::FORMAT_NONE, $parameters = null,
$limit = -1, $includeCollections = false) {
@@ -193,12 +193,12 @@ class Share extends \OC\Share\Constants {
/**
* Get the shared item of item type owned by the current user
- * @param string Item type
- * @param string Item source
- * @param int Format (optional) Format type must be defined by the backend
- * @param mixed Parameters
- * @param bool include collections
- * @return Return depends on format
+ * @param string $itemType
+ * @param string $itemSource
+ * @param int $format (optional) Format type must be defined by the backend
+ * @param mixed $parameters
+ * @param bool $includeCollections
+ * @return mixed Return depends on format
*/
public static function getItemShared($itemType, $itemSource, $format = self::FORMAT_NONE,
$parameters = null, $includeCollections = false) {
@@ -208,12 +208,12 @@ class Share extends \OC\Share\Constants {
/**
* Get all users an item is shared with
- * @param string Item type
- * @param string Item source
- * @param string Owner
- * @param bool Include collections
- * @praram bool check expire date
- * @return Return array of users
+ * @param string $itemType
+ * @param string $itemSource
+ * @param string $uidOwner
+ * @param bool $includeCollections
+ * @param bool $checkExpireDate
+ * @return array Return array of users
*/
public static function getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections = false, $checkExpireDate = true) {
return \OC\Share\Share::getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections, $checkExpireDate);
@@ -226,26 +226,22 @@ class Share extends \OC\Share\Constants {
* @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
* @param string $shareWith User or group the item is being shared with
* @param int $permissions CRUDS
- * @param null $itemSourceName
- * @throws \Exception
- * @internal param \OCP\Item $string type
- * @internal param \OCP\Item $string source
- * @internal param \OCP\SHARE_TYPE_USER $int , SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
- * @internal param \OCP\User $string or group the item is being shared with
- * @internal param \OCP\CRUDS $int permissions
+ * @param string $itemSourceName
+ * @param \DateTime $expirationDate
* @return bool|string Returns true on success or false on failure, Returns token on success for links
+ * @throws \Exception
*/
- public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName = null) {
- return \OC\Share\Share::shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName);
+ public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName = null, \DateTime $expirationDate = null) {
+ return \OC\Share\Share::shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName, $expirationDate);
}
/**
* Unshare an item from a user, group, or delete a private link
- * @param string Item type
- * @param string Item source
- * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
- * @param string User or group the item is being shared with
- * @return Returns true on success or false on failure
+ * @param string $itemType
+ * @param string $itemSource
+ * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+ * @param string $shareWith User or group the item is being shared with
+ * @return boolean true on success or false on failure
*/
public static function unshare($itemType, $itemSource, $shareType, $shareWith) {
return \OC\Share\Share::unshare($itemType, $itemSource, $shareType, $shareWith);
@@ -253,9 +249,9 @@ class Share extends \OC\Share\Constants {
/**
* Unshare an item from all users, groups, and remove all links
- * @param string Item type
- * @param string Item source
- * @return Returns true on success or false on failure
+ * @param string $itemType
+ * @param string $itemSource
+ * @return boolean true on success or false on failure
*/
public static function unshareAll($itemType, $itemSource) {
return \OC\Share\Share::unshareAll($itemType, $itemSource);
@@ -263,15 +259,16 @@ class Share extends \OC\Share\Constants {
/**
* Unshare an item shared with the current user
- * @param string Item type
- * @param string Item target
- * @return Returns true on success or false on failure
+ * @param string $itemType
+ * @param string $itemTarget
+ * @return boolean true on success or false on failure
*
* Unsharing from self is not allowed for items inside collections
*/
public static function unshareFromSelf($itemType, $itemTarget) {
return \OC\Share\Share::unshareFromSelf($itemType, $itemTarget);
}
+
/**
* sent status if users got informed by mail about share
* @param string $itemType
@@ -285,12 +282,12 @@ class Share extends \OC\Share\Constants {
/**
* Set the permissions of an item for a specific user or group
- * @param string Item type
- * @param string Item source
- * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
- * @param string User or group the item is being shared with
- * @param int CRUDS permissions
- * @return Returns true on success or false on failure
+ * @param string $itemType
+ * @param string $itemSource
+ * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+ * @param string $shareWith User or group the item is being shared with
+ * @param int $permissions CRUDS permissions
+ * @return boolean true on success or false on failure
*/
public static function setPermissions($itemType, $itemSource, $shareType, $shareWith, $permissions) {
return \OC\Share\Share::setPermissions($itemType, $itemSource, $shareType, $shareWith, $permissions);
@@ -301,7 +298,7 @@ class Share extends \OC\Share\Constants {
* @param string $itemType
* @param string $itemSource
* @param string $date expiration date
- * @return Share_Backend
+ * @return boolean
*/
public static function setExpirationDate($itemType, $itemSource, $date) {
return \OC\Share\Share::setExpirationDate($itemType, $itemSource, $date);
@@ -340,23 +337,20 @@ class Share extends \OC\Share\Constants {
interface Share_Backend {
/**
- * Get the source of the item to be stored in the database
- * @param string Item source
- * @param string Owner of the item
- * @return mixed|array|false Source
+ * Check if this $itemSource exist for the user
+ * @param string $itemSource
+ * @param string $uidOwner Owner of the item
+ * @return boolean|null Source
*
- * Return an array if the item is file dependent, the array needs two keys: 'item' and 'file'
* Return false if the item does not exist for the user
- *
- * The formatItems() function will translate the source returned back into the item
*/
public function isValidSource($itemSource, $uidOwner);
/**
* Get a unique name of the item for the specified user
- * @param string Item source
- * @param string|false User the item is being shared with
- * @param array|null List of similar item names already existing as shared items
+ * @param string $itemSource
+ * @param string|false $shareWith User the item is being shared with
+ * @param array|null $exclude List of similar item names already existing as shared items
* @return string Target name
*
* This function needs to verify that the user does not already have an item with this name.
@@ -366,8 +360,8 @@ interface Share_Backend {
/**
* Converts the shared item sources back into the item in the specified format
- * @param array Shared items
- * @param int Format
+ * @param array $items Shared items
+ * @param int $format
* @return TODO
*
* The items array is a 3-dimensional array with the item_source as the
@@ -397,8 +391,9 @@ interface Share_Backend_File_Dependent extends Share_Backend {
/**
* Get the file path of the item
- * @param string Item source
- * @param string User that is the owner of shared item
+ * @param string $itemSource
+ * @param string $uidOwner User that is the owner of shared item
+ * @return string|false
*/
public function getFilePath($itemSource, $uidOwner);
@@ -412,7 +407,7 @@ interface Share_Backend_Collection extends Share_Backend {
/**
* Get the sources of the children of the item
- * @param string Item source
+ * @param string $itemSource
* @return array Returns an array of children each inside an array with the keys: source, target, and file_path if applicable
*/
public function getChildren($itemSource);
diff --git a/lib/public/template.php b/lib/public/template.php
index 6cc984b12d5f03ed119877db758553797133a261..b1264e0c3ad2c90e71f4c9332eebcc2b06b8acca 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -33,8 +33,8 @@ namespace OCP;
/**
* Make OC_Helper::imagePath available as a simple function
- * @param string app
- * @param string image
+ * @param string $app
+ * @param string $image
* @return string to the image
*
* @see OC_Helper::imagePath
@@ -46,7 +46,7 @@ function image_path( $app, $image ) {
/**
* Make OC_Helper::mimetypeIcon available as a simple function
- * @param string mimetype
+ * @param string $mimetype
* @return string to the image of this file type.
*/
function mimetype_icon( $mimetype ) {
@@ -55,7 +55,7 @@ function mimetype_icon( $mimetype ) {
/**
* Make preview_icon available as a simple function
- * @param string path of file
+ * @param string $path path to file
* @return string to the preview of the image
*/
function preview_icon( $path ) {
@@ -76,7 +76,7 @@ function publicPreview_icon ( $path, $token ) {
/**
* Make OC_Helper::humanFileSize available as a simple function
* Example: 2048 to 2 kB.
- * @param int size in bytes
+ * @param int $size in bytes
* @return string size as string
*/
function human_file_size( $bytes ) {
@@ -86,8 +86,8 @@ function human_file_size( $bytes ) {
/**
* Return the relative date in relation to today. Returns something like "last hour" or "two month ago"
- * @param int unix timestamp
- * @param boolean date only
+ * @param int $timestamp unix timestamp
+ * @param boolean $dateOnly
* @return OC_L10N_String human readable interpretation of the timestamp
*/
function relative_modified_date( $timestamp, $dateOnly = false ) {
@@ -98,7 +98,7 @@ function relative_modified_date( $timestamp, $dateOnly = false ) {
/**
* Return a human readable outout for a file size.
* @deprecated human_file_size() instead
- * @param integer size of a file in byte
+ * @param integer $bytes size of a file in byte
* @return string human readable interpretation of a file size
*/
function simple_file_size($bytes) {
@@ -108,9 +108,9 @@ function simple_file_size($bytes) {
/**
* Generate html code for an options block.
- * @param $options the options
- * @param $selected which one is selected?
- * @param array the parameters
+ * @param array $options the options
+ * @param mixed $selected which one is selected?
+ * @param array $params the parameters
* @return string html options
*/
function html_select_options($options, $selected, $params=array()) {
diff --git a/lib/public/user.php b/lib/public/user.php
index 7bac938b838815eb628f8416b4d2bd46c5f84648..925410d37d54946122dcb1dc40bbc473ed30cf06 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -45,10 +45,10 @@ class User {
/**
* Get a list of all users
- * @param string search pattern
- * @param integer $limit
- * @param integer $offset
- * @return array with all uids
+ * @param string $search search pattern
+ * @param int|null $limit
+ * @param int|null $offset
+ * @return array an array of all uids
*/
public static function getUsers( $search = '', $limit = null, $offset = null ) {
return \OC_User::getUsers( $search, $limit, $offset );
@@ -56,7 +56,7 @@ class User {
/**
* Get the user display name of the user currently logged in.
- * @param string user id or null for current user
+ * @param string|null $user user id or null for current user
* @return string display name
*/
public static function getDisplayName( $user = null ) {
@@ -65,10 +65,10 @@ class User {
/**
* Get a list of all display names and user ids.
- * @param string search pattern
- * @param int limit
- * @param int offset
- * @return array with all display names (value) and the correspondig uids (key)
+ * @param string $search search pattern
+ * @param int|null $limit
+ * @param int|null $offset
+ * @return array an array of all display names (value) and the correspondig uids (key)
*/
public static function getDisplayNames( $search = '', $limit = null, $offset = null ) {
return \OC_User::getDisplayNames( $search, $limit, $offset );
diff --git a/lib/public/util.php b/lib/public/util.php
index f06ddd666418ac74771da9736896b15786d5b9fe..d1faec3997f8e901acd5d71519455e7ba4afcb5a 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -86,21 +86,22 @@ class Util {
* if DEBUG mode is enabled
* @param string $app app name
* @param \Exception $ex exception to log
+ * @param string $level log level, defaults to \OCP\Util::FATAL
*/
- public static function logException( $app, \Exception $ex ) {
+ public static function logException( $app, \Exception $ex, $level = \OCP\Util::FATAL ) {
$class = get_class($ex);
$message = $class . ': ' . $ex->getMessage();
if ($ex->getCode()) {
$message .= ' [' . $ex->getCode() . ']';
}
- \OCP\Util::writeLog($app, $message, \OCP\Util::FATAL);
+ \OCP\Util::writeLog($app, $message, $level);
if (defined('DEBUG') and DEBUG) {
// also log stack trace
$stack = explode("\n", $ex->getTraceAsString());
// first element is empty
array_shift($stack);
foreach ($stack as $s) {
- \OCP\Util::writeLog($app, 'Exception: ' . $s, \OCP\Util::FATAL);
+ \OCP\Util::writeLog($app, 'Exception: ' . $s, $level);
}
// include cause
@@ -110,11 +111,20 @@ class Util {
if ($ex->getCode()) {
$message .= '[' . $ex->getCode() . '] ';
}
- \OCP\Util::writeLog($app, 'Exception: ' . $message, \OCP\Util::FATAL);
+ \OCP\Util::writeLog($app, 'Exception: ' . $message, $level);
}
}
}
+ /**
+ * check if sharing is disabled for the current user
+ *
+ * @return boolean
+ */
+ public static function isSharingDisabledForUser() {
+ return \OC_Util::isSharingDisabledForUser();
+ }
+
/**
* get l10n object
* @param string $application
@@ -202,7 +212,7 @@ class Util {
/**
* Creates an url using a defined route
- * @param $route
+ * @param string $route
* @param array $parameters
* @internal param array $args with param=>value, will be appended to the returned url
* @return string the url
@@ -292,7 +302,7 @@ class Util {
/**
* Returns the script name, even if the website uses one or more reverse proxies
- * @returns string the script name
+ * @return string the script name
*/
public static function getScriptName() {
return(\OC_Request::scriptName());
@@ -379,8 +389,8 @@ class 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|array of strings
- * @return array with sanitized strings or a single sinitized string, depends on the input parameter.
+ * @param string|array $value
+ * @return string|array an array of sanitized strings or a single sinitized string, depends on the input parameter.
*/
public static function sanitizeHTML( $value ) {
return(\OC_Util::sanitizeHTML($value));
@@ -457,7 +467,7 @@ class Util {
*
* @param string $dir the current folder where the user currently operates
* @param int $free the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly
- * @return number of bytes representing
+ * @return int number of bytes representing
*/
public static function maxUploadFilesize($dir, $free = null) {
return \OC_Helper::maxUploadFilesize($dir, $free);
@@ -475,7 +485,7 @@ class Util {
/**
* Calculate PHP upload limit
*
- * @return number of bytes representing
+ * @return int number of bytes representing
*/
public static function uploadLimit() {
return \OC_Helper::uploadLimit();
@@ -483,7 +493,7 @@ class Util {
/**
* Returns whether the given file name is valid
- * @param $file string file name to check
+ * @param string $file file name to check
* @return bool true if the file name is valid, false otherwise
*/
public static function isValidFileName($file) {
@@ -491,11 +501,19 @@ class Util {
}
/**
- * @brief Generates a cryptographic secure pseudo-random string
- * @param Int $length of the random string
- * @return String
+ * Generates a cryptographic secure pseudo-random string
+ * @param int $length of the random string
+ * @return string
*/
public static function generateRandomBytes($length = 30) {
return \OC_Util::generateRandomBytes($length);
}
+
+ /**
+ * check if a password is required for each public link
+ * @return boolean
+ */
+ public static function isPublicLinkPasswordRequired() {
+ return \OC_Util::isPublicLinkPasswordRequired();
+ }
}
diff --git a/settings/admin.php b/settings/admin.php
index 49dde59ce2a5a1acf7b01dacf0067b2a8ee4cbd0..a0769892ef44d553b9368ab65dc520c9f913918b 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -10,6 +10,7 @@ OC_Util::checkAdminUser();
OC_Util::addStyle( "settings", "settings" );
OC_Util::addScript( "settings", "admin" );
OC_Util::addScript( "settings", "log" );
+OC_Util::addScript( 'core', 'multiselect' );
OC_App::setActiveNavigationEntry( "admin" );
$tmpl = new OC_Template( 'settings', 'admin', 'user');
@@ -38,6 +39,7 @@ $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('isAnnotationsWorking', OC_Util::isAnnotationsWorking());
$tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
$tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
$tmpl->assign('old_php', OC_Util::isPHPoutdated());
@@ -48,6 +50,23 @@ $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enable
$tmpl->assign('shareDefaultExpireDateSet', OC_Appconfig::getValue('core', 'shareapi_default_expire_date', 'no'));
$tmpl->assign('shareExpireAfterNDays', OC_Appconfig::getValue('core', 'shareapi_expire_after_n_days', '7'));
$tmpl->assign('shareEnforceExpireDate', OC_Appconfig::getValue('core', 'shareapi_enforce_expire_date', 'no'));
+$excludeGroups = OC_Appconfig::getValue('core', 'shareapi_exclude_groups', 'no') === 'yes' ? true : false;
+$tmpl->assign('shareExcludeGroups', $excludeGroups);
+$allGroups = OC_Group::getGroups();
+$excludedGroupsList = OC_Appconfig::getValue('core', 'shareapi_exclude_groups_list', '');
+$excludedGroups = $excludedGroupsList !== '' ? explode(',', $excludedGroupsList) : array();
+$groups = array();
+foreach ($allGroups as $group) {
+ if (in_array($group, $excludedGroups)) {
+ $groups[$group] = array('gid' => $group,
+ 'excluded' => true);
+ } else {
+ $groups[$group] = array('gid' => $group,
+ 'excluded' => false);
+ }
+}
+ksort($groups);
+$tmpl->assign('groups', $groups);
// Check if connected using HTTPS
@@ -60,6 +79,7 @@ $tmpl->assign('isConnectedViaHTTPS', $connectedHTTPS);
$tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false));
$tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
+$tmpl->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired());
$tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'));
$tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
$tmpl->assign('allowMailNotification', OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'yes'));
diff --git a/settings/ajax/decryptall.php b/settings/ajax/decryptall.php
index d12df230d41c83f0f8d58b4d743ae60121452b61..55685f778d16b8801ed06b9bf3fee8f5033d7541 100644
--- a/settings/ajax/decryptall.php
+++ b/settings/ajax/decryptall.php
@@ -10,7 +10,7 @@ OC_App::loadApp('files_encryption');
$params = array('uid' => \OCP\User::getUser(),
'password' => $_POST['password']);
-$view = new OC_FilesystemView('/');
+$view = new OC\Files\View('/');
$util = new \OCA\Encryption\Util($view, \OCP\User::getUser());
$l = \OC_L10N::get('settings');
diff --git a/settings/ajax/deletekeys.php b/settings/ajax/deletekeys.php
new file mode 100644
index 0000000000000000000000000000000000000000..1f84452e1178cf63c8e91cd47c02fe76a0d69082
--- /dev/null
+++ b/settings/ajax/deletekeys.php
@@ -0,0 +1,17 @@
+<?php
+
+OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+
+$l = \OC_L10N::get('settings');
+$user = \OC_User::getUser();
+$view = new \OC\Files\View('/' . $user . '/files_encryption');
+
+$keyfilesDeleted = $view->deleteAll('keyfiles.backup');
+$sharekeysDeleted = $view->deleteAll('share-keys.backup');
+
+if ($keyfilesDeleted && $sharekeysDeleted) {
+ \OCP\JSON::success(array('data' => array('message' => $l->t('Encryption keys deleted permanently'))));
+} else {
+ \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t permanently delete your encryption keys, please check your owncloud.log or ask your administrator'))));
+}
diff --git a/settings/ajax/excludegroups.php b/settings/ajax/excludegroups.php
new file mode 100644
index 0000000000000000000000000000000000000000..2934a448a6ae4bb967f56231b99c97835d2724d7
--- /dev/null
+++ b/settings/ajax/excludegroups.php
@@ -0,0 +1,18 @@
+<?php
+OC_JSON::checkSubAdminUser();
+OCP\JSON::callCheck();
+
+$selectedGroups = isset($_POST["selectedGroups"]) ? json_decode($_POST["selectedGroups"]) : array();
+$changedGroup = isset($_POST["changedGroup"]) ? $_POST["changedGroup"] : '';
+
+if ($changedGroup !== '') {
+ if(($key = array_search($changedGroup, $selectedGroups)) !== false) {
+ unset($selectedGroups[$key]);
+ } else {
+ $selectedGroups[] = $changedGroup;
+ }
+} else {
+ \OCP\Util::writeLog('core', 'Can not update list of excluded groups from sharing, parameter missing', \OCP\Util::WARN);
+}
+
+\OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', implode(',', $selectedGroups));
diff --git a/settings/ajax/restorekeys.php b/settings/ajax/restorekeys.php
new file mode 100644
index 0000000000000000000000000000000000000000..68e19c90457146cab0d418f1770335b54b95d95d
--- /dev/null
+++ b/settings/ajax/restorekeys.php
@@ -0,0 +1,24 @@
+<?php
+
+OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+
+$l = \OC_L10N::get('settings');
+$user = \OC_User::getUser();
+$view = new \OC\Files\View('/' . $user . '/files_encryption');
+
+$keyfilesRestored = $view->rename('keyfiles.backup', 'keyfiles');
+$sharekeysRestored = $view->rename('share-keys.backup' , 'share-keys');
+
+if ($keyfilesRestored && $sharekeysRestored) {
+ \OCP\JSON::success(array('data' => array('message' => $l->t('Backups restored successfully'))));
+} else {
+ // if one of the move operation was succesful we remove the files back to have a consistent state
+ if($keyfilesRestored) {
+ $view->rename('keyfiles', 'keyfiles.backup');
+ }
+ if($sharekeysRestored) {
+ $view->rename('share-keys' , 'share-keys.backup');
+ }
+ \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t restore your encryption keys, please check your owncloud.log or ask your administrator'))));
+}
diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
index 9f1e732996412455e0dc9b5bb41a0815915ddf5b..052715555e5c0adc9c31add343da7db22fc17569 100644
--- a/settings/changepassword/controller.php
+++ b/settings/changepassword/controller.php
@@ -52,7 +52,7 @@ class Controller {
if (\OC_App::isEnabled('files_encryption')) {
//handle the recovery case
- $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
+ $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $username);
$recoveryAdminEnabled = \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
$validRecoveryPassword = false;
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 5d8f9a7541cfb47a6a4a7e10e37fa2eb1df733be..be6cfe1e9bfe73e32017d62d5910763765f7e16c 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -103,8 +103,8 @@ select.quota.active { background: #fff; }
#app-navigation.appwarning:hover {
background: #fbb;
}
-small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;}
-small.recommendedapp { color:#FFF; background-color:#888; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;}
+small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 3px;}
+small.recommendedapp { color:#FFF; background-color:#888; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 3px;}
small.externalapp.list, small.recommendedapp.list { position: absolute; right: 10px; top: 12px; }
span.version { margin-left:1em; margin-right:1em; color:#555; }
@@ -132,7 +132,8 @@ table.grid td.date{
span.securitywarning {color:#C33; font-weight:bold; }
span.connectionwarning {color:#933; font-weight:bold; }
table.shareAPI td { padding-bottom: 0.8em; }
-table.shareAPI input#shareapi_expire_after_n_days {width: 25px;}
+table.shareAPI input#shareapiExpireAfterNDays {width: 25px;}
+table.shareAPI .indent { padding-left: 2em; }
#mail_settings p label:first-child {
display: inline-block;
@@ -157,9 +158,18 @@ table.shareAPI input#shareapi_expire_after_n_days {width: 25px;}
vertical-align: text-bottom;
}
+#selectGroups select {
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+ display: inline-block;
+ height: 36px;
+ padding: 7px 10px
+}
+
span.success {
background: #37ce02;
- border-radius: 8px;
+ border-radius: 3px;
}
span.error {
diff --git a/settings/js/admin.js b/settings/js/admin.js
index c04c0505deb3d602f91680aa81e838e6d41424cd..bc95c6a3dc52d2e058d6ec025ff48bb849d9c8f3 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -1,4 +1,49 @@
+var SharingGroupList = {
+ applyMultipleSelect: function(element) {
+ var checked = [];
+ if ($(element).hasClass('groupsselect')) {
+ if (element.data('userGroups')) {
+ checked = element.data('userGroups');
+ }
+ var checkHandeler = function(group) {
+ $.post(OC.filePath('settings', 'ajax', 'excludegroups.php'),
+ {changedGroup: group, selectedGroups: JSON.stringify(checked)},
+ function() {});
+ };
+
+
+ var addGroup = function(select, group) {
+ $(this).each(function(index, element) {
+ if ($(element).find('option[value="' + group + '"]').length === 0 &&
+ select.data('msid') !== $(element).data('msid')) {
+ $(element).append('<option value="' + escapeHTML(group) + '">' +
+ escapeHTML(group) + '</option>');
+ }
+ });
+ };
+
+ var label = null;
+ element.multiSelect({
+ createCallback: addGroup,
+ createText: label,
+ selectedFirst: true,
+ checked: checked,
+ oncheck: checkHandeler,
+ onuncheck: checkHandeler,
+ minWidth: 100
+ });
+
+ }
+ }
+};
+
$(document).ready(function(){
+
+ $('select#excludedGroups[multiple]').each(function (index, element) {
+ SharingGroupList.applyMultipleSelect($(element));
+ });
+
+
$('#loglevel').change(function(){
$.post(OC.filePath('settings','ajax','setloglevel.php'), { level: $(this).val() },function(){
OC.Log.reload();
@@ -31,6 +76,14 @@ $(document).ready(function(){
OC.AppConfig.setValue('core', $(this).attr('name'), value);
});
+ $('#shareapiDefaultExpireDate').change(function() {
+ $("#setDefaultExpireDate").toggleClass('hidden', !this.checked);
+ });
+
+ $('#allowLinks').change(function() {
+ $("#publicLinkSettings").toggleClass('hidden', !this.checked);
+ });
+
$('#security').change(function(){
$.post(OC.filePath('settings','ajax','setsecurity.php'), { enforceHTTPS: $('#forcessl').val() },function(){} );
});
@@ -65,7 +118,7 @@ $(document).ready(function(){
OC.msg.startSaving('#mail_settings_msg');
var post = $( "#mail_settings" ).serialize();
$.post(OC.generateUrl('/settings/admin/mailsettings'), post, function(data){
- OC.msg.finishedSaving('#mail_settings .msg', data);
+ OC.msg.finishedSaving('#mail_settings_msg', data);
});
});
@@ -76,4 +129,8 @@ $(document).ready(function(){
OC.msg.finishedAction('#sendtestmail_msg', data);
});
});
+
+ $('#shareapiExcludeGroups').change(function() {
+ $("#selectExcludedGroups").toggleClass('hidden', !this.checked);
+ });
});
diff --git a/settings/js/personal.js b/settings/js/personal.js
index c1f1ef7466b9ee3f71469f748cd6835faf1503e9..f56dd3425f7666cc7946878af42cd53b55389e08 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -26,7 +26,7 @@ jQuery.fn.keyUpDelayedOrEnter = function(callback){
}
}, 1000));
- this.keypress(function () {
+ this.keypress(function (event) {
if (event.keyCode === 13 && that.val() !== '' ){
event.preventDefault();
cb();
@@ -212,17 +212,30 @@ $(document).ready(function(){
OC.Encryption.decryptAll(privateKeyPassword);
});
+
+ $('button:button[name="submitRestoreKeys"]').click(function() {
+ $('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", true);
+ $('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", true);
+ OC.Encryption.restoreKeys();
+ });
+
+ $('button:button[name="submitDeleteKeys"]').click(function() {
+ $('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", true);
+ $('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", true);
+ OC.Encryption.deleteKeys();
+ });
+
$('#decryptAll input:password[name="privateKeyPassword"]').keyup(function(event) {
var privateKeyPassword = $('#decryptAll input:password[id="privateKeyPassword"]').val();
if (privateKeyPassword !== '' ) {
- $('#decryptAll button:button[name="submitDecryptAll"]').removeAttr("disabled");
+ $('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", false);
if(event.which === 13) {
$('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", true);
$('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", true);
OC.Encryption.decryptAll(privateKeyPassword);
}
} else {
- $('#decryptAll button:button[name="submitDecryptAll"]').attr("disabled", "true");
+ $('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", true);
}
});
@@ -294,29 +307,59 @@ $(document).ready(function(){
OC.Encryption = {
decryptAll: function(password) {
- OC.Encryption.msg.startDecrypting('#decryptAll .msg');
+ var message = t('settings', 'Decrypting files... Please wait, this can take some time.');
+ OC.Encryption.msg.start('#decryptAll .msg', message);
$.post('ajax/decryptall.php', {password:password}, function(data) {
if (data.status === "error") {
- OC.Encryption.msg.finishedDecrypting('#decryptAll .msg', data);
- $('#decryptAll input:password[name="privateKeyPassword"]').removeAttr("disabled");
+ OC.Encryption.msg.finished('#decryptAll .msg', data);
+ $('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", false);
+ } else {
+ OC.Encryption.msg.finished('#decryptAll .msg', data);
+ }
+ $('#restoreBackupKeys').removeClass('hidden');
+ });
+ },
+
+ deleteKeys: function() {
+ var message = t('settings', 'Delete encryption keys permanently.');
+ OC.Encryption.msg.start('#restoreBackupKeys .msg', message);
+ $.post('ajax/deletekeys.php', null, function(data) {
+ if (data.status === "error") {
+ OC.Encryption.msg.finished('#restoreBackupKeys .msg', data);
+ $('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", false);
+ $('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", false);
+ } else {
+ OC.Encryption.msg.finished('#restoreBackupKeys .msg', data);
+ }
+ });
+ },
+
+ restoreKeys: function() {
+ var message = t('settings', 'Restore encryption keys.');
+ OC.Encryption.msg.start('#restoreBackupKeys .msg', message);
+ $.post('ajax/restorekeys.php', {}, function(data) {
+ if (data.status === "error") {
+ OC.Encryption.msg.finished('#restoreBackupKeys .msg', data);
+ $('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", false);
+ $('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", false);
} else {
- OC.Encryption.msg.finishedDecrypting('#decryptAll .msg', data);
+ OC.Encryption.msg.finished('#restoreBackupKeys .msg', data);
}
});
}
};
OC.Encryption.msg={
- startDecrypting:function(selector){
+ start:function(selector, msg){
var spinner = '<img src="'+ OC.imagePath('core', 'loading-small.gif') +'">';
$(selector)
- .html( t('settings', 'Decrypting files... Please wait, this can take some time.') + ' ' + spinner )
+ .html( msg + ' ' + spinner )
.removeClass('success')
.removeClass('error')
.stop(true, true)
.show();
},
- finishedDecrypting:function(selector, data){
+ finished:function(selector, data){
if( data.status === "success" ){
$(selector).html( data.data.message )
.addClass('success')
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index d62c69adfac7192ed90ffab61f96099bc24af070..719129d6be2c50d10756b2999e29c358dcd1dcac 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -93,9 +93,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Ø§Ù„Ø³Ù…Ø§Ø Ø¨Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ© عن طريق الAPI ",
"Allow apps to use the Share API" => "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„ØªØ·Ø¨ÙŠÙ‚Ø§Øª بالمشاركة عن طريق الAPI",
"Allow links" => "Ø§Ù„Ø³Ù…Ø§Ø Ø¨Ø§Ù„Ø¹Ù†Ø§ÙˆÙŠÙ†",
-"Allow users to share items to the public with links" => "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ¹Ù…Ù„ÙŠÙ† بمشاركة البنود للعموم عن طريق الروابط ",
"Allow public uploads" => "Ø§Ù„Ø³Ù…Ø§Ø Ø¨Ø§Ù„Ø±Ùع للعامة ",
-"Allow users to enable others to upload into their publicly shared folders" => "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† بتÙعيل الرÙع للاخرين من خلال مجلد المشاركة العام ",
+"Allow users to share items to the public with links" => "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ¹Ù…Ù„ÙŠÙ† بمشاركة البنود للعموم عن طريق الروابط ",
"Allow resharing" => "Ø§Ù„Ø³Ù…Ø§Ø Ø¨Ø¥Ø¹Ø§Ø¯Ø© المشاركة ",
"Allow users to share items shared with them again" => "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† باعادة مشاركة الملÙات التي تم مشاركتها معهم",
"Allow users to share with anyone" => "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ¹Ù…Ù„ÙŠÙ† بإعادة المشاركة مع أي Ø£Øد ",
@@ -147,8 +146,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "اختر صورة المل٠الشخصي",
"Language" => "اللغة",
"Help translate" => "ساعد ÙÙŠ الترجمه",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "استخدم هذا العنوان لـ <a href=\"%s\" target=\"_blank\">الدخول الى ملÙاتك عن طريق WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "البرنامج المشÙر لم يعد Ù…Ùعل, يرجى ÙÙƒ التشÙير عن كل ملÙاتك",
"Log-in password" => "كلمه سر الدخول",
"Decrypt all Files" => "ÙÙƒ تشÙير جميع الملÙات ",
diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php
index 99dc480038f0d4128c39e2c18e490bdfc45f9210..fd7a61469725153d2f905caef31f7068be96b6de 100644
--- a/settings/l10n/ast.php
+++ b/settings/l10n/ast.php
@@ -19,10 +19,13 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Descifráronse los ficheros",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nun pudieron descifrase sus ficheros. Revisa'l owncloud.log o consulta col alministrador",
"Couldn't decrypt your files, check your password and try again" => "Nun pudieron descifrase los ficheros. Revisa la contraseña ya inténtalo dempués",
+"Encryption keys deleted permanently" => "Desaniciaes dafechu les claves de cifráu",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nun pudieron desaniciase dafechu les tos claves d'encriptación, por favor comprueba'l to owncloud.log o entruga a un alministrador",
"Email saved" => "Corréu-e guardáu",
"Invalid email" => "Corréu electrónicu non válidu",
"Unable to delete group" => "Nun pudo desaniciase'l grupu",
"Unable to delete user" => "Nun pudo desaniciase l'usuariu",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nun pudieron restaurase dafechu les tos claves d'encriptación, por favor comprueba'l to owncloud.log o entruga a un alministrador",
"Language changed" => "Camudóse la llingua",
"Invalid request" => "Solicitú inválida",
"Admins can't remove themself from the admin group" => "Los alministradores nun puen desaniciase a ellos mesmos del grupu d'alministrador",
@@ -56,6 +59,8 @@ $TRANSLATIONS = array(
"Good password" => "Contraseña bona",
"Strong password" => "Contraseña mui bona",
"Decrypting files... Please wait, this can take some time." => "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu.",
+"Delete encryption keys permanently." => "Desanciar dafechu les claves de cifráu.",
+"Restore encryption keys." => "Restaurar claves de cifráu.",
"deleted" => "desaniciáu",
"undo" => "desfacer",
"Unable to remove user" => "Imposible desaniciar al usuariu",
@@ -106,20 +111,18 @@ $TRANSLATIONS = array(
"Enable Share API" => "Activar API de Compartición",
"Allow apps to use the Share API" => "Permitir a les aplicaciones usar la API de Compartición",
"Allow links" => "Permitir enllaces",
-"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos col públicu per aciu d'enllaces",
"Allow public uploads" => "Permitir xubes públiques",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir a los usuarios habilitar a otros pa xubir ficheros nes sos carpetes compartÃes públicamente",
+"Set default expiration date" => "Afitar la data d'espiración predeterminada",
+"Expire after " => "Caduca dempués de",
+"days" => "dÃes",
+"Enforce expiration date" => "Facer cumplir la data de caducidá",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos col públicu per aciu d'enllaces",
"Allow resharing" => "Permitir re-compartición",
"Allow users to share items shared with them again" => "Permitir a los usuarios compartir de nuevu elementos ya compartÃos",
"Allow users to share with anyone" => "Permitir a los usuarios compartir con cualesquier persona",
"Allow users to only share with users in their groups" => "Permitir a los usuarios compartir namái colos usuarios nos sos grupos",
"Allow mail notification" => "Permitir notificaciones per corréu-e",
"Allow users to send mail notification for shared files" => "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartÃos",
-"Set default expiration date" => "Afitar la data d'espiración predeterminada",
-"Expire after " => "Caduca dempués de",
-"days" => "dÃes",
-"Enforce expiration date" => "Facer cumplir la data de caducidá",
-"Expire shares by default after N days" => "Ficheros compartÃos caduquen dempués de N dÃes",
"Security" => "Seguridá",
"Enforce HTTPS" => "Forciar HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Forciar a los veceros a coneutase a %s per duana d'una conexón cifrada.",
@@ -176,11 +179,11 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Esbillar como imaxe de perfil",
"Language" => "Llingua",
"Help translate" => "Ayúdanos nes traducciones",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Usa esta direición pa <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a los ficheros a traviés de WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "L'aplicación de cifráu yá nun ta activada, descifra tolos ficheros",
"Log-in password" => "Contraseña d'accesu",
"Decrypt all Files" => "Descifrar ficheros",
+"Restore Encryption Keys" => "Restaurar claves de cifráu.",
+"Delete Encryption Keys" => "Desaniciar claves de cifráu",
"Login Name" => "Nome d'usuariu",
"Create" => "Crear",
"Admin Recovery Password" => "Recuperación de la contraseña d'alministración",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 4715447b7f9b3d9769eefe227e0fc8caac7689ca..9573343a1d6e76c95f7261c20ea72a66bc789046 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -54,7 +54,6 @@ $TRANSLATIONS = array(
"Cancel" => "Отказ",
"Language" => "Език",
"Help translate" => "Помогнете Ñ Ð¿Ñ€ÐµÐ²Ð¾Ð´Ð°",
-"WebDAV" => "WebDAV",
"Login Name" => "Потребител",
"Create" => "Създаване",
"Default Storage" => "Хранилище по подразбиране",
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index 574426ea63482f912e1b6090a13b0590e578c0ef..a782a53bca1667fc771f4ad53dd0e0c75b516862 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -57,7 +57,6 @@ $TRANSLATIONS = array(
"Cancel" => "বাতির",
"Language" => "à¦à¦¾à¦·à¦¾",
"Help translate" => "অনà§à¦¬à¦¾à¦¦ করতে সহায়তা করà§à¦¨",
-"WebDAV" => "WebDAV",
"Login Name" => "পà§à¦°à¦¬à§‡à¦¶",
"Create" => "তৈরী কর",
"Default Storage" => "পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ সংরকà§à¦·à¦£à¦¾à¦—ার",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 0a4324e5a58ed568af47b3594c424555568807bb..a1e6c25bbf5786baca90b4a0cbcb43a471511a8a 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -106,9 +106,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Habilita l'API de compartir",
"Allow apps to use the Share API" => "Permet que les aplicacions utilitzin l'API de compartir",
"Allow links" => "Permet enllaços",
-"Allow users to share items to the public with links" => "Permet als usuaris compartir elements amb el públic amb enllaços",
"Allow public uploads" => "Permet pujada pública",
-"Allow users to enable others to upload into their publicly shared folders" => "Permet als usuaris habilitar pujades de tercers en les seves carpetes compartides al públic",
+"Allow users to share items to the public with links" => "Permet als usuaris compartir elements amb el públic amb enllaços",
"Allow resharing" => "Permet compartir de nou",
"Allow users to share items shared with them again" => "Permet als usuaris compartir de nou elements ja compartits amb ells",
"Allow users to share with anyone" => "Permet compartir amb qualsevol",
@@ -147,7 +146,7 @@ $TRANSLATIONS = array(
"Forum" => "Fòrum",
"Bugtracker" => "Seguiment d'errors",
"Commercial Support" => "Suport comercial",
-"Get the apps to sync your files" => "Obtén les aplicacions per sincronitzar fitxers",
+"Get the apps to sync your files" => "Obtingueu les aplicacions per sincronitzar els vostres fitxers",
"Show First Run Wizard again" => "Torna a mostrar l'assistent de primera execució",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>",
"Password" => "Contrasenya",
@@ -170,8 +169,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Selecciona com a imatge de perfil",
"Language" => "Idioma",
"Help translate" => "Ajudeu-nos amb la traducció",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers",
"Log-in password" => "Contrasenya d'accés",
"Decrypt all Files" => "Desencripta tots els fitxers",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index e4fbf0c65b3e1444448d2b74d6f70234f8486b6d..2b68fa877923ab7a89403bda63690c919898258d 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Soubory úspěšně dešifrovány",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nebylo možno deÅ¡ifrovat soubory, zkontroluje prosÃm owncloud.log nebo kontaktujte svého administrátora",
"Couldn't decrypt your files, check your password and try again" => "Nebylo možno dešifrovat soubory, zkontrolujte své heslo a zkuste znovu",
+"Encryption keys deleted permanently" => "Å ifrovacà klÃÄe trvale smazány",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nebylo možno trvale smazat vaÅ¡e Å¡ifrovacà klÃÄe, zkontrolujte prosÃm owncloud.log nebo kontaktujte svého administrátora",
"Email saved" => "E-mail uložen",
"Invalid email" => "Neplatný e-mail",
"Unable to delete group" => "Nelze smazat skupinu",
"Unable to delete user" => "Nelze smazat uživatele",
+"Backups restored successfully" => "Zálohy úspěšně obnoveny",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nebylo možno obnovit vaÅ¡e Å¡ifrovacà klÃÄe, zkontrolujte prosÃm owncloud.log nebo kontaktujte svého administrátora",
"Language changed" => "Jazyk byl změněn",
"Invalid request" => "Neplatný požadavek",
"Admins can't remove themself from the admin group" => "Správci se nemohou odebrat sami ze skupiny správců",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Dobré heslo",
"Strong password" => "Silné heslo",
"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.",
+"Delete encryption keys permanently." => "Trvale smazat Å¡ifrovacà klÃÄe",
+"Restore encryption keys." => "Obnovit Å¡ifrovacà klÃÄe",
"deleted" => "smazáno",
"undo" => "vrátit zpět",
"Unable to remove user" => "Nelze odebrat uživatele",
@@ -106,20 +112,21 @@ $TRANSLATIONS = array(
"Enable Share API" => "Povolit API sdÃlenÃ",
"Allow apps to use the Share API" => "Povolit aplikacÃm použÃvat API sdÃlenÃ",
"Allow links" => "Povolit odkazy",
-"Allow users to share items to the public with links" => "Povolit uživatelům sdÃlet položky veÅ™ejnÄ› pomocà odkazů",
+"Enforce password protection" => "Vynutit ochranu heslem",
"Allow public uploads" => "Povolit veřejné nahrávánà souborů",
-"Allow users to enable others to upload into their publicly shared folders" => "Povolit uživatelům, aby mohli ostatnÃm umožnit nahrávat do jejich veÅ™ejnÄ› sdÃlené složky",
+"Set default expiration date" => "Nastavit výchozà datum vypršenà platnosti",
+"Expire after " => "Vypršà po",
+"days" => "dnech",
+"Enforce expiration date" => "Vynutit datum vyprÅ¡enÃ",
+"Allow users to share items to the public with links" => "Povolit uživatelům sdÃlet položky veÅ™ejnÄ› pomocà odkazů",
"Allow resharing" => "Povolit znovu-sdÃlenÃ",
"Allow users to share items shared with them again" => "Povolit uživatelům znovu sdÃlet položky, které jsou pro nÄ› sdÃleny",
"Allow users to share with anyone" => "Povolit uživatelům sdÃlet s kýmkoliv",
"Allow users to only share with users in their groups" => "Povolit uživatelům sdÃlet pouze s uživateli v jejich skupinách",
"Allow mail notification" => "Povolit e-mailová upozornÄ›nÃ",
"Allow users to send mail notification for shared files" => "Povolit uživatelům odesÃlat e-mailová upozornÄ›nà pro sdÃlené soubory",
-"Set default expiration date" => "Nastavit výchozà datum vypršenà platnosti",
-"Expire after " => "Vypršà po",
-"days" => "dnech",
-"Enforce expiration date" => "Vynutit datum vyprÅ¡enÃ",
-"Expire shares by default after N days" => "Výchozà lhůta vyprÅ¡enà sdÃlenà po N dnech",
+"Exclude groups from sharing" => "Vyjmout skupiny ze sdÃlenÃ",
+"These groups will still be able to receive shares, but not to initiate them." => "TÄ›mto skupinám bude stále možno sdÃlet, nemohou ale sami sdÃlet ostatnÃm.",
"Security" => "ZabezpeÄenÃ",
"Enforce HTTPS" => "Vynutit HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Vynutà pÅ™ipojovánà klientů k %s Å¡ifrovaným spojenÃm.",
@@ -176,11 +183,12 @@ $TRANSLATIONS = array(
"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\" target=\"_blank\">access your Files via WebDAV</a>" => "Použijte <a href=\"%s\" target=\"_blank\">tuto adresu pro pÅ™Ãstup k vaÅ¡im souborům pÅ™es WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "Å ifrovacà aplikace již nenà spuÅ¡tÄ›na, deÅ¡ifrujte prosÃm vÅ¡echny své soubory",
"Log-in password" => "Přihlašovacà heslo",
"Decrypt all Files" => "Odšifrovat všechny soubory",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "VaÅ¡e Å¡ifrovacà klÃÄe byly zálohovány. Pokud se nÄ›co pokazilo, dajà se znovu obnovit. Smažte je trvale pouze pokud jste jisti, že jsou vÅ¡echny vaÅ¡e soubory bezchybnÄ› deÅ¡ifrovány.",
+"Restore Encryption Keys" => "Obnovit Å ifrovacà KlÃÄe",
+"Delete Encryption Keys" => "Smazat Å ifrovacà KlÃÄe",
"Login Name" => "Přihlašovacà jméno",
"Create" => "Vytvořit",
"Admin Recovery Password" => "Heslo obnovy správce",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 0a755da9fd3cc060dea3b457e51829ffbd7080fe..e37b776dc2c68b1bb57fc5ae39c19ef14a85950b 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -93,9 +93,10 @@ $TRANSLATIONS = array(
"Enable Share API" => "Aktiver Share API",
"Allow apps to use the Share API" => "Tillad apps til at bruge Share API",
"Allow links" => "Tillad links",
-"Allow users to share items to the public with links" => "Tillad brugere at dele elementer til offentligheden med links",
"Allow public uploads" => "Tillad offentlig upload",
-"Allow users to enable others to upload into their publicly shared folders" => "Tillad brugere at give andre mulighed for at uploade i deres offentligt delte mapper",
+"Expire after " => "Udløber efter",
+"days" => "dage",
+"Allow users to share items to the public with links" => "Tillad brugere at dele elementer til offentligheden med links",
"Allow resharing" => "Tillad videredeling",
"Allow users to share items shared with them again" => "Tillad brugere at dele elementer delt med dem igen",
"Allow users to share with anyone" => "Tillad brugere at dele med alle",
@@ -154,8 +155,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Vælg som profilbillede",
"Language" => "Sprog",
"Help translate" => "Hjælp med oversættelsen",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Brug denne adresse for at <a href=\"%s\" target=\"_blank\">tilgå dine filer via WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "Krypteringsprogrammet er ikke længere aktiveret. Dekrypter venligst alle dine filer",
"Log-in password" => "Log-in kodeord",
"Decrypt all Files" => "Dekrypter alle Filer ",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 2b3060dd6d555570fc3d017e532126be123531aa..eb32555701fb818919cd3ecd0b79d82b158f7d6e 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -2,7 +2,7 @@
$TRANSLATIONS = array(
"Invalid value supplied for %s" => "Ungültiger Wert für %s übermittelt",
"Saved" => "Gespeichert",
-"test email settings" => "E-Mail-Einstellungen teste",
+"test email settings" => "E-Mail-Einstellungen testen",
"If you received this email, the settings seem to be correct." => "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt.",
"A problem occurred while sending the e-mail. Please revisit your settings." => "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfe deine Einstellungen",
"Email sent" => "E-Mail wurde verschickt",
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Dateien erfolgreich entschlüsselt",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dateien konnten nicht entschlüsselt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
"Couldn't decrypt your files, check your password and try again" => "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort und versuche es erneut.",
+"Encryption keys deleted permanently" => "Verschlüsselungsschlüssel dauerhaft gelöscht",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
"Email saved" => "E-Mail Adresse gespeichert",
"Invalid email" => "Ungültige E-Mail Adresse",
"Unable to delete group" => "Gruppe konnte nicht gelöscht werden",
"Unable to delete user" => "Benutzer konnte nicht gelöscht werden",
+"Backups restored successfully" => "Backups erfolgreich wiederhergestellt",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
"Language changed" => "Sprache geändert",
"Invalid request" => "Fehlerhafte Anfrage",
"Admins can't remove themself from the admin group" => "Administratoren können sich nicht selbst aus der Admin-Gruppe löschen.",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Gutes Passwort",
"Strong password" => "Starkes Passwort",
"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
+"Delete encryption keys permanently." => "Verschlüsselungsschlüssel dauerhaft löschen.",
+"Restore encryption keys." => "Verschlüsselungsschlüssel wiederherstellen.",
"deleted" => "gelöscht",
"undo" => "rückgängig machen",
"Unable to remove user" => "Benutzer konnte nicht entfernt werden.",
@@ -106,20 +112,21 @@ $TRANSLATIONS = array(
"Enable Share API" => "Aktiviere Sharing-API",
"Allow apps to use the Share API" => "Erlaubt Apps die Nutzung der Share-API",
"Allow links" => "Erlaubt Links",
-"Allow users to share items to the public with links" => "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen",
+"Enforce password protection" => "Passwortschutz erzwingen",
"Allow public uploads" => "Öffentliches Hochladen erlauben",
-"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen",
+"Set default expiration date" => "Setze Ablaufdatum",
+"Expire after " => "Ablauf nach dem",
+"days" => "Tage",
+"Enforce expiration date" => "Ablaufdatum erzwingen",
+"Allow users to share items to the public with links" => "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen",
"Allow resharing" => "Erlaubt erneutes Teilen",
"Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
"Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
"Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen",
"Allow mail notification" => "Mail-Benachrichtigung erlauben",
"Allow users to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
-"Set default expiration date" => "Setze Ablaufdatum",
-"Expire after " => "Ablauf nach dem",
-"days" => "Tage",
-"Enforce expiration date" => "Ablaufdatum erzwingen",
-"Expire shares by default after N days" => "Lässt Freigaben in der Grundeinstellung nach N-Tagen ablaufen",
+"Exclude groups from sharing" => "Gruppen von Freigaben ausschließen",
+"These groups will still be able to receive shares, but not to initiate them." => "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
"Security" => "Sicherheit",
"Enforce HTTPS" => "Erzwinge HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
@@ -127,13 +134,14 @@ $TRANSLATIONS = array(
"Email Server" => "E-Mail-Server",
"This is used for sending out notifications." => "Dies wird zum Senden von Benachrichtigungen verwendet.",
"From address" => "Absender-Adresse",
+"mail" => "Mail",
"Authentication required" => "Authentifizierung benötigt",
"Server address" => "Adresse des Servers",
"Port" => "Port",
"Credentials" => "Zugangsdaten",
"SMTP Username" => "SMTP Benutzername",
-"SMTP Password" => "SMTP Passwor",
-"Test email settings" => "Teste E-Mail-Einstellunge",
+"SMTP Password" => "SMTP Passwort",
+"Test email settings" => "Teste E-Mail-Einstellungen",
"Send email" => "Sende E-Mail",
"Log" => "Log",
"Log level" => "Loglevel",
@@ -176,11 +184,12 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Als Profilbild wählen",
"Language" => "Sprache",
"Help translate" => "Hilf bei der Ãœbersetzung",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "Die Verschlüsselungsanwendung ist nicht länger aktiviert, bitte entschlüsseln Sie alle ihre Daten.",
"Log-in password" => "Login-Passwort",
"Decrypt all Files" => "Alle Dateien entschlüsseln",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Deine Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Lösche diese nur dann dauerhaft, wenn Du dir sicher bist, dass alle Dateien korrekt entschlüsselt wurden.",
+"Restore Encryption Keys" => "Verschlüsselungsschlüssel wiederherstellen",
+"Delete Encryption Keys" => "Verschlüsselungsschlüssel löschen",
"Login Name" => "Loginname",
"Create" => "Anlegen",
"Admin Recovery Password" => "Admin-Wiederherstellungspasswort",
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
index 9bfe06d02362fad3f3bf04600b9e169c6f466789..77d22684429fbdda1d35581ffdd2a8845ae3e4b3 100644
--- a/settings/l10n/de_CH.php
+++ b/settings/l10n/de_CH.php
@@ -57,9 +57,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Share-API aktivieren",
"Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen",
"Allow links" => "Links erlauben",
-"Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
"Allow public uploads" => "Erlaube öffentliches hochladen",
-"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen",
+"Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
"Allow resharing" => "Erlaube Weiterverteilen",
"Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
"Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
@@ -100,7 +99,6 @@ $TRANSLATIONS = array(
"Cancel" => "Abbrechen",
"Language" => "Sprache",
"Help translate" => "Helfen Sie bei der Ãœbersetzung",
-"WebDAV" => "WebDAV",
"Log-in password" => "Login-Passwort",
"Decrypt all Files" => "Alle Dateien entschlüsseln",
"Login Name" => "Loginname",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index b5c0985cecb80a57dbb2e75a3a409bbf3253114f..16c4ed8a175b289e08553c4c7a6056542352a5a4 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Dateien erfolgreich entschlüsselt",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dateien konnten nicht entschlüsselt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
"Couldn't decrypt your files, check your password and try again" => "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passwort und versuchen Sie es erneut.",
+"Encryption keys deleted permanently" => "Verschlüsselungsschlüssel dauerhaft gelöscht",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfen Sie bitte Ihre owncloud.log oder frage Deinen Administrator",
"Email saved" => "E-Mail-Adresse gespeichert",
"Invalid email" => "Ungültige E-Mail-Adresse",
"Unable to delete group" => "Die Gruppe konnte nicht gelöscht werden",
"Unable to delete user" => "Der Benutzer konnte nicht gelöscht werden",
+"Backups restored successfully" => "Backups erfolgreich wiederhergestellt",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
"Language changed" => "Sprache geändert",
"Invalid request" => "Ungültige Anforderung",
"Admins can't remove themself from the admin group" => "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Gutes Passwort",
"Strong password" => "Starkes Passwort",
"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
+"Delete encryption keys permanently." => "Verschlüsselungsschlüssel dauerhaft löschen.",
+"Restore encryption keys." => "Verschlüsselungsschlüssel wiederherstellen.",
"deleted" => "gelöscht",
"undo" => "rückgängig machen",
"Unable to remove user" => "Der Benutzer konnte nicht entfernt werden.",
@@ -106,20 +112,21 @@ $TRANSLATIONS = array(
"Enable Share API" => "Share-API aktivieren",
"Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen",
"Allow links" => "Links erlauben",
-"Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
+"Enforce password protection" => "Passwortschutz erzwingen",
"Allow public uploads" => "Öffentliches Hochladen erlauben",
-"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen",
+"Set default expiration date" => "Setze Ablaufdatum",
+"Expire after " => "Ablauf nach dem",
+"days" => "Tage",
+"Enforce expiration date" => "Ablaufdatum erzwingen",
+"Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
"Allow resharing" => "Erlaube Weiterverteilen",
"Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
"Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
"Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen",
"Allow mail notification" => "Mail-Benachrichtigung erlauben",
"Allow users to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
-"Set default expiration date" => "Setze Ablaufdatum",
-"Expire after " => "Ablauf nach dem",
-"days" => "Tage",
-"Enforce expiration date" => "Ablaufdatum erzwingen",
-"Expire shares by default after N days" => "Lässt Freigaben in der Grundeinstellung nach N-Tagen ablaufen",
+"Exclude groups from sharing" => "Gruppen von Freigaben ausschließen",
+"These groups will still be able to receive shares, but not to initiate them." => "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
"Security" => "Sicherheit",
"Enforce HTTPS" => "HTTPS erzwingen",
"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
@@ -127,6 +134,7 @@ $TRANSLATIONS = array(
"Email Server" => "E-Mail-Server",
"This is used for sending out notifications." => "Dies wird für das Senden von Benachrichtigungen verwendet.",
"From address" => "Absender-Adresse",
+"mail" => "Mail",
"Authentication required" => "Authentifizierung benötigt",
"Server address" => "Adresse des Servers",
"Port" => "Port",
@@ -176,11 +184,12 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Als Profilbild wählen",
"Language" => "Sprache",
"Help translate" => "Helfen Sie bei der Ãœbersetzung",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "Die Verschlüsselungsanwendung ist nicht länger aktiv, bitte entschlüsseln Sie alle ihre Daten",
"Log-in password" => "Login-Passwort",
"Decrypt all Files" => "Alle Dateien entschlüsseln",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Ihre Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Löschen Sie diese nur dann dauerhaft, wenn Sie sich sicher sind, dass alle Dateien korrekt entschlüsselt wurden.",
+"Restore Encryption Keys" => "Verschlüsselungsschlüssel wiederherstellen",
+"Delete Encryption Keys" => "Verschlüsselungsschlüssel löschen",
"Login Name" => "Loginname",
"Create" => "Erstellen",
"Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 1ca97b63da89da73ef3bba3f6fc55172e1df3ba4..03981cab6cd70689bebc08fafadd8f6535f47a2f 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -16,10 +16,17 @@ $TRANSLATIONS = array(
"Unable to change full name" => "Δεν ήταν δυνατή η αλλαγή του πλήÏους ονόματός σας",
"Group already exists" => "Η ομάδα υπάÏχει ήδη",
"Unable to add group" => "Αδυναμία Ï€Ïοσθήκης ομάδας",
+"Files decrypted successfully" => "Τα αÏχεία αποκÏυπτογÏαφήθηκαν με επιτυχία",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Δεν ήταν δυνατή η αποκÏυπτογÏάφηση των αÏχείων, παÏακαλώ ελÎγξτε το owncloud.log ή ενημεÏωθείτε από τον διαχειÏιστή συστημάτων σας",
+"Couldn't decrypt your files, check your password and try again" => "Δεν ήταν δυνατή η αποκÏυπτογÏάφηση των αÏχείων σας, ελÎγξτε τον κωδικό Ï€Ïόσβασής σας και δοκιμάστε πάλι",
+"Encryption keys deleted permanently" => "Τα κλειδιά κÏυπτογÏάφησης αφαιÏÎθηκαν οÏιστικά",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Δεν ήταν δυνατή η οÏιστική διαγÏαφή των κλειδιών κÏυπτογÏάφησής σας, παÏακαλώ ελÎγξτε το owncloud.log ή επικοινωνήστε με τον διαχειÏιστή σας",
"Email saved" => "Το email αποθηκεÏτηκε ",
"Invalid email" => "Μη ÎγκυÏο email",
"Unable to delete group" => "Αδυναμία διαγÏαφής ομάδας",
"Unable to delete user" => "Αδυναμία διαγÏαφής χÏήστη",
+"Backups restored successfully" => "Η επαναφοÏά αντιγÏάφων ασφαλείας Îγινε με επιτυχία",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Δεν ήταν δυνατή η επαναφοÏά των κλειδιών κÏυπτογÏάφησής σας, παÏακαλώ ελÎγξτε το owncloud.log ή επικοινωνήστε με τον διαχειÏιστή σας",
"Language changed" => "Η γλώσσα άλλαξε",
"Invalid request" => "Μη ÎγκυÏο αίτημα",
"Admins can't remove themself from the admin group" => "Οι διαχειÏιστÎÏ‚ δεν μποÏοÏν να αφαιÏÎσουν τους εαυτοÏÏ‚ τους από την ομάδα των διαχειÏιστών",
@@ -53,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Καλό συνθηματικό",
"Strong password" => "Δυνατό συνθηματικό",
"Decrypting files... Please wait, this can take some time." => "ΑποκÏυπτογÏάφηση αÏχείων... ΠαÏακαλώ πεÏιμÎνετε, αυτό μποÏεί να πάÏει κάποιο χÏόνο.",
+"Delete encryption keys permanently." => "ΟÏιστική διαγÏαφή των κλειδιων κÏυπτογÏάφησης.",
+"Restore encryption keys." => "ΕπαναφοÏά των κλειδιών κÏυπτογÏάφησης.",
"deleted" => "διαγÏάφηκε",
"undo" => "αναίÏεση",
"Unable to remove user" => "Αδυναμία αφαίÏεση χÏήστη",
@@ -103,14 +112,21 @@ $TRANSLATIONS = array(
"Enable Share API" => "ΕνεÏγοποίηση API διαμοιÏασμοÏ",
"Allow apps to use the Share API" => "ΕπιτÏÎπει την χÏήση του API διαμοιÏÎ±ÏƒÎ¼Î¿Ï ÏƒÎµ εφαÏμογÎÏ‚ ",
"Allow links" => "ΕπιτÏÎπονται οι σÏνδεσμοι",
-"Allow users to share items to the public with links" => "ΕπιτÏÎπει τους χÏήστες να διαμοιÏάζουν δημόσια με συνδÎσμους",
+"Enforce password protection" => "Επιβολή Ï€Ïοστασίας με κωδικό",
"Allow public uploads" => "ΕπιτÏÎπεται το κοινόχÏηστο ανÎβασμα",
-"Allow users to enable others to upload into their publicly shared folders" => "ΕπιτÏÎπει τους χÏήστες να καθιστοÏν άλλους χÏήστες ικανοÏÏ‚ να ανεβάζουν στους κοινόχÏηστους φακÎλους τους",
+"Set default expiration date" => "ΟÏισμός εÏήμην ημεÏομηνίας λήξης",
+"Expire after " => "Λήξη μετά από",
+"days" => "ημÎÏες",
+"Enforce expiration date" => "Επιβολή της ημεÏομηνίας λήξης",
+"Allow users to share items to the public with links" => "ΕπιτÏÎπει τους χÏήστες να διαμοιÏάζουν δημόσια με συνδÎσμους",
"Allow resharing" => "ΕπιτÏÎπεται ο επαναδιαμοιÏασμός",
"Allow users to share items shared with them again" => "ΕπιτÏÎπει στους χÏήστες να διαμοιÏάζουν ότι τους Îχει διαμοιÏαστεί",
"Allow users to share with anyone" => "ΕπιτÏÎπεται στους χÏήστες ο διαμοιÏασμός με οποιονδήποτε",
"Allow users to only share with users in their groups" => "ΕπιτÏÎπεται στους χÏήστες ο διαμοιÏασμός μόνο με χÏήστες της ίδιας ομάδας",
"Allow mail notification" => "ΕπιτÏÎπονται ειδοποιήσεις ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου",
+"Allow users to send mail notification for shared files" => "ΕπιτÏÎψτε στους χÏήστες να στÎλνουν ειδοποιήσεις μÎσω ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου για κοινόχÏηστα αÏχεία",
+"Exclude groups from sharing" => "ΕξαίÏεση ομάδων από τον διαμοιÏασμό",
+"These groups will still be able to receive shares, but not to initiate them." => "ΑυτÎÏ‚ οι ομάδες θα συνεχίσουν να λαμβάνουν διαμοιÏασμοÏÏ‚, αλλά δεν θα είναι δυνατό να τους δημιουÏγήσουν.",
"Security" => "Ασφάλεια",
"Enforce HTTPS" => "Επιβολή χÏήσης HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Επιβάλλει τους πελάτες να συνδÎονται στο %s μÎσω κÏυπτογÏαφημÎνης σÏνδεσης.",
@@ -167,11 +183,12 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Επιλογή εικόνας Ï€Ïοφίλ",
"Language" => "Γλώσσα",
"Help translate" => "Βοηθήστε στη μετάφÏαση",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "ΧÏησιμοποιήστε αυτήν την διεÏθυνση για να αποκτήσετε <a href=\"%s\" target=\"_blank\">Ï€Ïόσβαση στα αÏχεία σας μÎσω WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "Η εφαÏμογή κÏυπτογÏάφησης δεν είναι πλÎον ενεÏγοποιημÎνη, παÏακαλώ αποκÏυπτογÏαφήστε όλα τα αÏχεία σας",
"Log-in password" => "Συνθηματικό εισόδου",
"Decrypt all Files" => "ΑποκÏυπτογÏάφηση όλων των ΑÏχείων",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Τα κλειδιά κÏυπτογÏάφησής σας μεταφÎÏονται σε θÎση αντιγÏάφου ασφαλείας. Αν κάτι πάει στÏαβά, μποÏείτε να τα επαναφÎÏετε. ΔιαγÏάψτε τα οÏιστικά μόνο αν είστε βÎβαιοι ότι όλα τα αÏχεία αποκÏυπτογÏαφήθηκαν σωστά.",
+"Restore Encryption Keys" => "ΕπαναφοÏά κλειδιών κÏυπτογÏάφησης",
+"Delete Encryption Keys" => "ΔιαγÏαφή κλειδιών κÏυπτογÏάφησης",
"Login Name" => "Όνομα ΣÏνδεσης",
"Create" => "ΔημιουÏγία",
"Admin Recovery Password" => "Κωδικός ΕπαναφοÏάς ΔιαχειÏιστή ",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index 37dc464d6718cd37befc7f232b522515a7954ac8..ef3cc9bb519c430dd9dff22a726d593dd338b5b8 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Files decrypted successfully",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Couldn't decrypt your files, please check your owncloud.log or ask your administrator",
"Couldn't decrypt your files, check your password and try again" => "Couldn't decrypt your files, check your password and try again",
+"Encryption keys deleted permanently" => "Encryption keys deleted permanently",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator",
"Email saved" => "Email saved",
"Invalid email" => "Invalid email",
"Unable to delete group" => "Unable to delete group",
"Unable to delete user" => "Unable to delete user",
+"Backups restored successfully" => "Backups restored successfully",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator",
"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",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Good password",
"Strong password" => "Strong password",
"Decrypting files... Please wait, this can take some time." => "Decrypting files... Please wait, this can take some time.",
+"Delete encryption keys permanently." => "Delete encryption keys permanently.",
+"Restore encryption keys." => "Restore encryption keys.",
"deleted" => "deleted",
"undo" => "undo",
"Unable to remove user" => "Unable to remove user",
@@ -106,20 +112,21 @@ $TRANSLATIONS = array(
"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",
+"Enforce password protection" => "Enforce password protection",
"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",
+"Set default expiration date" => "Set default expiry date",
+"Expire after " => "Expire after ",
+"days" => "days",
+"Enforce expiration date" => "Enforce expiry date",
+"Allow users to share items to the public with links" => "Allow users to share items to the public with links",
"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",
"Allow mail notification" => "Allow mail notification",
"Allow users to send mail notification for shared files" => "Allow users to send mail notification for shared files",
-"Set default expiration date" => "Set default expiry date",
-"Expire after " => "Expire after ",
-"days" => "days",
-"Enforce expiration date" => "Enforce expiry date",
-"Expire shares by default after N days" => "Expire shares by default after N days",
+"Exclude groups from sharing" => "Exclude groups from sharing",
+"These groups will still be able to receive shares, but not to initiate them." => "These groups will still be able to receive shares, but not to initiate them.",
"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.",
@@ -127,6 +134,7 @@ $TRANSLATIONS = array(
"Email Server" => "Email Server",
"This is used for sending out notifications." => "This is used for sending out notifications.",
"From address" => "From address",
+"mail" => "mail",
"Authentication required" => "Authentication required",
"Server address" => "Server address",
"Port" => "Port",
@@ -176,11 +184,12 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Choose as profile image",
"Language" => "Language",
"Help translate" => "Help translate",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "The encryption app is no longer enabled, please decrypt all your files",
"Log-in password" => "Log-in password",
"Decrypt all Files" => "Decrypt all Files",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly.",
+"Restore Encryption Keys" => "Restore Encryption Keys",
+"Delete Encryption Keys" => "Delete Encryption Keys",
"Login Name" => "Login Name",
"Create" => "Create",
"Admin Recovery Password" => "Admin Recovery Password",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index f63c5140a4594b677641e14c213d6c8ade11b060..775419b72ddec88e59e31d8825612f3ade5032e8 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,48 +1,93 @@
<?php
$TRANSLATIONS = array(
+"Saved" => "Konservita",
"Email sent" => "La retpoÅtaĵo sendiÄis",
+"Send mode" => "Sendi pli",
"Encryption" => "Ĉifrado",
+"Authentication method" => "AÅtentiga metodo",
"Unable to load list from App Store" => "Ne eblis Åargi liston el aplikaĵovendejo",
"Authentication error" => "AÅtentiga eraro",
+"Your full name has been changed." => "Via plena nomo ÅanÄitas.",
+"Unable to change full name" => "Ne eblis ÅanÄi la plenan nomon",
"Group already exists" => "La grupo jam ekzistas",
"Unable to add group" => "Ne eblis aldoni la grupon",
+"Files decrypted successfully" => "La dosieroj malĉifriÄis sukcese",
+"Encryption keys deleted permanently" => "La ĉifroklavojn foriÄis por ĉiam.",
"Email saved" => "La retpoÅtadreso konserviÄis",
"Invalid email" => "Nevalida retpoÅtadreso",
"Unable to delete group" => "Ne eblis forigi la grupon",
"Unable to delete user" => "Ne eblis forigi la uzanton",
+"Backups restored successfully" => "La savokopioj restaÅriÄis sukcese",
"Language changed" => "La lingvo estas ÅanÄita",
"Invalid request" => "Nevalida peto",
"Admins can't remove themself from the admin group" => "Administrantoj ne povas forigi sin mem el la administra grupo.",
"Unable to add user to group %s" => "Ne eblis aldoni la uzanton al la grupo %s",
"Unable to remove user from group %s" => "Ne eblis forigi la uzantan el la grupo %s",
+"Couldn't update app." => "Ne eblis Äisdatigi la aplikaĵon.",
+"Wrong password" => "MalÄusta pasvorto",
+"Unable to change password" => "Ne eblis ÅanÄi la pasvorton",
+"Sending..." => "Sendante...",
"User Documentation" => "Dokumentaro por uzantoj",
+"Admin Documentation" => "Administra dokumentaro",
+"Update to {appversion}" => "Äœisdatigi al {appversion}",
"Disable" => "Malkapabligi",
"Enable" => "Kapabligi",
+"Please wait...." => "Bonvolu atendi...",
+"Updating...." => "Äœisdatigata...",
+"Error while updating app" => "Eraris Äisdatigo de la aplikaĵo",
"Error" => "Eraro",
"Update" => "Äœisdatigi",
+"Updated" => "Äœisdatigita",
+"Select a profile picture" => "Elekti profilan bildon",
+"Very weak password" => "Tre malforta pasvorto",
+"Weak password" => "Malforta pasvorto",
+"So-so password" => "Mezaĉa pasvorto",
+"Good password" => "Bona pasvorto",
+"Strong password" => "Forta pasvorto",
+"Delete encryption keys permanently." => "Forigi ĉifroklavojn por ĉiam.",
+"Restore encryption keys." => "RestaÅri ĉifroklavojn.",
"deleted" => "forigita",
"undo" => "malfari",
+"Unable to remove user" => "Ne eblis forigi la uzanton",
"Groups" => "Grupoj",
"Group Admin" => "Grupadministranto",
"Delete" => "Forigi",
+"add group" => "aldoni grupon",
+"A valid username must be provided" => "Valida uzantonomo devas proviziÄi",
+"Error creating user" => "Eraris kreo de uzanto",
+"A valid password must be provided" => "Valida pasvorto devas proviziÄi",
"__language_name__" => "Esperanto",
"None" => "Nenio",
"Login" => "Ensaluti",
+"SSL" => "SSL",
+"TLS" => "TLS",
"Security Warning" => "Sekureca averto",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraÅ ne Äuste agordiÄis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco Åajnas rompita.",
+"Module 'fileinfo' missing" => "La modulo «fileinfo» mankas",
+"Locale not working" => "La lokaĵaro ne funkcias",
"Cron" => "Cron",
"Sharing" => "Kunhavigo",
"Enable Share API" => "Kapabligi API-on por Kunhavigo",
"Allow apps to use the Share API" => "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo",
"Allow links" => "Kapabligi ligilojn",
+"Allow public uploads" => "Permesi publikajn alÅutojn",
+"days" => "tagoj",
"Allow users to share items to the public with links" => "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile",
"Allow resharing" => "Kapabligi rekunhavigon",
"Allow users to share items shared with them again" => "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili",
"Allow users to share with anyone" => "Kapabligi uzantojn kunhavigi kun ĉiu ajn",
"Allow users to only share with users in their groups" => "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj",
+"Allow mail notification" => "Permesi retpoÅtan sciigon",
+"Security" => "Sekuro",
+"Email Server" => "RetpoÅtoservilo",
+"From address" => "El adreso",
+"Authentication required" => "AÅtentiÄo nepras",
"Server address" => "Servila adreso",
"Port" => "Pordo",
"Credentials" => "AÅtentigiloj",
+"SMTP Username" => "SMTP-uzantonomo",
+"SMTP Password" => "SMTP-pasvorto",
+"Send email" => "Sendi retpoÅton",
"Log" => "Protokolo",
"Log level" => "Registronivelo",
"More" => "Pli",
@@ -52,7 +97,9 @@ $TRANSLATIONS = array(
"Add your App" => "Aldonu vian aplikaĵon",
"More Apps" => "Pli da aplikaĵoj",
"Select an App" => "Elekti aplikaĵon",
+"Documentation:" => "Dokumentaro:",
"See application page at apps.owncloud.com" => "Vidu la paÄon pri aplikaĵoj ĉe apps.owncloud.com",
+"See application website" => "Vidi la TTT-ejon de la aplikaĵo",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>",
"Administrator Documentation" => "Dokumentaro por administrantoj",
"Online Documentation" => "Reta dokumentaro",
@@ -60,20 +107,29 @@ $TRANSLATIONS = array(
"Bugtracker" => "Cimoraportejo",
"Commercial Support" => "Komerca subteno",
"Get the apps to sync your files" => "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vi uzas <strong>%s</strong> el la disponeblaj <strong>%s</strong>",
"Password" => "Pasvorto",
"Your password was changed" => "Via pasvorto ÅanÄiÄis",
"Unable to change your password" => "Ne eblis ÅanÄi vian pasvorton",
"Current password" => "Nuna pasvorto",
"New password" => "Nova pasvorto",
"Change password" => "ÅœanÄi la pasvorton",
+"Full Name" => "Plena nomo",
"Email" => "RetpoÅto",
"Your email address" => "Via retpoÅta adreso",
"Profile picture" => "Profila bildo",
+"Upload new" => "AlÅuti novan",
+"Select new from Files" => "Elekti novan el dosieroj",
+"Remove image" => "Forigi bildon",
"Cancel" => "Nuligi",
+"Choose as profile image" => "Elekti kiel profilan bildon",
"Language" => "Lingvo",
"Help translate" => "Helpu traduki",
-"WebDAV" => "WebDAV",
+"Log-in password" => "Ensaluta pasvorto",
+"Decrypt all Files" => "Malĉifri ĉiujn dosierojn",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Viaj ĉifroklavoj moviÄis al savokopia loko. Se io malsukcesas, vi povas restaÅri la klavojn. Nur forigu ilin porĉiame se vi certas, ke ĉiuj dosieroj malĉifriÄis korekte.",
+"Restore Encryption Keys" => "RestaÅri ĉifroklavojn",
+"Delete Encryption Keys" => "Forigi ĉifroklavojn",
"Login Name" => "Ensaluti",
"Create" => "Krei",
"Default Storage" => "DefaÅlta konservejo",
@@ -81,6 +137,8 @@ $TRANSLATIONS = array(
"Other" => "Alia",
"Username" => "Uzantonomo",
"Storage" => "Konservejo",
+"change full name" => "ÅanÄi plenan nomon",
+"set new password" => "agordi novan pasvorton",
"Default" => "DefaÅlta"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 953718bac4f6fc33d23220a6b0274cabc9b19c4f..e5069661f449ca8409dadb913564e5f2702a98e5 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Los archivos fueron descifrados",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "No se pudo descifrar sus archivos. Revise el owncloud.log o consulte con su administrador",
"Couldn't decrypt your files, check your password and try again" => "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de nuevo",
+"Encryption keys deleted permanently" => "Claves de cifrado eliminadas permanentemente",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "No se pudieron eliminar permanentemente sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
"Email saved" => "Correo electrónico guardado",
"Invalid email" => "Correo electrónico no válido",
"Unable to delete group" => "No se pudo eliminar el grupo",
"Unable to delete user" => "No se pudo eliminar el usuario",
+"Backups restored successfully" => "Copia de seguridad restaurada",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "No se pudieron restarurar sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
"Language changed" => "Idioma cambiado",
"Invalid request" => "Petición no válida",
"Admins can't remove themself from the admin group" => "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Contraseña buena",
"Strong password" => "Contraseña muy buena",
"Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
+"Delete encryption keys permanently." => "Eliminar claves de cifrado permanentemente.",
+"Restore encryption keys." => "Restaurar claves de cifrado.",
"deleted" => "eliminado",
"undo" => "deshacer",
"Unable to remove user" => "Imposible eliminar al usuario",
@@ -106,20 +112,21 @@ $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 con el público mediante enlaces",
+"Enforce password protection" => "Mejora la protección por contraseña.",
"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",
+"Set default expiration date" => "Establecer fecha de caducidad predeterminada",
+"Expire after " => "Caduca luego de",
+"days" => "dÃas",
+"Enforce expiration date" => "Imponer fecha de caducidad",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos con el público mediante enlaces",
"Allow resharing" => "Permitir re-compartición",
"Allow users to share items shared with them again" => "Permitir a los usuarios compartir de nuevo elementos ya compartidos",
"Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquier persona",
"Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los usuarios en sus grupos",
"Allow mail notification" => "Permitir notificaciones por correo electrónico",
"Allow users to send mail notification for shared files" => "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos",
-"Set default expiration date" => "Establecer fecha de caducidad predeterminada",
-"Expire after " => "Caduca luego de",
-"days" => "dÃas",
-"Enforce expiration date" => "Imponer fecha de caducidad",
-"Expire shares by default after N days" => "Archivos compartidos caducan luego de N dÃas",
+"Exclude groups from sharing" => "Excluye grupos de compartir",
+"These groups will still be able to receive shares, but not to initiate them." => "Estos grupos aún podrán recibir contenidos compartidos, pero no podrán, pero no podrán iniciarlos.",
"Security" => "Seguridad",
"Enforce HTTPS" => "Forzar HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
@@ -127,6 +134,7 @@ $TRANSLATIONS = array(
"Email Server" => "Servidor de correo electrónico",
"This is used for sending out notifications." => "Esto se usa para enviar notificaciones.",
"From address" => "Desde la dirección",
+"mail" => "correo electrónico",
"Authentication required" => "Se necesita autenticación",
"Server address" => "Dirección del servidor",
"Port" => "Puerto",
@@ -176,11 +184,12 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Seleccionar como imagen de perfil",
"Language" => "Idioma",
"Help translate" => "Ayúdanos a traducir",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" 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>",
"The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
"Log-in password" => "Contraseña de acceso",
"Decrypt all Files" => "Descifrar archivos",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Sus claves de cifrado se archivarán en una localización segura. Asà en caso de que algo fuese mal podrá recuperan sus claves. Borre sus claves de cifrado permanentemente solamente si esta seguro de que sus archivos han sido descifrados correctamente.",
+"Restore Encryption Keys" => "Restaurar claves de cifrado",
+"Delete Encryption Keys" => "Eliminar claves de cifrado",
"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 7d834e9170a07ce0a4ad1914a816237a650e648d..f212b842ed51f9dff226ad5a41529f1355f2b21c 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -101,9 +101,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Habilitar Share API",
"Allow apps to use the Share API" => "Permitir a las aplicaciones usar la Share API",
"Allow links" => "Permitir enlaces",
-"Allow users to share items to the public with links" => "Permitir a los usuarios compartir enlaces públicos",
"Allow public uploads" => "Permitir subidas públicas",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir que los usuarios autoricen a otros a subir archivos en sus directorios públicos compartidos",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir enlaces públicos",
"Allow resharing" => "Permitir Re-Compartir",
"Allow users to share items shared with them again" => "Permite a los usuarios volver a compartir items que les fueron compartidos",
"Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquiera.",
@@ -166,8 +165,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Elegir como imagen de perfil",
"Language" => "Idioma",
"Help translate" => "Ayudanos a traducir",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vÃa WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos.",
"Log-in password" => "Clave de acceso",
"Decrypt all Files" => "Desencriptar todos los archivos",
diff --git a/settings/l10n/es_MX.php b/settings/l10n/es_MX.php
index 2eb3946cbbada82a381599611b69700ba7ba48e3..84d0ffd9bd525b8b24fa7eaf67c256a0b158890b 100644
--- a/settings/l10n/es_MX.php
+++ b/settings/l10n/es_MX.php
@@ -80,9 +80,8 @@ $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 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 users to share items to the public with links" => "Permitir a los usuarios compartir elementos con el público mediante enlaces",
"Allow resharing" => "Permitir re-compartición",
"Allow users to share items shared with them again" => "Permitir a los usuarios compartir de nuevo elementos ya compartidos",
"Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquier persona",
@@ -132,8 +131,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Seleccionar como imagen de perfil",
"Language" => "Idioma",
"Help translate" => "Ayúdanos a traducir",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vÃa WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
"Log-in password" => "Contraseña de acceso",
"Decrypt all Files" => "Descifrar archivos",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index a76b73c9aefab1ca8c97666d8f0165dab29926c5..7e85505bbc81fa8f53810da7f1578e61e88e9711 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -106,18 +106,16 @@ $TRANSLATIONS = array(
"Enable Share API" => "Luba Share API",
"Allow apps to use the Share API" => "Luba rakendustel kasutada Share API-t",
"Allow links" => "Luba lingid",
-"Allow users to share items to the public with links" => "Luba kasutajatel jagada kirjeid avalike linkidega",
"Allow public uploads" => "Luba avalikud üleslaadimised",
-"Allow users to enable others to upload into their publicly shared folders" => "Luba kasutajatel üleslaadimine teiste poolt oma avalikult jagatud kataloogidesse ",
+"Expire after " => "Aegu pärast",
+"days" => "päeva",
+"Allow users to share items to the public with links" => "Luba kasutajatel jagada kirjeid avalike linkidega",
"Allow resharing" => "Luba edasijagamine",
"Allow users to share items shared with them again" => "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud",
"Allow users to share with anyone" => "Luba kasutajatel kõigiga jagada",
"Allow users to only share with users in their groups" => "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad",
"Allow mail notification" => "Luba teavitused e-postiga",
"Allow users to send mail notification for shared files" => "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta",
-"Expire after " => "Aegu pärast",
-"days" => "päeva",
-"Expire shares by default after N days" => "Peata jagamine N päeva möödudes",
"Security" => "Turvalisus",
"Enforce HTTPS" => "Sunni peale HTTPS-i kasutamine",
"Forces the clients to connect to %s via an encrypted connection." => "Sunnib kliente %s ühenduma krüpteeritult.",
@@ -174,8 +172,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Vali profiilipildiks",
"Language" => "Keel",
"Help translate" => "Aita tõlkida",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid",
"Log-in password" => "Sisselogimise parool",
"Decrypt all Files" => "Dekrüpteeri kõik failid",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 054a40a61b912fab7186c01fa41838913ee58ed8..29e9e42abb1c9b5ff55c0d16ffbfcf5e1856522f 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Saved" => "Gordeta",
"Email sent" => "Eposta bidalia",
"Encryption" => "Enkriptazioa",
"Unable to load list from App Store" => "Ezin izan da App Dendatik zerrenda kargatu",
@@ -36,6 +37,11 @@ $TRANSLATIONS = array(
"Update" => "Eguneratu",
"Updated" => "Eguneratuta",
"Select a profile picture" => "Profil argazkia aukeratu",
+"Very weak password" => "Pasahitz oso ahula",
+"Weak password" => "Pasahitz ahula",
+"So-so password" => "Halamoduzko pasahitza",
+"Good password" => "Pasahitz ona",
+"Strong password" => "Pasahitz sendoa",
"deleted" => "ezabatuta",
"undo" => "desegin",
"Unable to remove user" => "Ezin izan da erabiltzailea aldatu",
@@ -73,9 +79,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Gaitu Elkarbanatze APIa",
"Allow apps to use the Share API" => "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko",
"Allow links" => "Baimendu loturak",
-"Allow users to share items to the public with links" => "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen",
"Allow public uploads" => "Baimendu igoera publikoak",
-"Allow users to enable others to upload into their publicly shared folders" => "Baimendu erabiltzaileak besteak bere partekatutako karpetetan fitxategiak igotzea",
+"Allow users to share items to the public with links" => "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen",
"Allow resharing" => "Baimendu birpartekatzea",
"Allow users to share items shared with them again" => "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen",
"Allow users to share with anyone" => "Baimendu erabiltzaileak edonorekin elkarbanatzen",
@@ -125,8 +130,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Profil irudi bezala aukeratu",
"Language" => "Hizkuntza",
"Help translate" => "Lagundu itzultzen",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak.",
"Log-in password" => "Saioa hasteko pasahitza",
"Decrypt all Files" => "Desenkripattu fitxategi guztiak",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index f42a263c3ff2718a5866c0afc00007c944bf6d0a..366f7ac6996b442f10938c1f4a4664847bfbc4d5 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -35,6 +35,10 @@ $TRANSLATIONS = array(
"Update" => "به روز رسانی",
"Updated" => "بروز رسانی انجام شد",
"Select a profile picture" => "انتخاب تصویر پروÙایل",
+"Weak password" => "رمز عبور ضعیÙ",
+"So-so password" => "رمز عبور متوسط",
+"Good password" => "رمز عبور خوب",
+"Strong password" => "رمز عبور قوی",
"Decrypting files... Please wait, this can take some time." => "در Øال بازگشایی رمز Ùایل‌ها... لطÙاً صبر نمایید. این امر ممکن است مدتی زمان ببرد.",
"deleted" => "Øذ٠شده",
"undo" => "بازگشت",
@@ -68,9 +72,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Ùعال کردن API اشتراک گذاری",
"Allow apps to use the Share API" => "اجازه ÛŒ برنامه ها برای استÙاده از API اشتراک گذاری",
"Allow links" => "اجازه ی لینک ها",
-"Allow users to share items to the public with links" => "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها",
"Allow public uploads" => "اجازه بارگذاری عمومی",
-"Allow users to enable others to upload into their publicly shared folders" => "به کاربران اجازه داده شود Ú©Ù‡ امکان بارگذاری در پوشه هایی Ú©Ù‡ بصورت عمومی به اشتراک گذاشته اند را برای سایرین Ùعال سازند",
+"Allow users to share items to the public with links" => "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها",
"Allow resharing" => "مجوز اشتراک گذاری مجدد",
"Allow users to share items shared with them again" => "اجازه به کاربران برای اشتراک گذاری دوباره با آنها",
"Allow users to share with anyone" => "اجازه به کابران برای اشتراک گذاری با همه",
@@ -120,8 +123,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "یک تصویر پروÙایل انتخاب کنید",
"Language" => "زبان",
"Help translate" => "به ترجمه آن کمک کنید",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "از این آدرس استÙاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به Ùایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>",
"Log-in password" => "رمز ورود",
"Decrypt all Files" => "تمام Ùایلها رمزگشایی شود",
"Login Name" => "نام کاربری",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index ea4d83b1c8790bccddb9badba01c9677fd8f1075..c3fc3640275f1ba328463d1593e3693787178b44 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -19,10 +19,12 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Tiedostojen salaus purettiin onnistuneesti",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Tiedostojen salauksen purkaminen epäonnistui. Tarkista owncloud.log-tiedosto tai ota yhteys ylläpitäjään",
"Couldn't decrypt your files, check your password and try again" => "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yritä uudelleen",
+"Encryption keys deleted permanently" => "Salausavaimet poistettiin pysyvästi",
"Email saved" => "Sähköposti tallennettu",
"Invalid email" => "Virheellinen sähköposti",
"Unable to delete group" => "Ryhmän poisto epäonnistui",
"Unable to delete user" => "Käyttäjän poisto epäonnistui",
+"Backups restored successfully" => "Varmuuskopiot palautettiin onnistuneesti",
"Language changed" => "Kieli on vaihdettu",
"Invalid request" => "Virheellinen pyyntö",
"Admins can't remove themself from the admin group" => "Ylläpitäjät eivät poistaa omia tunnuksiaan ylläpitäjien ryhmästä",
@@ -52,6 +54,8 @@ $TRANSLATIONS = array(
"Good password" => "Hyvä salasana",
"Strong password" => "Vahva salasana",
"Decrypting files... Please wait, this can take some time." => "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.",
+"Delete encryption keys permanently." => "Poista salausavaimet pysyvästi.",
+"Restore encryption keys." => "Palauta salausavaimet.",
"deleted" => "poistettu",
"undo" => "kumoa",
"Unable to remove user" => "Käyttäjän poistaminen ei onnistunut",
@@ -96,19 +100,20 @@ $TRANSLATIONS = array(
"Enable Share API" => "Käytä jakamisen ohjelmointirajapintaa",
"Allow apps to use the Share API" => "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
"Allow links" => "Salli linkit",
-"Allow users to share items to the public with links" => "Salli käyttäjien jakaa kohteita käyttäen linkkejä",
"Allow public uploads" => "Salli julkiset lähetykset",
+"Set default expiration date" => "Aseta oletusvanhenemispäivä",
+"Expire after " => "Vanhenna",
+"days" => "päivän jälkeen",
+"Enforce expiration date" => "Pakota vanhenemispäivä",
+"Allow users to share items to the public with links" => "Salli käyttäjien jakaa kohteita käyttäen linkkejä",
"Allow resharing" => "Salli uudelleenjakaminen",
"Allow users to share items shared with them again" => "Mahdollistaa käyttäjien jakavan uudelleen heidän kanssaan jaettuja kohteita",
"Allow users to share with anyone" => "Salli käyttäjien jakaa kenen tahansa kanssa",
"Allow users to only share with users in their groups" => "Salli jakaminen vain samoissa ryhmissä olevien käyttäjien kesken",
"Allow mail notification" => "Salli sähköposti-ilmoitukset",
"Allow users to send mail notification for shared files" => "Salli käyttäjien lähettää sähköposti-ilmoituksia jaetuista tiedostoista",
-"Set default expiration date" => "Aseta oletusvanhenemispäivä",
-"Expire after " => "Vanhenna",
-"days" => "päivän jälkeen",
-"Enforce expiration date" => "Pakota vanhenemispäivä",
-"Expire shares by default after N days" => "Vanhenna jaot oletuksena N päivän jälkeen",
+"Exclude groups from sharing" => "Kiellä ryhmiä jakamasta",
+"These groups will still be able to receive shares, but not to initiate them." => "Nämä ryhmät kykenevät vastaanottamaan jakoja, mutta eivät kuitenkaan itse pysty luoda jakoja.",
"Security" => "Tietoturva",
"Enforce HTTPS" => "Pakota HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta.",
@@ -165,11 +170,11 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Valitse profiilikuvaksi",
"Language" => "Kieli",
"Help translate" => "Auta kääntämisessä",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\">käyttääksesi tiedostojasi WebDAVin kautta</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus",
"Log-in password" => "Kirjautumissalasana",
"Decrypt all Files" => "Pura kaikkien tiedostojen salaus",
+"Restore Encryption Keys" => "Palauta salausavaimet",
+"Delete Encryption Keys" => "Poista salausavaimet",
"Login Name" => "Kirjautumisnimi",
"Create" => "Luo",
"Default Storage" => "Oletustallennustila",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 6338e477dea7e1abca5bfcafd5c6412a1261b7a3..37e73e0b809037ed19dd79a055dde4a01e851364 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Fichiers décryptés avec succès",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Impossible de décrypter vos fichiers, veuillez vérifier votre owncloud.log ou demander à votre administrateur",
"Couldn't decrypt your files, check your password and try again" => "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et essayez à nouveau",
+"Encryption keys deleted permanently" => "Clés de chiffrement définitivement supprimées.",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Impossible de supprimer définitivement vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
"Email saved" => "E-mail sauvegardé",
"Invalid email" => "E-mail invalide",
"Unable to delete group" => "Impossible de supprimer le groupe",
"Unable to delete user" => "Impossible de supprimer l'utilisateur",
+"Backups restored successfully" => "La sauvegarde a été restaurée avec succès",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Impossible de restaurer vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
"Language changed" => "Langue changée",
"Invalid request" => "Requête invalide",
"Admins can't remove themself from the admin group" => "Les administrateurs ne peuvent pas se retirer eux-mêmes du groupe admin",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Mot de passe de sécurité suffisante",
"Strong password" => "Mot de passe de forte sécurité",
"Decrypting files... Please wait, this can take some time." => "Déchiffrement en cours... Cela peut prendre un certain temps.",
+"Delete encryption keys permanently." => "Supprimer définitivement les clés de chiffrement",
+"Restore encryption keys." => "Restaurer les clés de chiffrement",
"deleted" => "supprimé",
"undo" => "annuler",
"Unable to remove user" => "Impossible de retirer l'utilisateur",
@@ -106,20 +112,21 @@ $TRANSLATIONS = array(
"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",
+"Enforce password protection" => "Appliquer la protection par mot de passe",
"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",
+"Set default expiration date" => "Spécifier la date d'expiration par défaut",
+"Expire after " => "Expire après",
+"days" => "jours",
+"Enforce expiration date" => "Impose la date d'expiration",
+"Allow users to share items to the public with links" => "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens",
"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",
"Allow mail notification" => "Autoriser les notifications par couriel",
"Allow users to send mail notification for shared files" => "Autoriser les utilisateurs à envoyer une notification par courriel concernant les fichiers partagés",
-"Set default expiration date" => "Spécifier la date d'expiration par défaut",
-"Expire after " => "Expire après",
-"days" => "jours",
-"Enforce expiration date" => "Impose la date d'expiration",
-"Expire shares by default after N days" => "Par défaut, les partages expireront après N jours",
+"Exclude groups from sharing" => "Exclure les groupes du partage",
+"These groups will still be able to receive shares, but not to initiate them." => "Ces groupes restent autorisés à partager, mais ne peuvent pas les initier",
"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.",
@@ -127,6 +134,7 @@ $TRANSLATIONS = array(
"Email Server" => "Serveur mail",
"This is used for sending out notifications." => "Ceci est utilisé pour l'envoi des notifications.",
"From address" => "Adresse source",
+"mail" => "courriel",
"Authentication required" => "Authentification requise",
"Server address" => "Adresse du serveur",
"Port" => "Port",
@@ -176,11 +184,12 @@ $TRANSLATIONS = array(
"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\" target=\"_blank\">access your Files via WebDAV</a>" => "Utiliser cette adresse pour <a href=\"%s\" target=\"_blank\"> accéder à vos fichiers par WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "L'app de chiffrement n’est plus activée, veuillez déchiffrer tous vos fichiers",
"Log-in password" => "Mot de passe de connexion",
"Decrypt all Files" => "Déchiffrer tous les fichiers",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vos clés de chiffrement ont été déplacées dans l'emplacement de backup. Si quelque chose devait mal se passer, vous pouvez restaurer les clés. Choisissez la suppression permanente seulement si vous êtes sûr que tous les fichiers ont été déchiffrés correctement.",
+"Restore Encryption Keys" => "Restaurer les clés de chiffrement",
+"Delete Encryption Keys" => "Supprimer les clés de chiffrement",
"Login Name" => "Nom d'utilisateur",
"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 207007d56d8f6483bc7f9cd03fdee2d4136a2fa0..056247b0076a121c8d8a19e7f10954f88d92553a 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Ficheiros descifrados satisfactoriamente",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Non foi posÃbel descifrar os seus ficheiros. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
"Couldn't decrypt your files, check your password and try again" => "Non foi posÃbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo",
+"Encryption keys deleted permanently" => "As chaves de cifrado foron eliminadas permanentemente",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Non foi posÃbel eliminar permanentemente as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
"Email saved" => "Correo gardado",
"Invalid email" => "Correo incorrecto",
"Unable to delete group" => "Non é posÃbel eliminar o grupo.",
"Unable to delete user" => "Non é posÃbel eliminar o usuario",
+"Backups restored successfully" => "As copias de seguranza foron restauradas satisfactoriamente",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Non foi posÃbel restaurar as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
"Language changed" => "O idioma cambiou",
"Invalid request" => "Petición incorrecta",
"Admins can't remove themself from the admin group" => "Os administradores non poden eliminarse a si mesmos do grupo admin",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Bo contrasinal",
"Strong password" => "Contrasinal forte",
"Decrypting files... Please wait, this can take some time." => "Descifrando ficheiros... isto pode levar un anaco.",
+"Delete encryption keys permanently." => "Eliminar permanentemente as chaves de cifrado.",
+"Restore encryption keys." => "Restaurar as chaves de cifrado.",
"deleted" => "eliminado",
"undo" => "desfacer",
"Unable to remove user" => "Non é posÃbel retirar o usuario",
@@ -106,20 +112,21 @@ $TRANSLATIONS = array(
"Enable Share API" => "Activar o API para compartir",
"Allow apps to use the Share API" => "Permitir que os aplicativos empreguen o API para compartir",
"Allow links" => "Permitir ligazóns",
-"Allow users to share items to the public with links" => "Permitir que os usuarios compartan elementos ao público con ligazóns",
+"Enforce password protection" => "Forzar a protección por contrasinal",
"Allow public uploads" => "Permitir os envÃos públicos",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir que os usuarios lle permitan a outros enviar aos seus cartafoles compartidos publicamente",
+"Set default expiration date" => "Definir a data predeterminada de caducidade",
+"Expire after " => "Caduca após",
+"days" => "dÃas",
+"Enforce expiration date" => "Obrigar a data de caducidade",
+"Allow users to share items to the public with links" => "Permitir que os usuarios compartan elementos ao público con ligazóns",
"Allow resharing" => "Permitir compartir",
"Allow users to share items shared with them again" => "Permitir que os usuarios compartan de novo os elementos compartidos con eles",
"Allow users to share with anyone" => "Permitir que os usuarios compartan con calquera",
"Allow users to only share with users in their groups" => "Permitir que os usuarios compartan só cos usuarios dos seus grupos",
"Allow mail notification" => "Permitir o envÃo de notificacións por correo",
"Allow users to send mail notification for shared files" => "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos",
-"Set default expiration date" => "Definir a data predeterminada de caducidade",
-"Expire after " => "Caduca após",
-"days" => "dÃas",
-"Enforce expiration date" => "Obrigar a data de caducidade",
-"Expire shares by default after N days" => "As comparticións, de xeito predeterminado, caducan aos N dÃas",
+"Exclude groups from sharing" => "ExcluÃr grupos da compartición",
+"These groups will still be able to receive shares, but not to initiate them." => "Estes grupos poderán recibir comparticións, mais non inicialas.",
"Security" => "Seguranza",
"Enforce HTTPS" => "Forzar HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Forzar que os clientes se conecten a %s empregando unha conexión cifrada.",
@@ -127,6 +134,7 @@ $TRANSLATIONS = array(
"Email Server" => "Servidor de correo",
"This is used for sending out notifications." => "Isto utilizase para o envÃo de notificacións.",
"From address" => "Desde o enderezo",
+"mail" => "correo",
"Authentication required" => "RequÃrese autenticación",
"Server address" => "Enderezo do servidor",
"Port" => "Porto",
@@ -176,11 +184,12 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Escolla unha imaxe para o perfil",
"Language" => "Idioma",
"Help translate" => "Axude na tradución",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Empregue esta ligazón <a href=\"%s\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "O aplicativo de cifrado non está activado, descifre todos os ficheiros",
"Log-in password" => "Contrasinal de acceso",
"Decrypt all Files" => "Descifrar todos os ficheiros",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posÃbel descifrar correctamente todos os ficheiros.",
+"Restore Encryption Keys" => "Restaurar as chaves de cifrado",
+"Delete Encryption Keys" => "Eliminar as chaves de cifrado",
"Login Name" => "Nome de acceso",
"Create" => "Crear",
"Admin Recovery Password" => "Contrasinal de recuperación do administrador",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 0b42c2167adbb11f3805fe780f6a7dcbbf8758f7..b5e80155b8288730a39ce0f8eb6601ac06843b9d 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -91,7 +91,6 @@ $TRANSLATIONS = array(
"Cancel" => "ביטול",
"Language" => "פה",
"Help translate" => "עזרה בתרגו×",
-"WebDAV" => "WebDAV",
"Login Name" => "×©× ×›× ×™×¡×”",
"Create" => "יצירה",
"Admin Recovery Password" => "ססמת השחזור של ×”×ž× ×”×œ",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 928b42a201436f625e3f9fef5a806df6789adb7d..9cca3377042197ca7513ad5975c4ae8b6eb07130 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -89,9 +89,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "A megosztás API-jának engedélyezése",
"Allow apps to use the Share API" => "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást",
"Allow links" => "Linkek engedélyezése",
-"Allow users to share items to the public with links" => "LehetÅ‘vé teszi, hogy a felhasználók linkek segÃtségével külsÅ‘sökkel is megoszthassák az adataikat",
"Allow public uploads" => "Feltöltést engedélyezése mindenki számára",
-"Allow users to enable others to upload into their publicly shared folders" => "Engedélyezni a felhasználóknak, hogy beállÃithassák, hogy mások feltölthetnek a nyilvánosan megosztott mappákba.",
+"Allow users to share items to the public with links" => "LehetÅ‘vé teszi, hogy a felhasználók linkek segÃtségével külsÅ‘sökkel is megoszthassák az adataikat",
"Allow resharing" => "A továbbosztás engedélyezése",
"Allow users to share items shared with them again" => "Lehetővé teszi, hogy a felhasználók a velük megosztott állományokat megosszák egy további, harmadik féllel",
"Allow users to share with anyone" => "A felhasználók bárkivel megoszthatják állományaikat",
@@ -142,8 +141,6 @@ $TRANSLATIONS = array(
"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\" target=\"_blank\">access your Files via WebDAV</a>" => "Ezt a cÃmet használd, hogy <a href=\"%s\" target=\"_blank\">hozzáférj a fileokhoz WebDAV-on keresztül</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "A titkosÃtó alkalmazás továbbiakban nem lesz engedélyezve, szüntesd meg a titkosÃtását a file-jaidnak.",
"Log-in password" => "Bejelentkezési jelszó",
"Decrypt all Files" => "KititkosÃtja az összes file-t",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 07c46a673d3ab6c702b00e4c87f8299b0981fe21..ac6cd5cae5ab895a8e2fe514a7cf846052d9bec0 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Saved" => "Disimpan",
"Email sent" => "Email terkirim",
"Encryption" => "Enkripsi",
"Unable to load list from App Store" => "Tidak dapat memuat daftar dari App Store",
@@ -36,6 +37,11 @@ $TRANSLATIONS = array(
"Update" => "Perbarui",
"Updated" => "Diperbarui",
"Select a profile picture" => "Pilih foto profil",
+"Very weak password" => "Sandi sangat lemah",
+"Weak password" => "Sandi lemah",
+"So-so password" => "Sandi lumayan",
+"Good password" => "Sandi baik",
+"Strong password" => "Sandi kuat",
"Decrypting files... Please wait, this can take some time." => "Mendeskripsi berkas... Modon tunggu, ini memerlukan beberapa saat.",
"deleted" => "dihapus",
"undo" => "urungkan",
@@ -79,9 +85,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Aktifkan API Pembagian",
"Allow apps to use the Share API" => "Izinkan aplikasi untuk menggunakan API Pembagian",
"Allow links" => "Izinkan tautan",
-"Allow users to share items to the public with links" => "Izinkan pengguna untuk berbagi item kepada publik lewat tautan",
"Allow public uploads" => "Izinkan unggahan publik",
-"Allow users to enable others to upload into their publicly shared folders" => "Izinkan pengguna memungkinkan orang lain untuk mengunggah kedalam folder berbagi publik mereka",
+"Allow users to share items to the public with links" => "Izinkan pengguna untuk berbagi item kepada publik lewat tautan",
"Allow resharing" => "Izinkan pembagian ulang",
"Allow users to share items shared with them again" => "Izinkan pengguna untuk berbagi kembali item yang dibagikan kepada mereka.",
"Allow users to share with anyone" => "Izinkan pengguna untuk berbagi kepada siapa saja",
@@ -131,8 +136,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Pilih sebagai gambar profil",
"Language" => "Bahasa",
"Help translate" => "Bantu menerjemahkan",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses Berkas via WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "Aplikasi enkripsi tidak lagi diaktifkan, silahkan mendekripsi semua file Anda",
"Log-in password" => "Sandi masuk",
"Decrypt all Files" => "Deskripsi semua Berkas",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index 3f8b5accda2dd2a0eb81f48b81c735b69035f775..fc296053138eba54f795e7242941203759bf7f19 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -58,7 +58,6 @@ $TRANSLATIONS = array(
"Cancel" => "Hætta við",
"Language" => "Tungumál",
"Help translate" => "Hjálpa við þýðingu",
-"WebDAV" => "WebDAV",
"Create" => "Búa til",
"Default Storage" => "Sjálfgefin gagnageymsla",
"Unlimited" => "Ótakmarkað",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index e0fcb6cde6c4a5cfc0806cc7516581b9e6f25d23..f8c0361c09ec7c5ae6fd8e9f5e909957bf74c59c 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "File decifrato correttamente",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Impossibile decifrare i tuoi file, controlla il file owncloud.log o chiedi al tuo amministratore",
"Couldn't decrypt your files, check your password and try again" => "Impossibile decifrare i tuoi file, controlla la password e prova ancora",
+"Encryption keys deleted permanently" => "Chiavi di cifratura eliminate definitivamente",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Impossibile eliminare definitivamente le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
"Email saved" => "Email salvata",
"Invalid email" => "Email non valida",
"Unable to delete group" => "Impossibile eliminare il gruppo",
"Unable to delete user" => "Impossibile eliminare l'utente",
+"Backups restored successfully" => "Copie di sicurezza ripristinate correttamente",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Impossibile ripristinare le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
"Language changed" => "Lingua modificata",
"Invalid request" => "Richiesta non valida",
"Admins can't remove themself from the admin group" => "Gli amministratori non possono rimuovere se stessi dal gruppo di amministrazione",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Password buona",
"Strong password" => "Password forte",
"Decrypting files... Please wait, this can take some time." => "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.",
+"Delete encryption keys permanently." => "Elimina definitivamente le chiavi di cifratura.",
+"Restore encryption keys." => "Ripristina le chiavi di cifratura.",
"deleted" => "eliminati",
"undo" => "annulla",
"Unable to remove user" => "Impossibile rimuovere l'utente",
@@ -106,20 +112,21 @@ $TRANSLATIONS = array(
"Enable Share API" => "Abilita API di condivisione",
"Allow apps to use the Share API" => "Consenti alle applicazioni di utilizzare le API di condivisione",
"Allow links" => "Consenti collegamenti",
-"Allow users to share items to the public with links" => "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti",
+"Enforce password protection" => "Imponi la protezione con password",
"Allow public uploads" => "Consenti caricamenti pubblici",
-"Allow users to enable others to upload into their publicly shared folders" => "Consenti agli utenti di abilitare altri al caricamento nelle loro cartelle pubbliche condivise",
+"Set default expiration date" => "Imposta data di scadenza predefinita",
+"Expire after " => "Scadenza dopo",
+"days" => "giorni",
+"Enforce expiration date" => "Forza la data di scadenza",
+"Allow users to share items to the public with links" => "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti",
"Allow resharing" => "Consenti la ri-condivisione",
"Allow users to share items shared with them again" => "Consenti agli utenti di condividere a loro volta elementi condivisi da altri",
"Allow users to share with anyone" => "Consenti agli utenti di condividere con chiunque",
"Allow users to only share with users in their groups" => "Consenti agli utenti di condividere solo con utenti dei loro gruppi",
"Allow mail notification" => "Consenti le notifiche tramite posta elettronica",
"Allow users to send mail notification for shared files" => "Consenti agli utenti di inviare email di notifica per i file condivisi",
-"Set default expiration date" => "Imposta data di scadenza predefinita",
-"Expire after " => "Scadenza dopo",
-"days" => "giorni",
-"Enforce expiration date" => "Forza la data di scadenza",
-"Expire shares by default after N days" => "Le condivisioni scadono in modo predefinito dopo N giorni",
+"Exclude groups from sharing" => "Escludi gruppi dalla condivisione",
+"These groups will still be able to receive shares, but not to initiate them." => "Questi gruppi saranno in grado di ricevere condivisioni, ma non iniziarle.",
"Security" => "Protezione",
"Enforce HTTPS" => "Forza HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Forza i client a connettersi a %s tramite una connessione cifrata.",
@@ -127,6 +134,7 @@ $TRANSLATIONS = array(
"Email Server" => "Server di posta",
"This is used for sending out notifications." => "Viene utilizzato per inviare le notifiche.",
"From address" => "Indirizzo mittente",
+"mail" => "posta",
"Authentication required" => "Autenticazione richiesta",
"Server address" => "Indirizzo del server",
"Port" => "Porta",
@@ -176,11 +184,12 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Scegli come immagine del profilo",
"Language" => "Lingua",
"Help translate" => "Migliora la traduzione",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\">accedere ai tuoi file con WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "L'applicazione di cifratura non è più abilitata, decifra tutti i tuoi file",
"Log-in password" => "Password di accesso",
"Decrypt all Files" => "Decifra tutti i file",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Le tue chiavi di cifratura sono state spostate in una posizione sicura. Se qualcosa non dovesse funzionare, potrai ripristinare le chiavi. Eliminale definitivamente solo se sei sicuro che tutti i file siano stati decifrati.",
+"Restore Encryption Keys" => "Ripristina chiavi di cifratura",
+"Delete Encryption Keys" => "Elimina chiavi di cifratura",
"Login Name" => "Nome utente",
"Create" => "Crea",
"Admin Recovery Password" => "Password di ripristino amministrativa",
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
index 186be0c377cf1ee96ebec24184bfe3301679e5df..e580e2956b83eebe6b2ebed6967b2f5ca4bc7cc8 100644
--- a/settings/l10n/ja.php
+++ b/settings/l10n/ja.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "ファイルã®å¾©å·åŒ–ã«æˆåŠŸã—ã¾ã—ãŸ",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "ファイルを復å·åŒ–ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚owncloud ã®ãƒã‚°ã‚’調査ã™ã‚‹ã‹ã€ç®¡ç†è€…ã«é€£çµ¡ã—ã¦ãã ã•ã„。",
"Couldn't decrypt your files, check your password and try again" => "ファイルを復å·åŒ–ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚パスワードを確èªã®ã†ãˆå†è©¦è¡Œã—ã¦ãã ã•ã„。",
+"Encryption keys deleted permanently" => "æš—å·åŒ–ã‚ーã¯å®Œå…¨ã«å‰Šé™¤ã•ã‚Œã¾ã™",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "æš—å·åŒ–ã‚ーを完全ã«å‰Šé™¤ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚owncloud.logを確èªã™ã‚‹ã‹ã€ç®¡ç†è€…ã«å•ã„åˆã‚ã›ã¦ãã ã•ã„。",
"Email saved" => "メールアドレスをä¿å˜ã—ã¾ã—ãŸ",
"Invalid email" => "無効ãªãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹",
"Unable to delete group" => "グループを削除ã§ãã¾ã›ã‚“",
"Unable to delete user" => "ユーザーを削除ã§ãã¾ã›ã‚“",
+"Backups restored successfully" => "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã®å¾©å…ƒã«æˆåŠŸã—ã¾ã—ãŸ",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "æš—å·åŒ–ã‚ーを復元ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚owncloud.logを確èªã™ã‚‹ã‹ã€ç®¡ç†è€…ã«å•ã„åˆã‚ã›ã¦ãã ã•ã„。",
"Language changed" => "言語ãŒå¤‰æ›´ã•ã‚Œã¾ã—ãŸ",
"Invalid request" => "ä¸æ£ãªãƒªã‚¯ã‚¨ã‚¹ãƒˆ",
"Admins can't remove themself from the admin group" => "管ç†è€…ã¯è‡ªèº«ã‚’管ç†è€…グループã‹ã‚‰å‰Šé™¤ã§ãã¾ã›ã‚“。",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "良好ãªãƒ‘スワード",
"Strong password" => "å¼·ã„パスワード",
"Decrypting files... Please wait, this can take some time." => "ファイルを複åˆä¸... ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„ã€ã“ã®å‡¦ç†ã«ã¯å°‘ã—時間ãŒã‹ã‹ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。",
+"Delete encryption keys permanently." => "æš—å·åŒ–ã‚ーを永久ã«å‰Šé™¤ã™ã‚‹ã€‚",
+"Restore encryption keys." => "æš—å·åŒ–ã‚ーを復元ã™ã‚‹ã€‚",
"deleted" => "削除",
"undo" => "å…ƒã«æˆ»ã™",
"Unable to remove user" => "ユーザーを削除ã§ãã¾ã›ã‚“",
@@ -106,20 +112,19 @@ $TRANSLATIONS = array(
"Enable Share API" => "共有APIを有効ã«ã™ã‚‹",
"Allow apps to use the Share API" => "アプリã‹ã‚‰ã®å…±æœ‰APIã®åˆ©ç”¨ã‚’許å¯ã™ã‚‹",
"Allow links" => "リンクを許å¯ã™ã‚‹",
-"Allow users to share items to the public with links" => "ユーザーãŒãƒªãƒ³ã‚¯ã«ã‚ˆã‚Šã‚¢ã‚¤ãƒ†ãƒ を公開ã™ã‚‹ã“ã¨ã‚’許å¯ã™ã‚‹",
+"Enforce password protection" => "常ã«ãƒ‘スワードä¿è·ã‚’有効ã«ã™ã‚‹",
"Allow public uploads" => "パブリックãªã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’許å¯",
-"Allow users to enable others to upload into their publicly shared folders" => "公開ã—ã¦ã„る共有フォルダーã¸ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’共有ã—ã¦ã„るメンãƒãƒ¼ã«ã‚‚許å¯",
+"Set default expiration date" => "有効期é™ã®æ—¢å®šå€¤ã‚’è¨å®š",
+"Expire after " => "無効ã«ãªã‚‹ã¾ã§",
+"days" => "æ—¥",
+"Enforce expiration date" => "有効期é™ã‚’åæ˜ ã•ã›ã‚‹",
+"Allow users to share items to the public with links" => "ユーザーãŒãƒªãƒ³ã‚¯ã«ã‚ˆã‚Šã‚¢ã‚¤ãƒ†ãƒ を公開ã™ã‚‹ã“ã¨ã‚’許å¯ã™ã‚‹",
"Allow resharing" => "å†å…±æœ‰ã‚’許å¯ã™ã‚‹",
"Allow users to share items shared with them again" => "ユーザーãŒå…±æœ‰ã—ã¦ã„るアイテムã®å†å…±æœ‰ã‚’許å¯ã™ã‚‹",
"Allow users to share with anyone" => "ユーザーã«èª°ã¨ã§ã‚‚共有ã™ã‚‹ã“ã¨ã‚’許å¯ã™ã‚‹",
"Allow users to only share with users in their groups" => "ユーザーã«ã‚°ãƒ«ãƒ¼ãƒ—内ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¨ã®ã¿å…±æœ‰ã‚’許å¯ã™ã‚‹",
"Allow mail notification" => "メール通知を許å¯",
"Allow users to send mail notification for shared files" => "共有ファイルã«é–¢ã™ã‚‹ãƒ¡ãƒ¼ãƒ«é€šçŸ¥ã®é€ä¿¡ã‚’ユーザã«è¨±å¯ã™ã‚‹",
-"Set default expiration date" => "有効期é™ã®æ—¢å®šå€¤ã‚’è¨å®š",
-"Expire after " => "無効ã«ãªã‚‹ã¾ã§",
-"days" => "æ—¥",
-"Enforce expiration date" => "有効期é™ã‚’åæ˜ ã•ã›ã‚‹",
-"Expire shares by default after N days" => "既定値ã§ã¯ N 日後ã«å…±æœ‰ã‚’無効ã«ã—ã¾ã™",
"Security" => "ã‚»ã‚ュリティ",
"Enforce HTTPS" => "常ã«HTTPSを使用ã™ã‚‹",
"Forces the clients to connect to %s via an encrypted connection." => "クライアントã‹ã‚‰ %sã¸ã®æŽ¥ç¶šã‚’常ã«æš—å·åŒ–ã—ã¾ã™ã€‚",
@@ -176,11 +181,12 @@ $TRANSLATIONS = array(
"Choose as profile image" => "プãƒãƒ•ã‚¡ã‚¤ãƒ«ç”»åƒã¨ã—ã¦é¸æŠž",
"Language" => "言語",
"Help translate" => "翻訳ã«å”力ã™ã‚‹",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">WebDAV 経由ã§ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¢ã‚¯ã‚»ã‚¹</a> ã™ã‚‹ã«ã¯ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’利用ã—ã¦ãã ã•ã„",
"The encryption app is no longer enabled, please decrypt all your files" => "æš—å·åŒ–アプリã¯ã‚‚ã¯ã‚„有効ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’複åˆã—ã¦ãã ã•ã„",
"Log-in password" => "ãƒã‚°ã‚¤ãƒ³ãƒ‘スワード",
"Decrypt all Files" => "ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’複åˆã™ã‚‹",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "æš—å·åŒ–ã‚ーã¯ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—å ´æ‰€ã«ç§»å‹•ã•ã‚Œã¾ã—ãŸã€‚何ã‹å•é¡ŒãŒã‚ã£ãŸå ´åˆã¯ã€ã‚ーを復元ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒæ£ã—ã復å·åŒ–ã•ã‚ŒãŸã“ã¨ãŒç¢ºä¿¡ã§ãã‚‹å ´åˆã«ã®ã¿ã€ã‚ーを完全ã«å‰Šé™¤ã—ã¦ãã ã•ã„。",
+"Restore Encryption Keys" => "æš—å·åŒ–ã‚ーを復元ã™ã‚‹",
+"Delete Encryption Keys" => "æš—å·åŒ–ã‚ーを削除ã™ã‚‹",
"Login Name" => "ãƒã‚°ã‚¤ãƒ³å",
"Create" => "作æˆ",
"Admin Recovery Password" => "管ç†è€…リカãƒãƒªãƒ‘スワード",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index 88f6ef514d55769061b4381226d0392bdf82442b..b11d62271228a5171fc71b97068353a5d3043589 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -92,7 +92,6 @@ $TRANSLATIONS = array(
"Cancel" => "უáƒáƒ ყáƒáƒ¤áƒ",
"Language" => "ენáƒ",
"Help translate" => "თáƒáƒ გმნის დáƒáƒ®áƒ›áƒáƒ ებáƒ",
-"WebDAV" => "WebDAV",
"Login Name" => "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის სáƒáƒ®áƒ”ლი",
"Create" => "შექმნáƒ",
"Default Storage" => "სáƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ სáƒáƒªáƒáƒ•áƒ˜",
diff --git a/settings/l10n/km.php b/settings/l10n/km.php
index 679c7cd3901ecb7c499298cbed01624444099438..0bf073001e409083d909b87ca63fca0e6a66613d 100644
--- a/settings/l10n/km.php
+++ b/settings/l10n/km.php
@@ -1,6 +1,11 @@
<?php
$TRANSLATIONS = array(
+"Saved" => "បាន​រក្សាទុក",
+"test email settings" => "សាក​ល្បង​ការ​កំណážáŸ‹â€‹áž¢áŸŠáž¸áž˜áŸ‚áž›",
+"If you received this email, the settings seem to be correct." => "ប្រសិន​បើ​អ្នក​ទទួល​បាន​អ៊ីមែល​នáŸáŸ‡ មាន​នáŸáž™â€‹ážáž¶â€‹áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹áž‚ឺ​បាន​ážáŸ’រឹមម​ážáŸ’រូវ​ហើយ។",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "មាន​កំហុស​កើážâ€‹áž¡áž¾áž„​នៅ​ពáŸáž›â€‹áž€áŸ†áž–ុង​ផ្ញើ​អ៊ីមែល​ចáŸáž‰áŸ” សូម​មើល​ការ​កំណážáŸ‹â€‹ážšáž”ស់​អ្នក​ម្ដង​ទៀážáŸ”",
"Email sent" => "បាន​ផ្ញើ​អ៊ីមែល",
+"You need to set your user email before being able to send test emails." => "អ្នក​ážáŸ’រូវ​ážáŸ‚​កំណážáŸ‹â€‹áž¢áŸŠáž¸áž˜áŸ‚ល​របស់​អ្នក​មុន​នឹង​អាច​ផ្ញើ​អ៊ីមែល​សាកល្បង​បាន។",
"Encryption" => "កូដនីយកម្ម",
"Unable to load list from App Store" => "មិនអាចផ្ទុកបញ្ជីកម្មវិធីពី App Store",
"Authentication error" => "កំហុស​ការ​ផ្ទៀង​ផ្ទាážáŸ‹â€‹áž—ាព​ážáŸ’រឹម​ážáŸ’រូវ",
@@ -16,7 +21,10 @@ $TRANSLATIONS = array(
"Unable to add user to group %s" => "មិន​អាច​បន្ážáŸ‚ម​អ្នក​ប្រើ​ទៅ​ក្រុម %s",
"Unable to remove user from group %s" => "មិន​អាច​ដក​អ្នក​ប្រើ​ចáŸáž‰â€‹áž–ី​ក្រុម​ %s",
"Couldn't update app." => "មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី។",
+"Wrong password" => "ážáž»ážŸâ€‹áž–ាក្យ​សម្ងាážáŸ‹",
+"Sending..." => "កំពុង​ផ្ញើ...",
"User Documentation" => "ឯកសារ​សម្រាប់​អ្នក​ប្រើប្រាស់",
+"Admin Documentation" => "កម្រង​ឯកសារ​អភិបាល",
"Update to {appversion}" => "ធ្វើ​បច្ចុប្បន្នភាព​ទៅ {appversion}",
"Disable" => "បិទ",
"Enable" => "បើក",
@@ -26,6 +34,12 @@ $TRANSLATIONS = array(
"Error" => "កំហុស",
"Update" => "ធ្វើ​បច្ចុប្បន្នភាព",
"Updated" => "បាន​ធ្វើ​បច្ចុប្បន្នភាព",
+"Select a profile picture" => "ជ្រើស​រូបភាព​ប្រវážáŸ’ážáž·ážšáž¼áž”",
+"Very weak password" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ​ណាស់",
+"Weak password" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’សោយ",
+"So-so password" => "ពាក្យ​សម្ងាážáŸ‹â€‹áž’ម្មážáž¶",
+"Good password" => "ពាក្យ​សម្ងាážáŸ‹â€‹áž›áŸ’អ",
+"Strong password" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’លាំង",
"deleted" => "បាន​លុប",
"undo" => "មិន​ធ្វើ​វិញ",
"Unable to remove user" => "មិន​អាច​ដក​អ្នក​ប្រើ​ចáŸáž‰",
@@ -37,7 +51,10 @@ $TRANSLATIONS = array(
"Error creating user" => "មាន​កំហុស​ក្នុង​ការ​បង្កើážâ€‹áž¢áŸ’នក​ប្រើ",
"A valid password must be provided" => "ážáŸ’រូវ​ផ្ដល់​ពាក្យ​សម្ងាážáŸ‹â€‹áž²áŸ’យ​បាន​ážáŸ’រឹម​ážáŸ’រូវ",
"__language_name__" => "__language_name__",
+"None" => "គ្មាន",
"Login" => "ចូល",
+"SSL" => "SSL",
+"TLS" => "TLS",
"Security Warning" => "បម្រាម​សុវážáŸ’ážáž·áž—ាព",
"Setup Warning" => "បម្រាម​ការ​ដំឡើង",
"Module 'fileinfo' missing" => "ážáŸ’វះ​ម៉ូឌុល 'fileinfo'",
@@ -48,12 +65,17 @@ $TRANSLATIONS = array(
"Enable Share API" => "បើក API ចែក​រំលែក",
"Allow apps to use the Share API" => "អនុញ្ញាážâ€‹áž²áŸ’យ​កម្មវិធី​ប្រើ API ចែក​រំលែក",
"Allow links" => "អនុញ្ញាážâ€‹ážáŸ†ážŽ",
+"Allow public uploads" => "អនុញ្ញាážâ€‹áž€áž¶ážšâ€‹áž•áŸ’ទុក​ឡើង​ជា​សាធារណៈ",
"Allow users to share items to the public with links" => "អនុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​ប្រើ​ចែក​រំលែក​របស់​ទៅ​សាធារណៈ​ជាមួយ​ážáŸ†ážŽ",
"Allow resharing" => "អនុញ្ញាážâ€‹áž€áž¶ážšâ€‹áž…ែក​រំលែក​ម្ដង​ទៀáž",
"Allow users to share with anyone" => "អនុញ្ញាážâ€‹áž²áŸ’យ​អ្នក​ប្រើ​ចែក​រំលែក​ជាមួយ​នរណា​ម្នាក់",
"Security" => "សុវážáŸ’ážáž·áž—ាព",
"Enforce HTTPS" => "បង្ážáŸ† HTTPS",
+"Email Server" => "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល",
+"From address" => "ពី​អាសយដ្ឋាន",
"Server address" => "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ",
+"Port" => "ច្រក",
+"Send email" => "ផ្ញើ​អ៊ីមែល",
"Log" => "Log",
"Log level" => "កម្រិហLog",
"More" => "ច្រើន​ទៀáž",
@@ -67,18 +89,29 @@ $TRANSLATIONS = array(
"Forum" => "ážœáŸáž‘ិកាពិភាក្សា",
"Bugtracker" => "Bugtracker",
"Password" => "ពាក្យសម្ងាážáŸ‹",
+"Your password was changed" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក​ážáŸ’រូវ​បាន​ប្ដូរ",
+"Unable to change your password" => "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាážáŸ‹â€‹ážšáž”ស់​អ្នក​បាន​ទáŸ",
"Current password" => "ពាក្យសម្ងាážáŸ‹â€‹áž”ច្ចុប្បន្ន",
"New password" => "ពាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’មី",
"Change password" => "ប្ážáž¼ážšâ€‹áž–ាក្យសម្ងាážáŸ‹",
"Email" => "អ៊ីមែល",
"Your email address" => "អ៊ីម៉ែល​របស់​អ្នក",
+"Profile picture" => "រូបភាព​ប្រវážáŸ’ážáž·ážšáž¼áž”",
+"Upload new" => "ផ្ទុកឡើង​ážáŸ’មី",
+"Select new from Files" => "ជ្រើស​ážáŸ’មី​ពី​ឯកសារ",
+"Remove image" => "ដក​រូបភាព​ចáŸáž‰",
"Cancel" => "លើកលែង",
"Language" => "ភាសា",
"Help translate" => "ជួយ​បក​ប្រែ",
-"WebDAV" => "WebDAV",
+"Log-in password" => "ពាក្យ​សម្ងាážáŸ‹â€‹áž…ូល​គណនី",
"Login Name" => "ចូល",
"Create" => "បង្កើáž",
+"Default Storage" => "ឃ្លាំង​ផ្ទុក​លំនាំ​ដើម",
+"Unlimited" => "មិន​កំណážáŸ‹",
"Other" => "ផ្សáŸáž„ៗ",
-"Username" => "ឈ្មោះ​អ្នកប្រើ"
+"Username" => "ឈ្មោះ​អ្នកប្រើ",
+"Storage" => "ឃ្លាំង​ផ្ទុក",
+"set new password" => "កំណážáŸ‹â€‹áž–ាក្យ​សម្ងាážáŸ‹â€‹ážáŸ’មី",
+"Default" => "លំនាំ​ដើម"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index b17a25e4c32cc8dff4d183b49c87fc3c4fa3d572..f8319249d4d19c080a36b5f44b19d8346e63934a 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Saved" => "ì €ìž¥ë¨",
"Email sent" => "ì´ë©”ì¼ ë°œì†¡ë¨",
"Encryption" => "암호화",
"Unable to load list from App Store" => "앱 ìŠ¤í† ì–´ì—ì„œ 목ë¡ì„ ê°€ì ¸ì˜¬ 수 없습니다",
@@ -90,9 +91,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "ê³µìœ API 사용하기",
"Allow apps to use the Share API" => "앱ì—ì„œ ê³µìœ API를 ì‚¬ìš©í• ìˆ˜ 있ë„ë¡ í—ˆìš©",
"Allow links" => "ë§í¬ 허용",
-"Allow users to share items to the public with links" => "사용ìžê°€ 개별 í•ëª©ì˜ ë§í¬ë¥¼ ê³µìœ í• ìˆ˜ 있ë„ë¡ í—ˆìš©",
"Allow public uploads" => "공개 업로드 허용",
-"Allow users to enable others to upload into their publicly shared folders" => "다른 사용ìžë“¤ì´ ê³µê°œëœ ê³µìœ í´ë”ì— íŒŒì¼ ì—…ë¡œë“œ 허용",
+"Allow users to share items to the public with links" => "사용ìžê°€ 개별 í•ëª©ì˜ ë§í¬ë¥¼ ê³µìœ í• ìˆ˜ 있ë„ë¡ í—ˆìš©",
"Allow resharing" => "ìž¬ê³µìœ í—ˆìš©",
"Allow users to share items shared with them again" => "사용ìžì—게 ê³µìœ ëœ í•ëª©ì„ 다시 ê³µìœ í• ìˆ˜ 있ë„ë¡ í—ˆìš©",
"Allow users to share with anyone" => "누구나와 ê³µìœ í• ìˆ˜ 있ë„ë¡ í—ˆìš©",
@@ -151,8 +151,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "프로필 ì´ë¯¸ì§€ë¡œ 사용",
"Language" => "언어",
"Help translate" => "ë²ˆì— ë•ê¸°",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "WebDAVë¡œ 파ì¼ì— ì ‘ê·¼í•˜ë ¤ë©´ <a href=\"%s\" target=\"_blank\">ì´ ì£¼ì†Œë¥¼ 사용하ì‹ì‹œì˜¤</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "암호화 ì•±ì´ ë¹„í™œì„±í™”ë˜ì—ˆìŠµë‹ˆë‹¤. ëª¨ë“ íŒŒì¼ì„ 복호화해야 합니다.",
"Log-in password" => "ë¡œê·¸ì¸ ì•”í˜¸",
"Decrypt all Files" => "ëª¨ë“ íŒŒì¼ ë³µí˜¸í™”",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 2e7036aaaed9b15224d9650591179a79882c74a8..45728392c411cd9122c1f8a2a61707a9cce70247 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -69,9 +69,8 @@ $TRANSLATIONS = array(
"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 users to share items to the public with links" => "Leisti naudotojams viešai dalintis elementais su nuorodomis",
"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",
@@ -120,8 +119,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Pasirinkite profilio paveiksliukÄ…",
"Language" => "Kalba",
"Help translate" => "Padėkite išversti",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Naudokite šį adresą, kad <a href=\"%s\" target=\"_blank\">pasiektumėte savo failus per WebDAV</a>",
"Log-in password" => "Prisijungimo slaptažodis",
"Decrypt all Files" => "IÅ¡Å¡ifruoti visus failus",
"Login Name" => "Vartotojo vardas",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 7d5f964a96ec5272ef59d8ee9d19b8637d381423..261f5a6d37e26a141f455c2f377eaefa48b1eb71 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -56,9 +56,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Aktivēt koplietošanas API",
"Allow apps to use the Share API" => "Ļauj lietotnēm izmantot koplietošanas API",
"Allow links" => "Atļaut saites",
-"Allow users to share items to the public with links" => "Ä»aut lietotÄjiem publiski dalÄ«ties ar vienumiem, izmantojot saites",
"Allow public uploads" => "Atļaut publisko augÅ¡upielÄdi",
-"Allow users to enable others to upload into their publicly shared folders" => "Ä»aut lietotÄjiem iespÄ“jot atļaut citiem augÅ¡upielÄdÄ“t failus viņu publiskajÄs mapÄ“s",
+"Allow users to share items to the public with links" => "Ä»aut lietotÄjiem publiski dalÄ«ties ar vienumiem, izmantojot saites",
"Allow resharing" => "Atļaut atkÄrtotu koplietoÅ¡anu",
"Allow users to share items shared with them again" => "Ä»aut lietotÄjiem dalÄ«ties ar vienumiem atkÄrtoti",
"Allow users to share with anyone" => "Ä»aut lietotÄjiem dalÄ«ties ar visiem",
@@ -100,7 +99,6 @@ $TRANSLATIONS = array(
"Cancel" => "Atcelt",
"Language" => "Valoda",
"Help translate" => "Palīdzi tulkot",
-"WebDAV" => "WebDAV",
"Log-in password" => "PieslÄ“gÅ¡anÄs parole",
"Decrypt all Files" => "Atšifrēt visus failus",
"Login Name" => "IerakstÄ«Å¡anÄs vÄrds",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 975079eb39ecf9762fc70d418a1f077fc60ca1b0..27bdcc73048ba788881525be7be4f7cf540b3e1b 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -95,7 +95,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Одбери фотографија за профилот",
"Language" => "Јазик",
"Help translate" => "Помогни во преводот",
-"WebDAV" => "WebDAV",
"Log-in password" => "Лозинка за најавување",
"Decrypt all Files" => "Дешифрирај ги Ñите датотеки",
"Login Name" => "Име за најава",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index a43bde76bccec52968de7ea903167268b4b1cc10..4ed4930271de3c0ad37973363461a136ceb68f40 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,18 +1,32 @@
<?php
$TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Ugyldig verdi angitt for %s",
"Saved" => "Lagret",
+"test email settings" => "test innstillinger for e-post",
+"If you received this email, the settings seem to be correct." => "Hvis du mottok denne e-posten er innstillingene tydeligvis korrekte.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Et problem oppstod under sending av e-posten. Sjekk innstillingene.",
"Email sent" => "E-post sendt",
+"You need to set your user email before being able to send test emails." => "Du må sette e-postadressen for brukeren din før du kan teste sending av e-post.",
+"Send mode" => "Sendemodus",
"Encryption" => "Kryptering",
+"Authentication method" => "Autentiseringsmetode",
"Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
"Authentication error" => "Autentiseringsfeil",
"Your full name has been changed." => "Ditt fulle navn er blitt endret.",
"Unable to change full name" => "Klarte ikke å endre fullt navn",
"Group already exists" => "Gruppen finnes allerede",
"Unable to add group" => "Kan ikke legge til gruppe",
+"Files decrypted successfully" => "Dekryptering av filer vellykket",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Kunne ikke dekryptere filene dine. Sjekk owncloud.log eller spør administratoren",
+"Couldn't decrypt your files, check your password and try again" => "Kunne ikke dekryptere filene dine. Sjekk passordet ditt og prøv igjen",
+"Encryption keys deleted permanently" => "Krypteringsnøkler permanent slettet",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Kunne ikke slette krypteringsnøklene dine permanent. Sjekk owncloud.log eller spør administratoren",
"Email saved" => "Epost lagret",
"Invalid email" => "Ugyldig epost",
"Unable to delete group" => "Kan ikke slette gruppe",
"Unable to delete user" => "Kan ikke slette bruker",
+"Backups restored successfully" => "Vellykket gjenoppretting fra sikkerhetskopier",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Kunne ikke gjenopprette krypteringsnøklene dine. Sjekk owncloud.log eller spør administratoren",
"Language changed" => "Språk endret",
"Invalid request" => "Ugyldig forespørsel",
"Admins can't remove themself from the admin group" => "Admin kan ikke flytte seg selv fra admingruppen",
@@ -27,6 +41,7 @@ $TRANSLATIONS = array(
"Unable to change password" => "Kunne ikke endre passord",
"Sending..." => "Sender...",
"User Documentation" => "Brukerdokumentasjon",
+"Admin Documentation" => "Admin-dokumentasjon",
"Update to {appversion}" => "Oppdater til {appversion}",
"Disable" => "Slå avBehandle ",
"Enable" => "Aktiver",
@@ -41,9 +56,12 @@ $TRANSLATIONS = array(
"Select a profile picture" => "Velg et profilbilde",
"Very weak password" => "Veldig svakt passord",
"Weak password" => "Svakt passord",
+"So-so password" => "So-so-passord",
"Good password" => "Bra passord",
"Strong password" => "Sterkt passord",
"Decrypting files... Please wait, this can take some time." => "Dekrypterer filer... Vennligst vent, dette kan ta litt tid.",
+"Delete encryption keys permanently." => "Slett krypteringsnøkler permanent.",
+"Restore encryption keys." => "Gjenopprett krypteringsnøkler.",
"deleted" => "slettet",
"undo" => "angre",
"Unable to remove user" => "Kunne ikke slette bruker",
@@ -63,6 +81,8 @@ $TRANSLATIONS = array(
"Fatal issues only" => "Kun fatale problemer",
"None" => "Ingen",
"Login" => "Logg inn",
+"Plain" => "Enkel",
+"NT LAN Manager" => "NT LAN Manager",
"SSL" => "SSL",
"TLS" => "TLS",
"Security Warning" => "Sikkerhetsadvarsel",
@@ -82,6 +102,9 @@ $TRANSLATIONS = array(
"Internet connection not working" => "Ingen internettilkopling",
"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 serveren har ikke en fungerende Internett-tilkobling. Dette betyr at noen av funksjonene, slik som montering av ekstern lagring, påminnelser om oppdatering eller installering av 3-parts apper ikke fungerer. Fjerntilgang til filer og utsending av påminnelser i e-post virker kanskje ikke heller. Vi anbefaler at Internett-forbindelsen for denne serveren aktiveres hvis du vil ha full funksjonalitet.",
"Cron" => "Cron",
+"Last cron was executed at %s." => "Siste cron ble utført %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Siste cron ble utført %s. Dette er mer enn en time siden. Noe ser ut til å være galt.",
+"Cron was not executed yet!" => "Cron er ikke utført ennå!",
"Execute one task with each page loaded" => "Utfør en oppgave med hver side som blir lastet",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http.",
"Use systems cron service to call the cron.php file every 15 minutes." => "Bruk systemets cron-tjeneste for å kalle cron.php hvert 15. minutt.",
@@ -89,23 +112,36 @@ $TRANSLATIONS = array(
"Enable Share API" => "Aktiver API for Deling",
"Allow apps to use the Share API" => "Tillat apps å bruke API for Deling",
"Allow links" => "Tillat lenker",
-"Allow users to share items to the public with links" => "Tillat brukere å dele filer offentlig med lenker",
+"Enforce password protection" => "Tving passordbeskyttelse",
"Allow public uploads" => "Tillat offentlig opplasting",
-"Allow users to enable others to upload into their publicly shared folders" => "Tillat at brukere lar andre laste opp til deres offentlig delte mapper",
+"Set default expiration date" => "Sett standard utløpsdato",
+"Expire after " => "Utløper etter",
+"days" => "dager",
+"Enforce expiration date" => "Tving utløpsdato",
+"Allow users to share items to the public with links" => "Tillat brukere å dele filer offentlig med lenker",
"Allow resharing" => "TIllat videredeling",
"Allow users to share items shared with them again" => "Tillat brukere å dele filer som allerede har blitt delt med dem",
"Allow users to share with anyone" => "Tillat brukere å dele med alle",
"Allow users to only share with users in their groups" => "Tillat kun deling med andre brukere i samme gruppe",
"Allow mail notification" => "Tillat påminnelser i e-post",
+"Allow users to send mail notification for shared files" => "Tlllat at brukere sender e-postvarsler for delte filer",
+"Exclude groups from sharing" => "Utelukk grupper fra deling",
+"These groups will still be able to receive shares, but not to initiate them." => "Disse gruppene vil fremdeles kunne motta delinger men ikke lage dem.",
"Security" => "Sikkerhet",
"Enforce HTTPS" => "Tving HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Tvinger klientene til å koble til %s via en kryptert forbindelse.",
"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Vennligst koble til din %s via HTTPS for å aktivere eller deaktivere tvungen SSL.",
+"Email Server" => "E-postserver",
+"This is used for sending out notifications." => "Dette brukes for utsending av varsler.",
"From address" => "Fra adresse",
+"mail" => "e-post",
+"Authentication required" => "Autentisering kreves",
"Server address" => "Server-adresse",
"Port" => "Port",
+"Credentials" => "PÃ¥loggingsdetaljer",
"SMTP Username" => "SMTP-brukernavn",
"SMTP Password" => "SMTP-passord",
+"Test email settings" => "Test innstillinger for e-post",
"Send email" => "Send e-post",
"Log" => "Logg",
"Log level" => "Loggnivå",
@@ -118,6 +154,7 @@ $TRANSLATIONS = array(
"Select an App" => "Velg en app",
"Documentation:" => "Dokumentasjon:",
"See application page at apps.owncloud.com" => "Se applikasjonens side på apps.owncloud.org",
+"See application website" => "Vis applikasjonens nettsted",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensiert av <span class=\"author\"></span>",
"Administrator Documentation" => "Administratordokumentasjon",
"Online Documentation" => "Online dokumentasjon",
@@ -136,6 +173,7 @@ $TRANSLATIONS = array(
"Full Name" => "Fullt navn",
"Email" => "Epost",
"Your email address" => "Din e-postadresse",
+"Fill in an email address to enable password recovery and receive notifications" => "Legg inn en e-postadresse for å aktivere passordgjenfinning og motta varsler",
"Profile picture" => "Profilbilde",
"Upload new" => "Last opp nytt",
"Select new from Files" => "Velg nytt fra Filer",
@@ -146,11 +184,12 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Velg som profilbilde",
"Language" => "Språk",
"Help translate" => "Bidra til oversettelsen",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Bruk denne adressen for å <a href=\"%s\" target=\"_blank\">aksessere filene dine via WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "Krypterings-appen er ikke aktiv lenger. Vennligst dekrypter alle filene dine",
"Log-in password" => "Innloggingspassord",
"Decrypt all Files" => "Dekrypter alle filer",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Krypteringsnøklene dine er flyttet til en plass for sikkerhetskopier. Hvis noe gikk galt kan du gjenopprette nøklene. Ikke slett dem permanent før du er ikker på at alle filer er dekryptert korrekt.",
+"Restore Encryption Keys" => "Gjenopprett krypteringsnøkler",
+"Delete Encryption Keys" => "Slett krypteringsnøkler",
"Login Name" => "Logginn navn",
"Create" => "Opprett",
"Admin Recovery Password" => "Administrativt gjenopprettingspassord",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 97554ed050ffdfdcfbc9d02f359c8d140d08eaa6..b67908a4a36129c8b772adf5a5ea5c5304a0c9a4 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Bestanden succesvol ontsleuteld",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Kon uw bestanden niet ontsleutelem. Controleer uw owncloud logs of vraag het uw beheerder",
"Couldn't decrypt your files, check your password and try again" => "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw",
+"Encryption keys deleted permanently" => "Cryptosleutels permanent verwijderd",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Kom uw cryptosleutels niet permanent verwijderen. Controleer uw owncloud.log, of neem contact op met uw beheerder.",
"Email saved" => "E-mail bewaard",
"Invalid email" => "Ongeldige e-mail",
"Unable to delete group" => "Niet in staat om groep te verwijderen",
"Unable to delete user" => "Niet in staat om gebruiker te verwijderen",
+"Backups restored successfully" => "Backup succesvol terggezet",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Kon uw cryptosleutels niet herstellen. Controleer uw owncloud.log of neem contact op met uw beheerder",
"Language changed" => "Taal aangepast",
"Invalid request" => "Ongeldige aanvraag",
"Admins can't remove themself from the admin group" => "Admins kunnen zichzelf niet uit de admin groep verwijderen",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Goed wachtwoord",
"Strong password" => "Sterk wachtwoord",
"Decrypting files... Please wait, this can take some time." => "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.",
+"Delete encryption keys permanently." => "Verwijder de encryptiesleutels permanent",
+"Restore encryption keys." => "Herstel de encryptiesleutels",
"deleted" => "verwijderd",
"undo" => "ongedaan maken",
"Unable to remove user" => "Kon gebruiker niet verwijderen",
@@ -106,20 +112,21 @@ $TRANSLATIONS = array(
"Enable Share API" => "Activeren Share API",
"Allow apps to use the Share API" => "Apps toestaan de Share API te gebruiken",
"Allow links" => "Toestaan links",
-"Allow users to share items to the public with links" => "Toestaan dat gebruikers objecten met links delen met anderen",
+"Enforce password protection" => "Dwing wachtwoordbeveiliging af",
"Allow public uploads" => "Sta publieke uploads toe",
-"Allow users to enable others to upload into their publicly shared folders" => "Sta gebruikers toe anderen in hun publiek gedeelde mappen bestanden te uploaden",
+"Set default expiration date" => "Stel standaard vervaldatum in",
+"Expire after " => "Vervalt na",
+"days" => "dagen",
+"Enforce expiration date" => "Verplicht de vervaldatum",
+"Allow users to share items to the public with links" => "Toestaan dat gebruikers objecten met links delen met anderen",
"Allow resharing" => "Toestaan opnieuw delen",
"Allow users to share items shared with them again" => "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen",
"Allow users to share with anyone" => "Toestaan dat gebruikers met iedereen delen",
"Allow users to only share with users in their groups" => "Instellen dat gebruikers alleen met leden binnen hun groepen delen",
"Allow mail notification" => "Toestaan e-mailnotificaties",
"Allow users to send mail notification for shared files" => "Sta gebruikers toe om e-mailnotificaties te versturen voor gedeelde bestanden",
-"Set default expiration date" => "Stel standaard vervaldatum in",
-"Expire after " => "Vervalt na",
-"days" => "dagen",
-"Enforce expiration date" => "Verplicht de vervaldatum",
-"Expire shares by default after N days" => "Laat shares standaard vervallen na N dagen",
+"Exclude groups from sharing" => "Sluit groepen uit van delen",
+"These groups will still be able to receive shares, but not to initiate them." => "Deze groepen kunnen gedeelde mappen bestanden ontvangen, maar kunnen ze niet starten.",
"Security" => "Beveiliging",
"Enforce HTTPS" => "Afdwingen HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Dwingt de clients om een versleutelde verbinding te maken met %s",
@@ -127,6 +134,7 @@ $TRANSLATIONS = array(
"Email Server" => "E-mailserver",
"This is used for sending out notifications." => "Dit wordt gestuurd voor het verzenden van meldingen.",
"From address" => "Afzenderadres",
+"mail" => "e-mail",
"Authentication required" => "Authenticatie vereist",
"Server address" => "Server adres",
"Port" => "Poort",
@@ -176,11 +184,12 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Kies als profielafbeelding",
"Language" => "Taal",
"Help translate" => "Help met vertalen",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Gebruik deze link <a href=\"%s\" target=\"_blank\">om uw bestanden via WebDAV te benaderen</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "De crypto app is niet langer geactiveerd, u moet alle bestanden decrypten.",
"Log-in password" => "Inlog-wachtwoord",
"Decrypt all Files" => "Decodeer alle bestanden",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Uw cryptosleutels zijn verplaatst naar een backup locatie. Als iets iets verkeerd ging, kunt u de sleutels herstellen. Verwijder ze alleen permanent als u zeker weet dat de bestanden goed zijn versleuteld.",
+"Restore Encryption Keys" => "Herstel cryptosleutels",
+"Delete Encryption Keys" => "Verwijder cryptosleutels",
"Login Name" => "Inlognaam",
"Create" => "Aanmaken",
"Admin Recovery Password" => "Beheer herstel wachtwoord",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 7eacdbedfb041faf644a792b47be7775726e3bf6..c064d66c708de1fee1458eb6ec03efe14b0fe935 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -64,9 +64,8 @@ $TRANSLATIONS = array(
"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 users to share items to the public with links" => "La brukarar dela ting offentleg med lenkjer",
"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",
@@ -112,7 +111,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Vel som profilbilete",
"Language" => "Språk",
"Help translate" => "Hjelp oss å omsetja",
-"WebDAV" => "WebDAV",
"Log-in password" => "Innloggingspassord",
"Decrypt all Files" => "Dekrypter alle filene",
"Login Name" => "Innloggingsnamn",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index dbdc2ef9999237f32340e7bc1e64b92de11ca44a..2ff5b00d986fc80042b2659ec2ec4fad0b2c0690 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Pliki zostały poprawnie zdeszyfrowane",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nie można zdeszyfrować Twoich plików, proszę sprawdzić owncloud.log lub zapytać administratora",
"Couldn't decrypt your files, check your password and try again" => "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbuj ponownie",
+"Encryption keys deleted permanently" => "Klucze szyfrujące zostały trwale usunięte",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nie można trwale usunąć Twoich kluczy szyfrujących, proszę sprawdź owncloud.log lub zapytaj administratora",
"Email saved" => "E-mail zapisany",
"Invalid email" => "Nieprawidłowy e-mail",
"Unable to delete group" => "Nie można usunąć grupy",
"Unable to delete user" => "Nie można usunąć użytkownika",
+"Backups restored successfully" => "Archiwum zostało prawidłowo przywrócone",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nie można przywrócić kluczy szyfrujących, proszę sprawdzić owncloud.log lub zapytać administratora",
"Language changed" => "Zmieniono język",
"Invalid request" => "Nieprawidłowe żądanie",
"Admins can't remove themself from the admin group" => "Administratorzy nie mogą usunąć siebie samych z grupy administratorów",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Dobre hasło",
"Strong password" => "Mocne hasło",
"Decrypting files... Please wait, this can take some time." => "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.",
+"Delete encryption keys permanently." => "Usuń trwale klucze szyfrujące.",
+"Restore encryption keys." => "Przywróć klucze szyfrujące.",
"deleted" => "usunięto",
"undo" => "cofnij",
"Unable to remove user" => "Nie można usunąć użytkownika",
@@ -106,20 +112,21 @@ $TRANSLATIONS = array(
"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",
+"Enforce password protection" => "Wymuś zabezpieczenie hasłem",
"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",
+"Set default expiration date" => "Ustaw domyślną datę wygaśnięcia",
+"Expire after " => "WygaÅ› po",
+"days" => "dniach",
+"Enforce expiration date" => "Wymuś datę wygaśnięcia",
+"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 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",
"Allow users to only share with users in their groups" => "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup",
"Allow mail notification" => "Pozwól na mailowe powiadomienia",
"Allow users to send mail notification for shared files" => "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików",
-"Set default expiration date" => "Ustaw domyślną datę wygaśnięcia",
-"Expire after " => "WygaÅ› po",
-"days" => "dniach",
-"Enforce expiration date" => "Wymuś datę wygaśnięcia",
-"Expire shares by default after N days" => "Wygaś udziały domyślnie po N dniach",
+"Exclude groups from sharing" => "Wyklucz grupy z udostępniania",
+"These groups will still be able to receive shares, but not to initiate them." => "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania.",
"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.",
@@ -176,11 +183,12 @@ $TRANSLATIONS = array(
"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\" target=\"_blank\">access your Files via WebDAV</a>" => "Użyj tego adresu do <a href=\"%s\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik",
"Log-in password" => "Hasło logowania",
"Decrypt all Files" => "Odszyfruj wszystkie pliki",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Twoje klucze szyfrujące zostały przeniesione do lokalizacji archialnej. Jeśli coś poszło nie tak, możesz je przywrócić. Usuń je trwale tylko, gdy jesteś pewien(na), że wszystkie pliki zostały prawidłowo zdeszyfrowane.",
+"Restore Encryption Keys" => "Przywróć klucze szyfrujące",
+"Delete Encryption Keys" => "Usuń klucze szyfrujące",
"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 e7534a21a7d0f83778f762475045934aaa5bdd82..e8da8ee94a334234d005525dc4dc37a3fd805fcb 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Arquivos descriptografados com sucesso",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Não foi possÃvel descriptografar os arquivos, verifique a sua owncloud.log ou pergunte ao seu administrador",
"Couldn't decrypt your files, check your password and try again" => "Não foi possÃvel descriptografar os arquivos, verifique sua senha e tente novamente",
+"Encryption keys deleted permanently" => "Chaves de criptografia excluÃdas permanentemente",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Não foi possÃvel excluir permanentemente suas chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
"Email saved" => "E-mail salvo",
"Invalid email" => "E-mail inválido",
"Unable to delete group" => "Não foi possÃvel remover grupo",
"Unable to delete user" => "Não foi possÃvel remover usuário",
+"Backups restored successfully" => "Backup restaurado com sucesso",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Não foi possÃvel salvar as chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
"Language changed" => "Idioma alterado",
"Invalid request" => "Pedido inválido",
"Admins can't remove themself from the admin group" => "Admins não podem ser removidos do grupo admin",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Boa senha",
"Strong password" => "Senha forte",
"Decrypting files... Please wait, this can take some time." => "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
+"Delete encryption keys permanently." => "Eliminando a chave de criptografia permanentemente.",
+"Restore encryption keys." => "Restaurar chave de criptografia.",
"deleted" => "excluÃdo",
"undo" => "desfazer",
"Unable to remove user" => "ImpossÃvel remover usuário",
@@ -106,20 +112,21 @@ $TRANSLATIONS = array(
"Enable Share API" => "Habilitar API de Compartilhamento",
"Allow apps to use the Share API" => "Permitir que aplicativos usem a API de Compartilhamento",
"Allow links" => "Permitir links",
-"Allow users to share items to the public with links" => "Permitir que usuários compartilhem itens com o público usando links",
+"Enforce password protection" => "Reforce a proteção por senha",
"Allow public uploads" => "Permitir envio público",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir que usuários deem permissão a outros para enviarem arquivios para suas pastas compartilhadas publicamente",
+"Set default expiration date" => "Configurar a data de expiração",
+"Expire after " => "Expirar depois de",
+"days" => "dias",
+"Enforce expiration date" => "Fazer cumprir a data de expiração",
+"Allow users to share items to the public with links" => "Permitir que usuários compartilhem itens com o público usando links",
"Allow resharing" => "Permitir recompartilhamento",
"Allow users to share items shared with them again" => "Permitir que usuários compartilhem novamente itens compartilhados com eles",
"Allow users to share with anyone" => "Permitir que usuários compartilhem com qualquer um",
"Allow users to only share with users in their groups" => "Permitir que usuários compartilhem somente com usuários em seus grupos",
"Allow mail notification" => "Permitir notificação por email",
"Allow users to send mail notification for shared files" => "Permitir aos usuários enviar notificação de email para arquivos compartilhados",
-"Set default expiration date" => "Configurar a data de expiração",
-"Expire after " => "Expirar depois de",
-"days" => "dias",
-"Enforce expiration date" => "Fazer cumprir a data de expiração",
-"Expire shares by default after N days" => "Expirar compartilhamentos automaticamente depois de N dias",
+"Exclude groups from sharing" => "Excluir grupos de compartilhamento",
+"These groups will still be able to receive shares, but not to initiate them." => "Esses grupos ainda serão capazes de receber compartilhamentos, mas não para iniciá-los.",
"Security" => "Segurança",
"Enforce HTTPS" => "Forçar HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Obrigar os clientes que se conectem a %s através de uma conexão criptografada.",
@@ -127,6 +134,7 @@ $TRANSLATIONS = array(
"Email Server" => "Servidor de Email",
"This is used for sending out notifications." => "Isto é usado para o envio de notificações.",
"From address" => "Do Endereço",
+"mail" => "email",
"Authentication required" => "Autenticação é requerida",
"Server address" => "Endereço do servidor",
"Port" => "Porta",
@@ -176,11 +184,12 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Escolha como imagem para o perfil",
"Language" => "Idioma",
"Help translate" => "Ajude a traduzir",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso a seus Arquivos via WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "O aplicativo de criptografia não está habilitado, por favor descriptar todos os seus arquivos",
"Log-in password" => "Senha de login",
"Decrypt all Files" => "Decripti todos os Arquivos",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Suas chaves de criptografia forão movidas para o local de backup. Se alguma coisa deu errado, você pode salvar as chaves. Só excluÃ-las permanentemente se você tiver certeza de que todos os arquivos forão descriptografados corretamente.",
+"Restore Encryption Keys" => "Restaurar Chaves de Criptografia",
+"Delete Encryption Keys" => "Eliminar Chaves de Criptografia",
"Login Name" => "Nome de Login",
"Create" => "Criar",
"Admin Recovery Password" => "Recuperação da Senha do Administrador",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 6bd466bfd6711584ffb29182da448f7d1965be25..f8b63bf55d8135a552bb6ab13a298af38d625b29 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,9 +1,12 @@
<?php
$TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Valor dado a %s éinválido",
"Saved" => "Guardado",
"test email settings" => "testar configurações de email",
+"If you received this email, the settings seem to be correct." => "Se você recebeu este e-mail as configurações parecem estar correctas",
"A problem occurred while sending the e-mail. Please revisit your settings." => "Ocorreu um erro ao enviar o email. Por favor verifique as definições.",
"Email sent" => "E-mail enviado",
+"You need to set your user email before being able to send test emails." => "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste",
"Send mode" => "Modo de envio",
"Encryption" => "Encriptação",
"Authentication method" => "Método de autenticação",
@@ -14,10 +17,16 @@ $TRANSLATIONS = array(
"Group already exists" => "O grupo já existe",
"Unable to add group" => "ImpossÃvel acrescentar o grupo",
"Files decrypted successfully" => "Ficheiros desencriptados com sucesso",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Não foi possÃvel desencriptar os seus arquivos. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+"Couldn't decrypt your files, check your password and try again" => "Não foi possÃvel desencriptar os seus arquivos. Verifique a sua senha e tente novamente",
+"Encryption keys deleted permanently" => "A chave de encriptação foi eliminada permanentemente",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Não foi possÃvel excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador",
"Email saved" => "Email guardado",
"Invalid email" => "Email inválido",
"Unable to delete group" => "ImpossÃvel apagar grupo",
"Unable to delete user" => "ImpossÃvel apagar utilizador",
+"Backups restored successfully" => "Cópias de segurança foram restauradas com sucesso",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nao foi possivel restaurar as suas chaves de encriptacao. Verifique a sua owncloud.log ou pergunte ao seu administrador",
"Language changed" => "Idioma alterado",
"Invalid request" => "Pedido Inválido",
"Admins can't remove themself from the admin group" => "Os administradores não se podem remover a eles mesmos do grupo admin.",
@@ -51,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Password Forte",
"Strong password" => "Password muito forte",
"Decrypting files... Please wait, this can take some time." => "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
+"Delete encryption keys permanently." => "Excluir as chaves encriptadas de forma permanente.",
+"Restore encryption keys." => "Restaurar chaves encriptadas.",
"deleted" => "apagado",
"undo" => "desfazer",
"Unable to remove user" => "Não foi possÃvel remover o utilizador",
@@ -71,6 +82,7 @@ $TRANSLATIONS = array(
"None" => "Nenhum",
"Login" => "Login",
"Plain" => "Plano",
+"NT LAN Manager" => "Gestor de NT LAN",
"SSL" => "SSL",
"TLS" => "TLS",
"Security Warning" => "Aviso de Segurança",
@@ -90,6 +102,9 @@ $TRANSLATIONS = array(
"Internet connection not working" => "A ligação à internet não está a funcionar",
"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." => "Este servidor ownCloud não tem uma ligação de internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretender obter todas as funcionalidades do ownCloud.",
"Cron" => "Cron",
+"Last cron was executed at %s." => "O ultimo cron foi executado em %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "O ultima cron foi executado em %s a mais duma hora. Algo não está certo.",
+"Cron was not executed yet!" => "Cron ainda não foi executado!",
"Execute one task with each page loaded" => "Executar uma tarefa com cada página carregada",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
"Use systems cron service to call the cron.php file every 15 minutes." => "Use o serviço cron do sistema para chamar o ficheiro cron.php a cada 15 minutos.",
@@ -97,16 +112,21 @@ $TRANSLATIONS = array(
"Enable Share API" => "Activar a API de partilha",
"Allow apps to use the Share API" => "Permitir que os utilizadores usem a API de partilha",
"Allow links" => "Permitir links",
-"Allow users to share items to the public with links" => "Permitir que os utilizadores partilhem itens com o público utilizando um link.",
+"Enforce password protection" => "Forçar protecção da palavra passe",
"Allow public uploads" => "Permitir Envios Públicos",
-"Allow users to enable others to upload into their publicly shared folders" => "Permitir aos utilizadores que possam definir outros utilizadores para carregar ficheiros para as suas pastas publicas",
+"Set default expiration date" => "Especificar a data padrão de expiração",
+"Expire after " => "Expira após",
+"days" => "dias",
+"Enforce expiration date" => "Forçar a data de expiração",
+"Allow users to share items to the public with links" => "Permitir que os utilizadores partilhem itens com o público utilizando um link.",
"Allow resharing" => "Permitir repartilha",
"Allow users to share items shared with them again" => "Permitir que os utilizadores partilhem itens partilhados com eles",
"Allow users to share with anyone" => "Permitir que os utilizadores partilhem com todos",
"Allow users to only share with users in their groups" => "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo",
"Allow mail notification" => "Permitir notificação por email",
-"Expire after " => "Expira após",
-"days" => "dias",
+"Allow users to send mail notification for shared files" => "Permita que o utilizador envie notificações por correio electrónico para ficheiros partilhados",
+"Exclude groups from sharing" => "Excluir grupos das partilhas",
+"These groups will still be able to receive shares, but not to initiate them." => "Estes grupos poderão receber partilhas, mas não poderão iniciá-las.",
"Security" => "Segurança",
"Enforce HTTPS" => "Forçar HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Forçar os clientes a ligar a %s através de uma ligação encriptada",
@@ -114,6 +134,7 @@ $TRANSLATIONS = array(
"Email Server" => "Servidor de email",
"This is used for sending out notifications." => "Isto é utilizado para enviar notificações",
"From address" => "Do endereço",
+"mail" => "Correio",
"Authentication required" => "Autenticação necessária",
"Server address" => "Endereço do servidor",
"Port" => "Porto",
@@ -152,6 +173,7 @@ $TRANSLATIONS = array(
"Full Name" => "Nome completo",
"Email" => "Email",
"Your email address" => "O seu endereço de email",
+"Fill in an email address to enable password recovery and receive notifications" => "Preencha com um endereço e-mail para permitir a recuperação de senha e receber notificações",
"Profile picture" => "Foto do perfil",
"Upload new" => "Carregar novo",
"Select new from Files" => "Seleccionar novo a partir dos ficheiros",
@@ -162,11 +184,12 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Escolha uma fotografia de perfil",
"Language" => "Idioma",
"Help translate" => "Ajude a traduzir",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros",
"Log-in password" => "Password de entrada",
"Decrypt all Files" => "Desencriptar todos os ficheiros",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "As suas chaves de encriptação foram movidas para um local de segurança. Em caso de algo correr mal você pode restaurar as chaves. Só deve eliminar as chaves permanentemente se tiver certeza absoluta que os ficheiros são decrepitados correctamente.",
+"Restore Encryption Keys" => "Restaurar as chaves de encriptação",
+"Delete Encryption Keys" => "Apagar as chaves de encriptação",
"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 7ada22648dee7e54dbd637a3d4998fdf05bbc298..b16f65324a7aead845c62623b18479987b2cecd1 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -77,9 +77,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Activare API partajare",
"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 users to enable others to upload into their publicly shared folders" => "Permite utilizatorilor sa activeze opțiunea de încărcare a fișierelor în dosarele lor publice de către alte persoane",
+"Allow users to share items to the public with links" => "Permite utilizatorilor să partajeze fișiere în mod public prin legături",
"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",
@@ -130,8 +129,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Alege drept imagine de profil",
"Language" => "Limba",
"Help translate" => "Ajută la traducere",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Folosește această adresă <a href=\"%s\" target=\"_blank\">pentru acces la fișierele tale folosind WebDAV</a>",
"Log-in password" => "Parolă",
"Decrypt all Files" => "Decriptează toate fișierele",
"Login Name" => "Autentificare",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 1e780926f77b9e9d09d5993dd70f140ddc9aa5bc..82677dbb6dd5770b1b0ea47ce3b5746e00fe0d36 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -16,10 +16,14 @@ $TRANSLATIONS = array(
"Unable to change full name" => "Ðевозможно изменить полное имÑ",
"Group already exists" => "Группа уже ÑущеÑтвует",
"Unable to add group" => "Ðевозможно добавить группу",
+"Files decrypted successfully" => "Дешифрование файлов прошло уÑпешно",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Ошибка при дешифровании файлов. ОбратитеÑÑŒ к вашему ÑиÑтемному админиÑтратору. Доп Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð² owncloud.log",
+"Couldn't decrypt your files, check your password and try again" => "Ошибка при дешифровании файлов. Проверьте Ваш пароль и повторите попытку",
"Email saved" => "Email Ñохранен",
"Invalid email" => "Ðеправильный Email",
"Unable to delete group" => "Ðевозможно удалить группу",
"Unable to delete user" => "Ðевозможно удалить пользователÑ",
+"Backups restored successfully" => "Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ ÑƒÑпешно воÑÑтановлена",
"Language changed" => "Язык изменён",
"Invalid request" => "Ðеправильный запроÑ",
"Admins can't remove themself from the admin group" => "ÐдминиÑтратор не может удалить Ñам ÑÐµÐ±Ñ Ð¸Ð· группы admin",
@@ -98,14 +102,14 @@ $TRANSLATIONS = array(
"Enable Share API" => "Включить API общего доÑтупа",
"Allow apps to use the Share API" => "Позволить приложениÑм иÑпользовать API общего доÑтупа",
"Allow links" => "Разрешить ÑÑылки",
-"Allow users to share items to the public with links" => "Разрешить пользователÑм открывать в общий доÑтуп Ñлементы Ñ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¾Ð¹ ÑÑылкой",
"Allow public uploads" => "Разрешить открытые загрузки",
-"Allow users to enable others to upload into their publicly shared folders" => "Разрешить пользователÑм позволÑÑ‚ÑŒ другим загружать в их открытые папки",
+"Allow users to share items to the public with links" => "Разрешить пользователÑм открывать в общий доÑтуп Ñлементы Ñ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¾Ð¹ ÑÑылкой",
"Allow resharing" => "Разрешить переоткрытие общего доÑтупа",
"Allow users to share items shared with them again" => "Позволить пользователÑм открывать общий доÑтуп к Ñллементам уже открытым в общий доÑтуп",
"Allow users to share with anyone" => "Разрешить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´ÐµÐ»Ð°Ñ‚ÑŒ общий доÑтуп любому",
"Allow users to only share with users in their groups" => "Разрешить пользователÑм делать общий доÑтуп только Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ их групп",
"Allow mail notification" => "Разрешить уведомление по почте",
+"Allow users to send mail notification for shared files" => "Разрешить пользователю оповещать почтой о раÑшаренных файлах",
"Security" => "БезопаÑноÑÑ‚ÑŒ",
"Enforce HTTPS" => "Принудить к HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Принудить клиентов подключатьÑÑ Ðº %s через шифрованное Ñоединение.",
@@ -161,8 +165,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Выберите изображение профилÑ",
"Language" => "Язык",
"Help translate" => "Помочь Ñ Ð¿ÐµÑ€ÐµÐ²Ð¾Ð´Ð¾Ð¼",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "ИÑпользуйте Ñтот адреÑÑ Ð´Ð»Ñ <a href=\"%s\" target=\"_blank\">доÑтупа к вашим файлам через WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "Приложение Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾, пожалуйÑта, раÑшифруйте ваши файлы",
"Log-in password" => "Пароль входа",
"Decrypt all Files" => "СнÑÑ‚ÑŒ шифрование Ñо вÑех файлов",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 3468a87ae18de3d67c8d9916482bedeff6fa55ec..c977985b669070d5a4ae8dbcd67c080156fba404 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -104,17 +104,16 @@ $TRANSLATIONS = array(
"Enable Share API" => "Povoliť API zdieľania",
"Allow apps to use the Share API" => "PovoliÅ¥ aplikáciám použÃvaÅ¥ API na zdieľanie",
"Allow links" => "Povoliť odkazy",
-"Allow users to share items to the public with links" => "PovoliÅ¥ použÃvateľom zdieľaÅ¥ položky pre verejnosÅ¥ cez odkazy",
"Allow public uploads" => "Povoliť verejné nahrávanie súborov",
-"Allow users to enable others to upload into their publicly shared folders" => "PovoliÅ¥ použÃvateľom umožniÅ¥ iným použÃvateľom nahrávaÅ¥ do ich zdieľaného prieÄinka",
+"Expire after " => "Platnosť",
+"days" => "dni",
+"Allow users to share items to the public with links" => "PovoliÅ¥ použÃvateľom zdieľaÅ¥ položky pre verejnosÅ¥ cez odkazy",
"Allow resharing" => "PovoliÅ¥ zdieľanie Äalej",
"Allow users to share items shared with them again" => "PovoliÅ¥ použÃvateľom Äalej zdieľaÅ¥ zdieľané položky",
"Allow users to share with anyone" => "PovoliÅ¥ použÃvateľom zdieľaÅ¥ s kýmkoľvek",
"Allow users to only share with users in their groups" => "PovoliÅ¥ použÃvateľom zdieľaÅ¥ len s použÃvateľmi v ich skupinách",
"Allow mail notification" => "Povoliť odosielať upozornenia emailom",
"Allow users to send mail notification for shared files" => "PovoliÅ¥ použÃvateľom zasielaÅ¥ emailom oznámenie o zdieľanà súborov",
-"Expire after " => "Platnosť",
-"days" => "dni",
"Security" => "ZabezpeÄenie",
"Enforce HTTPS" => "Vynútiť HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Vynúti pripájanie klientov k %s Å¡ifrovaným pripojenÃm.",
@@ -170,8 +169,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Vybrať ako avatara",
"Language" => "Jazyk",
"Help translate" => "Pomôcť s prekladom",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prÃstup k vaÅ¡im súborom cez WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "Šifrovacia aplikácia už nie je spustená, dešifrujte všetky svoje súbory.",
"Log-in password" => "Prihlasovacie heslo",
"Decrypt all Files" => "Dešifrovať všetky súbory",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index c633d472684c0036dfa97c614a6e5cc495fce414..8a2b7218442bd411a36700a2de6cb22412d5c93e 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -105,9 +105,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "OmogoÄi API souporabe",
"Allow apps to use the Share API" => "Dovoli programom uporabo vmesnika API souporabe",
"Allow links" => "Dovoli povezave",
-"Allow users to share items to the public with links" => "Uporabnikom dovoli souporabo predmetov z javnimi povezavami",
"Allow public uploads" => "Dovoli javno pošiljanje datotek v oblak",
-"Allow users to enable others to upload into their publicly shared folders" => "Dovoli uporabnikom, da omogoÄijo drugim uporabnikom, poÅ¡iljati datoteke v javno mapo.",
+"Allow users to share items to the public with links" => "Uporabnikom dovoli souporabo predmetov z javnimi povezavami",
"Allow resharing" => "Dovoli nadaljnjo souporabo",
"Allow users to share items shared with them again" => "Uporabnikom dovoli nadaljnjo souporabo predmetov",
"Allow users to share with anyone" => "Uporabnikom dovoli souporabo s komerkoli",
@@ -167,8 +166,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Izberi kot sliko profila",
"Language" => "Jezik",
"Help translate" => "Sodelujte pri prevajanju",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek rpeko sistema WebDAV</a>.",
"The encryption app is no longer enabled, please decrypt all your files" => "Program za Å¡ifriranje ni veÄ omogoÄen. OdÅ¡ifrirati je treba vse datoteke.",
"Log-in password" => "Prijavno geslo",
"Decrypt all Files" => "Odšifriraj vse datoteke",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index 29925683c0bd17486fbb9bb25e53793eaa15b7e6..ca74ba573c41e036b7064838b69cd3a90faf4aa1 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -49,9 +49,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "Aktivizo API për ndarjet",
"Allow apps to use the Share API" => "Lejoni aplikacionet të përdorin share API",
"Allow links" => "Lejo lidhjet",
-"Allow users to share items to the public with links" => "Lejoni përdoruesit të ndajnë elementët publikisht nëpermjet lidhjeve",
"Allow public uploads" => "Lejo ngarkimin publik",
-"Allow users to enable others to upload into their publicly shared folders" => "Lejo përdoruesit të mundësojnë të tjerët që të ngarkojnë materiale në dosjen e tyre publike",
+"Allow users to share items to the public with links" => "Lejoni përdoruesit të ndajnë elementët publikisht nëpermjet lidhjeve",
"Allow resharing" => "Lejo ri-ndarjen",
"Allow users to share items shared with them again" => "Lejoni përdoruesit të ndjanë dhe ata elementë të ndarë më parë ngë të tjerë",
"Allow users to share with anyone" => "Lejo përdoruesit të ndajnë me cilindo",
@@ -89,7 +88,6 @@ $TRANSLATIONS = array(
"Cancel" => "Anullo",
"Language" => "Gjuha",
"Help translate" => "Ndihmoni në përkthim",
-"WebDAV" => "WebDAV",
"Login Name" => "Emri i Përdoruesit",
"Create" => "Krijo",
"Admin Recovery Password" => "Rigjetja e fjalëkalimit të Admin",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 3723ef3fe5f1698b783e43bfe49ec0d50e030ac1..408e704d40b9fe9cd984e317e6c20f71d982c7bd 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -90,7 +90,6 @@ $TRANSLATIONS = array(
"Cancel" => "Откажи",
"Language" => "Језик",
"Help translate" => " Помозите у превођењу",
-"WebDAV" => "WebDAV",
"Login Name" => "КориÑничко име",
"Create" => "Ðаправи",
"Default Storage" => "Подразумевано Ñкладиште",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index f76eed303b9d962ed4ce3506e201b053a6db4d97..160036c7d988c802f43c013bd11812b4afc05298 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Filerna dekrypterades utan fel",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Det gick inte att dekryptera dina filer, kontrollera din owncloud.log eller fråga administratören",
"Couldn't decrypt your files, check your password and try again" => "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen",
+"Encryption keys deleted permanently" => "Krypteringsnycklar raderades permanent",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Det gick inte att permanent ta bort dina krypteringsnycklar, kontrollera din owncloud.log eller fråga din administratör",
"Email saved" => "E-post sparad",
"Invalid email" => "Ogiltig e-post",
"Unable to delete group" => "Kan inte radera grupp",
"Unable to delete user" => "Kan inte radera användare",
+"Backups restored successfully" => "Återställning av säkerhetskopior lyckades",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Kan inte återställa dina krypteringsnycklar, vänligen kontrollera din owncloud.log eller fråga din administratör.",
"Language changed" => "Språk ändrades",
"Invalid request" => "Ogiltig begäran",
"Admins can't remove themself from the admin group" => "Administratörer kan inte ta bort sig själva från admingruppen",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
"Good password" => "Bra lösenord",
"Strong password" => "Starkt lösenord",
"Decrypting files... Please wait, this can take some time." => "Dekrypterar filer... Vänligen vänta, detta kan ta en stund.",
+"Delete encryption keys permanently." => "Radera krypteringsnycklar permanent",
+"Restore encryption keys." => "Återställ krypteringsnycklar",
"deleted" => "raderad",
"undo" => "Ã¥ngra",
"Unable to remove user" => "Kan inte ta bort användare",
@@ -106,18 +112,21 @@ $TRANSLATIONS = array(
"Enable Share API" => "Aktivera delat API",
"Allow apps to use the Share API" => "Tillåt applikationer att använda delat API",
"Allow links" => "Tillåt länkar",
-"Allow users to share items to the public with links" => "Tillåt delning till allmänheten via publika länkar",
+"Enforce password protection" => "Tillämpa lösenordskydd",
"Allow public uploads" => "Tillåt offentlig uppladdning",
-"Allow users to enable others to upload into their publicly shared folders" => "Tillåt användare att aktivera\nTillåt användare att göra det möjligt för andra att ladda upp till sina offentligt delade mappar",
+"Set default expiration date" => "Ställ in standardutgångsdatum",
+"Expire after " => "Förfaller efter",
+"days" => "dagar",
+"Enforce expiration date" => "Tillämpa förfallodatum",
+"Allow users to share items to the public with links" => "Tillåt delning till allmänheten via publika länkar",
"Allow resharing" => "Tillåt vidaredelning",
"Allow users to share items shared with them again" => "Tillåt användare att dela vidare filer som delats med dem",
"Allow users to share with anyone" => "Tillåt delning med alla",
"Allow users to only share with users in their groups" => "Tillåt bara delning med användare i egna grupper",
"Allow mail notification" => "Tillåt e-post notifikation",
"Allow users to send mail notification for shared files" => "Tillåt användare att skicka mailnotifieringar för delade filer",
-"Expire after " => "Förfaller efter",
-"days" => "dagar",
-"Expire shares by default after N days" => "Låt delningar förfalla som standard efter N dagar",
+"Exclude groups from sharing" => "Exkludera grupp från att dela",
+"These groups will still be able to receive shares, but not to initiate them." => "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar.",
"Security" => "Säkerhet",
"Enforce HTTPS" => "Kräv HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Tvingar klienterna att ansluta till %s via en krypterad anslutning.",
@@ -125,6 +134,7 @@ $TRANSLATIONS = array(
"Email Server" => "E-postserver",
"This is used for sending out notifications." => "Detta används för att skicka ut notifieringar.",
"From address" => "Från adress",
+"mail" => "mail",
"Authentication required" => "Autentisering krävs",
"Server address" => "Serveradress",
"Port" => "Port",
@@ -174,11 +184,12 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Välj som profilbild",
"Language" => "Språk",
"Help translate" => "Hjälp att översätta",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Använd denna adress till <a href=\"%s\" target=\"_blank\">nå dina Filer via WebDAV</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer",
"Log-in password" => "Inloggningslösenord",
"Decrypt all Files" => "Dekryptera alla filer",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Dina krypteringsnycklar flyttas till en backup. Om något gick fel kan du återställa nycklarna. Bara ta bort dem permanent om du är säker på att alla filer dekrypteras korrekt.",
+"Restore Encryption Keys" => "Återställ krypteringsnycklar",
+"Delete Encryption Keys" => "Radera krypteringsnycklar",
"Login Name" => "Inloggningsnamn",
"Create" => "Skapa",
"Admin Recovery Password" => "Admin återställningslösenord",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 14000c59ca1f468bc6d8f2aa09b68797308062b4..f2fa7dd6ead1791495fbaa775fc2b1d655f675f1 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -79,7 +79,6 @@ $TRANSLATIONS = array(
"Cancel" => "ยà¸à¹€à¸¥à¸´à¸",
"Language" => "ภาษา",
"Help translate" => "ช่วยà¸à¸±à¸™à¹à¸›à¸¥",
-"WebDAV" => "WebDAV",
"Login Name" => "ชื่à¸à¸—ี่ใช้สำหรับเข้าสู่ระบบ",
"Create" => "สร้าง",
"Default Storage" => "พื้นที่จำà¸à¸±à¸”ข้à¸à¸¡à¸¹à¸¥à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 4a49dc0bc5f39c2d03d4a0a8b3362a4c3196f834..5bb25289b0f781c9850038b9ba5dff12f193cf2b 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -15,14 +15,18 @@ $TRANSLATIONS = array(
"Your full name has been changed." => "Tam adınız değiştirildi.",
"Unable to change full name" => "Tam adınız değiştirilirken hata",
"Group already exists" => "Grup zaten mevcut",
-"Unable to add group" => "Gruba eklenemiyor",
-"Files decrypted successfully" => "Dosya şifresi başarıyla çözüldü",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dosyalarınızın şifresi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin.",
-"Couldn't decrypt your files, check your password and try again" => "Dosyalarınızın şifresi kaldırılamadı, parolanızı denetleyip yeniden deneyin.",
+"Unable to add group" => "Grup eklenemiyor",
+"Files decrypted successfully" => "Dosyaların şifrelemesi başarıyla kaldırıldı",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dosyalarınızın şifrelemesi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin",
+"Couldn't decrypt your files, check your password and try again" => "Dosyalarınızın şifrelemesi kaldırılamadı, parolanızı denetleyip yeniden deneyin",
+"Encryption keys deleted permanently" => "Şifreleme anahtarları kalıcı olarak silindi",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Şifreleme anahtarlarınız kalıcı olarak silinemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
"Email saved" => "E-posta kaydedildi",
"Invalid email" => "Geçersiz e-posta",
"Unable to delete group" => "Grup silinemiyor",
"Unable to delete user" => "Kullanıcı silinemiyor",
+"Backups restored successfully" => "Yedekler başarıyla geri yüklendi",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Şifreleme anahtarlarınız geri yüklenemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
"Language changed" => "Dil deÄŸiÅŸtirildi",
"Invalid request" => "Geçersiz istek",
"Admins can't remove themself from the admin group" => "Yöneticiler kendilerini admin grubundan kaldıramaz",
@@ -31,15 +35,15 @@ $TRANSLATIONS = array(
"Couldn't update app." => "Uygulama güncellenemedi.",
"Wrong password" => "Hatalı parola",
"No user supplied" => "Kullanıcı girilmedi",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Lütfen bir yönetici kurtarma parolası girin, aksi takdirde tüm kullanıcı verisi kaybedilecek",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Lütfen yönetici kurtarma parolasını girin, aksi takdirde tüm kullanıcı verisi kaybedilecek",
"Wrong admin recovery password. Please check the password and try again." => "Hatalı yönetici kurtarma parolası. Lütfen parolayı denetleyip yeniden deneyin.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme anahtarı başarıyla güncellendi.",
"Unable to change password" => "Parola deÄŸiÅŸtirilemiyor",
"Sending..." => "Gönderiliyor...",
"User Documentation" => "Kullanıcı Belgelendirmesi",
"Admin Documentation" => "Yönetici Belgelendirmesi",
-"Update to {appversion}" => "{appversion} Güncelle",
-"Disable" => "Devre dışı bırak",
+"Update to {appversion}" => "{appversion} sürümüne güncelle",
+"Disable" => "Devre Dışı Bırak",
"Enable" => "EtkinleÅŸtir",
"Please wait...." => "Lütfen bekleyin....",
"Error while disabling app" => "Uygulama devre dışı bırakılırken hata",
@@ -47,7 +51,7 @@ $TRANSLATIONS = array(
"Updating...." => "Güncelleniyor....",
"Error while updating app" => "Uygulama güncellenirken hata",
"Error" => "Hata",
-"Update" => "Güncelleme",
+"Update" => "Güncelle",
"Updated" => "Güncellendi",
"Select a profile picture" => "Bir profil fotoğrafı seçin",
"Very weak password" => "Çok güçsüz parola",
@@ -55,7 +59,9 @@ $TRANSLATIONS = array(
"So-so password" => "Normal parola",
"Good password" => "Ä°yi parola",
"Strong password" => "Güçlü parola",
-"Decrypting files... Please wait, this can take some time." => "Dosyaların şifresi çözülüyor... Lütfen bekleyin, bu biraz zaman alabilir.",
+"Decrypting files... Please wait, this can take some time." => "Dosyaların şifrelemesi kaldırılıyor... Lütfen bekleyin, bu biraz zaman alabilir.",
+"Delete encryption keys permanently." => "Şifreleme anahtarlarını kalıcı olarak sil.",
+"Restore encryption keys." => "Şifreleme anahtarlarını geri yükle.",
"deleted" => "silinen:",
"undo" => "geri al",
"Unable to remove user" => "Kullanıcı kaldırılamıyor",
@@ -68,11 +74,11 @@ $TRANSLATIONS = array(
"A valid password must be provided" => "Geçerli bir parola mutlaka sağlanmalı",
"Warning: Home directory for user \"{user}\" already exists" => "Uyarı: \"{user}\" kullanıcısı için zaten bir Ev dizini mevcut",
"__language_name__" => "Türkçe",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Her şey (Ölümcül konular, hatalar, uyarılar, bilgi, hata ayıklama)",
-"Info, warnings, errors and fatal issues" => "Bilgi, uyarılar, hatalar ve ölümcül konular",
-"Warnings, errors and fatal issues" => "Uyarılar, hatalar ve ölümcül konular",
-"Errors and fatal issues" => "Hatalar ve ölümcül konular",
-"Fatal issues only" => "Sadece ölümcül konular",
+"Everything (fatal issues, errors, warnings, info, debug)" => "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)",
+"Info, warnings, errors and fatal issues" => "Bilgi, uyarılar, hatalar ve ciddi sorunlar",
+"Warnings, errors and fatal issues" => "Uyarılar, hatalar ve ciddi sorunlar",
+"Errors and fatal issues" => "Hatalar ve ciddi sorunlar",
+"Fatal issues only" => "Sadece ciddi sorunlar",
"None" => "Hiçbiri",
"Login" => "Oturum Aç",
"Plain" => "Düz",
@@ -80,17 +86,17 @@ $TRANSLATIONS = array(
"SSL" => "SSL",
"TLS" => "TLS",
"Security Warning" => "Güvenlik Uyarısı",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "%s konumuna HTTP aracılığıyla erişiyorsunuz. Sunucunuzu HTTPS kullanımını zorlaması üzere yapılandırmanızı şiddetle öneririz.",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "%s erişiminiz HTTP aracılığıyla yapılıyor. Sunucunuzu, HTTPS kullanımını zorlamak üzere yapılandırmanızı şiddetle öneririz.",
"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." => "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu belge kök dizini dışına almanızı şiddetle tavsiye ederiz.",
"Setup Warning" => "Kurulum Uyarısı",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya eşitlemesine izin vermek üzere düzgün bir şekilde yapılandırılmamış. WebDAV arayüzü sorunlu görünüyor.",
"Please double check the <a href=\"%s\">installation guides</a>." => "Lütfen <a href='%s'>kurulum kılavuzlarını</a> tekrar kontrol edin.",
"Module 'fileinfo' missing" => "Modül 'fileinfo' kayıp",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modülü 'fileinfo' kayıp. MIME-tip tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.",
"Your PHP version is outdated" => "PHP sürümünüz eski",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "PHP sürümünüz eski. Eski sürümlerde sorun olduğundan 5.3.8 veya daha yeni bir sürüme güncellemenizi şiddetle tavsiye ederiz. Bu kurulumun da doğru çalışmaması da olasıdır.",
-"Locale not working" => "Locale çalışmıyor.",
-"System locale can not be set to a one which supports UTF-8." => "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı",
+"Locale not working" => "Yerel çalışmıyor",
+"System locale can not be set to a one which supports UTF-8." => "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı.",
"This means that there might be problems with certain characters in file names." => "Bu, dosya adlarında belirli karakterlerde problem olabileceği anlamına gelir.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Şu dillerden birini desteklemesi için sisteminize gerekli paketleri kurmanızı şiddetle tavsiye ederiz: %s.",
"Internet connection not working" => "İnternet bağlantısı çalışmıyor",
@@ -101,25 +107,26 @@ $TRANSLATIONS = array(
"Cron was not executed yet!" => "Cron henüz çalıştırılmadı!",
"Execute one task with each page loaded" => "Yüklenen her sayfa ile bir görev çalıştır",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
-"Use systems cron service to call the cron.php file every 15 minutes." => "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
+"Use systems cron service to call the cron.php file every 15 minutes." => "cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
"Sharing" => "Paylaşım",
"Enable Share API" => "Paylaşım API'sini etkinleştir",
"Allow apps to use the Share API" => "Uygulamaların paylaşım API'sini kullanmasına izin ver",
"Allow links" => "Bağlantılara izin ver",
-"Allow users to share items to the public with links" => "Kullanıcıların ögeleri paylaşması için herkese açık bağlantılara izin ver",
+"Enforce password protection" => "Parola korumasını zorla",
"Allow public uploads" => "Herkes tarafından yüklemeye izin ver",
-"Allow users to enable others to upload into their publicly shared folders" => "Kullanıcıların, herkese açık dizinlerine, başkalarının dosya yüklemelerini etkinleştirmelerine izin ver",
-"Allow resharing" => "Paylaşıma izin ver",
+"Set default expiration date" => "Öntanımlı son kullanma tarihini ayarla",
+"Expire after " => "Süre",
+"days" => "gün sonra dolsun",
+"Enforce expiration date" => "Son kullanma tarihini zorla",
+"Allow users to share items to the public with links" => "Kullanıcıların ögeleri paylaşması için herkese açık bağlantılara izin ver",
+"Allow resharing" => "Yeniden paylaşıma izin ver",
"Allow users to share items shared with them again" => "Kullanıcıların kendileri ile paylaşılan ögeleri yeniden paylaşmasına izin ver",
-"Allow users to share with anyone" => "Kullanıcıların her şeyi paylaşmalarına izin ver",
+"Allow users to share with anyone" => "Kullanıcıların herkesle paylaşmasına izin ver",
"Allow users to only share with users in their groups" => "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver",
"Allow mail notification" => "Posta bilgilendirmesine izin ver",
"Allow users to send mail notification for shared files" => "Paylaşılmış dosyalar için kullanıcıların posta bildirimi göndermesine izin ver",
-"Set default expiration date" => "Öntanımlı son kullanma tarihini ayarla",
-"Expire after " => "Şu süreden sonra süresi dolsun",
-"days" => "gün",
-"Enforce expiration date" => "Son kullanma tarihini zorla",
-"Expire shares by default after N days" => "Paylaşımların süresini öntanımlı olarak N günden sonra doldur",
+"Exclude groups from sharing" => "Grupları paylaşma eyleminden hariç tut",
+"These groups will still be able to receive shares, but not to initiate them." => "Bu gruplar hala paylaşımları alabilecek, ancak başlatamayacaktır.",
"Security" => "Güvenlik",
"Enforce HTTPS" => "HTTPS bağlantısına zorla",
"Forces the clients to connect to %s via an encrypted connection." => "İstemcileri %s'a şifreli bir bağlantı ile bağlanmaya zorlar.",
@@ -127,6 +134,7 @@ $TRANSLATIONS = array(
"Email Server" => "E-Posta Sunucusu",
"This is used for sending out notifications." => "Bu, bildirimler gönderilirken kullanılır.",
"From address" => "Kimden adresi",
+"mail" => "posta",
"Authentication required" => "Kimlik doÄŸrulama gerekli",
"Server address" => "Sunucu adresi",
"Port" => "Port",
@@ -138,7 +146,7 @@ $TRANSLATIONS = array(
"Log" => "Günlük",
"Log level" => "Günlük seviyesi",
"More" => "Daha fazla",
-"Less" => "Az",
+"Less" => "Daha az",
"Version" => "Sürüm",
"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 topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır.",
"Add your App" => "Uygulamanızı Ekleyin",
@@ -147,17 +155,17 @@ $TRANSLATIONS = array(
"Documentation:" => "Belgelendirme:",
"See application page at apps.owncloud.com" => "Uygulamanın sayfasına apps.owncloud.com adresinden bakın ",
"See application website" => "Uygulama web sitesine bakın",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisanslayan <span class=\"author\"></span>",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> ile lisanslayan: <span class=\"author\"></span>",
"Administrator Documentation" => "Yönetici Belgelendirmesi",
"Online Documentation" => "Çevrimiçi Belgelendirme",
"Forum" => "Forum",
"Bugtracker" => "Hata Takip Sistemi",
"Commercial Support" => "Ticari Destek",
-"Get the apps to sync your files" => "Dosyalarınızı eşitlemek için uygulamayı indirin",
-"Show First Run Wizard again" => "İlk Çalıştırma Sihirbazını yeniden göster",
+"Get the apps to sync your files" => "Dosyalarınızı eşitlemek için uygulamaları indirin",
+"Show First Run Wizard again" => "İlk Çalıştırma Sihirbazı'nı yeniden göster",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Kullandığınız: <strong>%s</strong>. Kullanılabilir alan: <strong>%s</strong>",
"Password" => "Parola",
-"Your password was changed" => "Åžifreniz deÄŸiÅŸtirildi",
+"Your password was changed" => "Parolanız değiştirildi",
"Unable to change your password" => "Parolanız değiştirilemiyor",
"Current password" => "Mevcut parola",
"New password" => "Yeni parola",
@@ -176,23 +184,24 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Profil resmi olarak seç",
"Language" => "Dil",
"Help translate" => "Çevirilere yardım edin",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">Dosyalarınıza WebDAV aracılığıyla erişmek için</a> bu adresi kullanın",
-"The encryption app is no longer enabled, please decrypt all your files" => "Şifreleme uygulaması artık etkin değil, tüm dosyalarınızın şifrelemesini kaldırın",
+"The encryption app is no longer enabled, please decrypt all your files" => "Şifreleme uygulaması artık etkin değil, lütfen tüm dosyalarınızın şifrelemesini kaldırın",
"Log-in password" => "Oturum açma parolası",
-"Decrypt all Files" => "Tüm dosyaların şifresini çöz",
+"Decrypt all Files" => "Tüm Dosyaların Şifrelemesini Kaldır",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın şifrelemelerinin düzgün bir şekilde kaldırıldığından eminseniz kalıcı olarak silin.",
+"Restore Encryption Keys" => "Şifreleme Anahtarlarını Geri Yükle",
+"Delete Encryption Keys" => "Şifreleme Anahtarlarını Sil",
"Login Name" => "Giriş Adı",
"Create" => "OluÅŸtur",
"Admin Recovery Password" => "Yönetici Kurtarma Parolası",
-"Enter the recovery password in order to recover the users files during password change" => "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için bir kurtarma paroalsı girin",
+"Enter the recovery password in order to recover the users files during password change" => "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
"Default Storage" => "Varsayılan Depolama",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Lütfen disk alanı kotasını girin (örnek: \"512MB\" veya \"12GB\")",
-"Unlimited" => "Limitsiz",
+"Unlimited" => "Sınırsız",
"Other" => "DiÄŸer",
"Username" => "Kullanıcı Adı",
"Storage" => "Depolama",
"change full name" => "tam adı değiştir",
"set new password" => "yeni parola belirle",
-"Default" => "Varsayılan"
+"Default" => "Öntanımlı"
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index c55834f733797525d1fb02df08b2ee5864f138a5..2136f9af1e57dfe4351d85778f508b8d9acdc2fa 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -68,7 +68,6 @@ $TRANSLATIONS = array(
"Cancel" => "ۋاز كەچ",
"Language" => "تىل",
"Help translate" => "تەرجىمىگە ياردەم",
-"WebDAV" => "WebDAV",
"Login Name" => "تىزىمغا كىرىش ئاتى",
"Create" => "قۇر",
"Default Storage" => "ÙƒÛ†Úۈلدىكى ساقلىغۇچ",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 0c8adce29c0a23a53a0532fed49abe4dee46c27a..a1520a0defcb63e139617af2c0aff9ffa9c32f3b 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -96,7 +96,6 @@ $TRANSLATIONS = array(
"Cancel" => "Відмінити",
"Language" => "Мова",
"Help translate" => "Допомогти з перекладом",
-"WebDAV" => "WebDAV",
"Login Name" => "Ім'Ñ Ð›Ð¾Ð³Ñ–Ð½Ñƒ",
"Create" => "Створити",
"Default Storage" => "Ñховище за замовчуваннÑм",
diff --git a/settings/l10n/ur_PK.php b/settings/l10n/ur_PK.php
index 0144e2b534c6e52d7ac0e69ae900dd9f3d0032c9..39973159745a8a7dabdfaef2d5748bb656f9af8e 100644
--- a/settings/l10n/ur_PK.php
+++ b/settings/l10n/ur_PK.php
@@ -1,9 +1,21 @@
<?php
$TRANSLATIONS = array(
+"Email sent" => "ارسال Ø´Ø¯Û Ø§ÛŒ میل ",
+"Invalid request" => "غلط درخواست",
"Error" => "ایرر",
+"Very weak password" => "بÛت کمزور پاسورڈ",
+"Weak password" => "کمزور پاسورڈ",
+"So-so password" => "نص نص پاسورڈ",
+"Good password" => "اچھا پاسورڈ",
+"Strong password" => "مضبوط پاسورڈ",
+"Delete" => "Øذ٠کریں",
+"Security Warning" => "ØÙاظتی انتباÛ",
+"More" => "مزید",
+"Less" => "Ú©Ù…",
"Password" => "پاسورڈ",
"New password" => "نیا پاسورڈ",
"Cancel" => "منسوخ کریں",
+"Other" => "دیگر",
"Username" => "یوزر نیم"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index da9dbdf0a1f301a1d661f3eb961d693da02e89f3..ef8c20ef94e030e4ef613f3a922f0e89685fafd5 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -86,7 +86,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Chá»n hình ảnh nhÆ° hồ sÆ¡ cá nhân",
"Language" => "Ngôn ngữ",
"Help translate" => "Há»— trợ dịch thuáºt",
-"WebDAV" => "WebDAV",
"Login Name" => "Tên đăng nháºp",
"Create" => "Tạo",
"Default Storage" => "Bộ nhớ mặc định",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index f11b0457112bba2286103d2cfc63b77e34c6f7bd..8f35fd938a4baa02514e8ab05b44c59a812aa5eb 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,13 +1,24 @@
<?php
$TRANSLATIONS = array(
+"Invalid value supplied for %s" => "%s èŽ·å¾—äº†æ— æ•ˆå€¼",
+"Saved" => "å·²ä¿å˜",
+"test email settings" => "测试电å邮件设置",
+"If you received this email, the settings seem to be correct." => "如果您收到了这å°é‚®ä»¶ï¼Œçœ‹èµ·æ¥è®¾ç½®æ²¡æœ‰é—®é¢˜ã€‚",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "å‘é€ç”µå邮件时å‘生了问题。请检查您的设置。",
"Email sent" => "邮件已å‘é€",
+"You need to set your user email before being able to send test emails." => "在å‘é€æµ‹è¯•é‚®ä»¶é’±æ‚¨éœ€è¦è®¾ç½®æ‚¨çš„用户电å邮件",
+"Send mode" => "å‘é€æ¨¡å¼",
"Encryption" => "åŠ å¯†",
+"Authentication method" => "认è¯æ–¹æ³•",
"Unable to load list from App Store" => "æ— æ³•ä»Žåº”ç”¨å•†åº—è½½å…¥åˆ—è¡¨",
"Authentication error" => "认è¯é”™è¯¯",
"Your full name has been changed." => "您的全å已修改。",
"Unable to change full name" => "æ— æ³•ä¿®æ”¹å…¨å",
"Group already exists" => "å·²å˜åœ¨è¯¥ç»„",
"Unable to add group" => "æ— æ³•æ·»åŠ ç»„",
+"Files decrypted successfully" => "文件解密æˆåŠŸ",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "æ— æ³•è§£å¯†æ‚¨çš„æ–‡ä»¶ï¼Œè¯·æ£€æŸ¥æ‚¨çš„ owncloud.log 或询问管ç†å‘˜",
+"Couldn't decrypt your files, check your password and try again" => "æ— æ³•è§£å¯†æ‚¨çš„æ–‡ä»¶ï¼Œè¯·æ£€æŸ¥å¯†ç 并é‡è¯•ã€‚",
"Email saved" => "电å邮件已ä¿å˜",
"Invalid email" => "æ— æ•ˆçš„ç”µå邮件",
"Unable to delete group" => "æ— æ³•åˆ é™¤ç»„",
@@ -20,8 +31,13 @@ $TRANSLATIONS = array(
"Couldn't update app." => "æ— æ³•æ›´æ–° 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" => "ä¸èƒ½æ›´æ”¹å¯†ç ",
+"Sending..." => "æ£åœ¨å‘é€...",
"User Documentation" => "用户文档",
+"Admin Documentation" => "管ç†å‘˜æ–‡æ¡£",
"Update to {appversion}" => "更新至 {appversion}",
"Disable" => "ç¦ç”¨",
"Enable" => "å¼€å¯",
@@ -33,6 +49,7 @@ $TRANSLATIONS = array(
"Error" => "错误",
"Update" => "æ›´æ–°",
"Updated" => "已更新",
+"Select a profile picture" => "选择头åƒ",
"Very weak password" => "éžå¸¸å¼±çš„密ç ",
"Weak password" => "弱密ç ",
"So-so password" => "一般强度的密ç ",
@@ -58,7 +75,12 @@ $TRANSLATIONS = array(
"Fatal issues only" => "ä»…ç¾éš¾æ€§é—®é¢˜",
"None" => "æ— ",
"Login" => "登录",
+"Plain" => "Plain",
+"NT LAN Manager" => "NT LAN 管ç†å™¨",
+"SSL" => "SSL",
+"TLS" => "TLS",
"Security Warning" => "安全è¦å‘Š",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "您æ£é€šè¿‡ HTTP 访问 %s。我们强烈建议您é…ç½®ä½ çš„æœåŠ¡å™¨æ¥è¦æ±‚使用 HTTPS。",
"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." => "您的数æ®æ–‡ä»¶å¤¹å’Œæ–‡ä»¶å¯ç”±äº’è”网访问。OwnCloudæ供的.htaccess文件未生效。我们强烈建议您é…ç½®æœåŠ¡å™¨ï¼Œä»¥ä½¿æ•°æ®æ–‡ä»¶å¤¹ä¸å¯è¢«è®¿é—®ï¼Œæˆ–者将数æ®æ–‡ä»¶å¤¹ç§»åˆ°webæœåŠ¡å™¨ä»¥å¤–。",
"Setup Warning" => "设置è¦å‘Š",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的WebæœåŠ¡å™¨å°šæœªæ£ç¡®è®¾ç½®ä»¥å…许文件åŒæ¥, å› ä¸ºWebDAV的接å£ä¼¼ä¹Žå·²æŸå.",
@@ -66,31 +88,51 @@ $TRANSLATIONS = array(
"Module 'fileinfo' missing" => "模å—'文件信æ¯'丢失",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP模å—'文件信æ¯'丢失. 我们强烈建议å¯ç”¨æ¤æ¨¡å—以便mime类型检测å–得最佳结果.",
"Your PHP version is outdated" => "您的 PHP 版本ä¸æ˜¯æœ€æ–°ç‰ˆ",
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "您的 PHP 版本已过期。强烈建议更新至 5.3.8 æˆ–è€…æ›´æ–°ç‰ˆæœ¬å› ä¸ºè€ç‰ˆæœ¬å˜åœ¨å·²çŸ¥é—®é¢˜ã€‚本次安装å¯èƒ½å¹¶æœªæ£å¸¸å·¥ä½œã€‚",
"Locale not working" => "æœ¬åœ°åŒ–æ— æ³•å·¥ä½œ",
+"System locale can not be set to a one which supports UTF-8." => "系统è¯ç³»æ— æ³•è®¾ç½®ä¸ºæ”¯æŒ UTF-8 çš„è¯ç³»ã€‚",
+"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 one of the following locales: %s." => "强烈建议在您的系统上安装需è¦çš„软件包æ¥æ”¯æŒä»¥ä¸‹è¯ç³»ä¹‹ä¸€ï¼š%s。",
"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." => "æ¤æœåŠ¡å™¨ä¸Šæ²¡æœ‰å¯ç”¨çš„å› ç‰¹ç½‘è¿žæŽ¥. è¿™æ„味ç€æŸäº›ç‰¹æ€§å°†æ— 法工作，例如挂载外部å˜å‚¨å™¨, æ醒更新或安装第三方应用ç‰. 从远程访问文件和å‘é€æ醒电å邮件也å¯èƒ½æ— 法工作. å¦‚æžœä½ æƒ³è¦ownCloud的所有特性, 我们建议å¯ç”¨æ¤æœåŠ¡å™¨çš„å› ç‰¹ç½‘è¿žæŽ¥.",
"Cron" => "计划任务",
+"Last cron was executed at %s." => "上次定时任务执行于 %s。",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "上次定时任务执行于 %s。这是在一个å°æ—¶ä¹‹å‰æ‰§è¡Œçš„，å¯èƒ½å‡ºäº†ä»€ä¹ˆé—®é¢˜ã€‚",
+"Cron was not executed yet!" => "定时任务还未被执行ï¼",
"Execute one task with each page loaded" => "æ¯ä¸ªé¡µé¢åŠ è½½åŽæ‰§è¡Œä¸€ä¸ªä»»åŠ¡",
+"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php 已注册于一个 webcron æœåŠ¡æ¥é€šè¿‡ http æ¯ 15 分钟执行 cron.php。",
"Use systems cron service to call the cron.php file every 15 minutes." => "使用系统 cron æœåŠ¡æ¯15分钟调用一次 cron.php 文件。",
"Sharing" => "共享",
"Enable Share API" => "å¯ç”¨å…±äº«API",
"Allow apps to use the Share API" => "å…许应用软件使用共享API",
"Allow links" => "å…许链接",
-"Allow users to share items to the public with links" => "å…许用户使用连接公开共享项目",
"Allow public uploads" => "å…è®¸å…¬å¼€ä¸Šä¼ ",
-"Allow users to enable others to upload into their publicly shared folders" => "用户å¯è®©å…¶ä»–äººä¸Šä¼ åˆ°ä»–çš„å…¬å¼€å…±äº«æ–‡ä»¶å¤¹",
+"Set default expiration date" => "设置默认过期日期",
+"Expire after " => "过期于",
+"days" => "天",
+"Enforce expiration date" => "强制过期日期",
+"Allow users to share items to the public with links" => "å…许用户使用连接公开共享项目",
"Allow resharing" => "å…许å†æ¬¡å…±äº«",
"Allow users to share items shared with them again" => "å…许用户将共享给他们的项目å†æ¬¡å…±äº«",
"Allow users to share with anyone" => "å…许用户å‘任何人共享",
"Allow users to only share with users in their groups" => "å…许用户åªå‘åŒç»„用户共享",
"Allow mail notification" => "å…许邮件通知",
+"Allow users to send mail notification for shared files" => "å…许用户å‘é€å…±äº«æ–‡ä»¶çš„邮件通知",
"Security" => "安全",
"Enforce HTTPS" => "强制使用 HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "å¼ºåˆ¶å®¢æˆ·ç«¯é€šè¿‡åŠ å¯†è¿žæŽ¥è¿žæŽ¥åˆ°%s。",
"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "请ç»ç”±HTTPS连接到这个%s 实例æ¥å¯ç”¨æˆ–ç¦ç”¨å¼ºåˆ¶SSL.",
+"Email Server" => "电å邮件æœåŠ¡å™¨",
+"This is used for sending out notifications." => "这被用于å‘é€é€šçŸ¥ã€‚",
+"From address" => "æ¥è‡ªåœ°å€",
+"Authentication required" => "需è¦è®¤è¯",
"Server address" => "æœåŠ¡å™¨åœ°å€",
"Port" => "端å£",
"Credentials" => "å‡è¯",
+"SMTP Username" => "SMTP 用户å",
+"SMTP Password" => "SMTP 密ç ",
+"Test email settings" => "测试电å邮件设置",
+"Send email" => "å‘é€é‚®ä»¶",
"Log" => "日志",
"Log level" => "日志级别",
"More" => "更多",
@@ -100,7 +142,9 @@ $TRANSLATIONS = array(
"Add your App" => "æ·»åŠ åº”ç”¨",
"More Apps" => "更多应用",
"Select an App" => "选择一个应用",
+"Documentation:" => "文档：",
"See application page at apps.owncloud.com" => "查看在 app.owncloud.com 的应用程åºé¡µé¢",
+"See application website" => "å‚è§åº”用程åºç½‘ç«™",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-æ ¸å‡†ï¼š <span class=\"author\"></span>",
"Administrator Documentation" => "管ç†å‘˜æ–‡æ¡£",
"Online Documentation" => "在线文档",
@@ -119,16 +163,18 @@ $TRANSLATIONS = array(
"Full Name" => "å…¨å",
"Email" => "电å邮件",
"Your email address" => "您的电å邮件",
+"Fill in an email address to enable password recovery and receive notifications" => "填入电å邮件地å€ä»Žè€Œå¯ç”¨å¯†ç æ¢å¤å’ŒæŽ¥æ”¶é€šçŸ¥",
"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。æ£æ–¹å½¢æ¯”较ç†æƒ³ä½†ä½ 也å¯ä»¥ä¹‹åŽå¯¹å…¶è¿›è¡Œè£å‰ªã€‚",
"Your avatar is provided by your original account." => "您的头åƒç”±æ‚¨çš„原始账户所æ供。",
"Cancel" => "å–消",
+"Choose as profile image" => "用作头åƒ",
"Language" => "è¯è¨€",
"Help translate" => "帮助翻译",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "ä½¿ç”¨è¿™ä¸ªåœ°å€ <a href=\"%s\" target=\"_blank\">通过 WebDAV 访问您的文件</a>",
+"The encryption app is no longer enabled, please decrypt all your files" => "åŠ å¯† app ä¸å†è¢«å¯ç”¨ï¼Œè¯·è§£å¯†æ‚¨æ‰€æœ‰çš„文件",
"Log-in password" => "登录密ç ",
"Decrypt all Files" => "解密所有文件",
"Login Name" => "登录å称",
diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php
index 7237a99c889722c52dc882f084e8b2c0800af2df..ee98d2a6b146f758581a74e595b0c8e7c4339895 100644
--- a/settings/l10n/zh_HK.php
+++ b/settings/l10n/zh_HK.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"New password" => "新密碼",
"Email" => "電郵",
"Cancel" => "å–消",
+"Create" => "新增",
"Username" => "用戶å稱"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 567d6fb5940407e40f5a200d03e35c1ab80dc26a..c60ca4223e87e687be482daa8525ba70d43e1457 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -106,9 +106,8 @@ $TRANSLATIONS = array(
"Enable Share API" => "啟用分享 API",
"Allow apps to use the Share API" => "å…許 apps 使用分享 API",
"Allow links" => "å…許連çµ",
-"Allow users to share items to the public with links" => "å…許使用者以çµé€£å…¬é–‹åˆ†äº«æª”案",
"Allow public uploads" => "å…許任何人上傳",
-"Allow users to enable others to upload into their publicly shared folders" => "å…許使用者將他們公開分享的資料夾è¨å®šç‚ºã€Œä»»ä½•äººçš†å¯ä¸Šå‚³ã€",
+"Allow users to share items to the public with links" => "å…許使用者以çµé€£å…¬é–‹åˆ†äº«æª”案",
"Allow resharing" => "å…許轉貼分享",
"Allow users to share items shared with them again" => "å…許使用者分享其他使用者分享給他的檔案",
"Allow users to share with anyone" => "å…許使用者與任何人分享檔案",
@@ -171,8 +170,6 @@ $TRANSLATIONS = array(
"Choose as profile image" => "è¨å®šç‚ºå¤§é è²¼",
"Language" => "語言",
"Help translate" => "幫助翻è¯",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "使用這個地å€<a href=\"%s\" target=\"_blank\">來é€éŽ WebDAV å˜å–檔案</a>",
"The encryption app is no longer enabled, please decrypt all your files" => "åŠ å¯†çš„è»Ÿé«”ä¸èƒ½é•·æ™‚間啟用，請解密所有您的檔案",
"Log-in password" => "登入密碼",
"Decrypt all Files" => "解密所有檔案",
diff --git a/settings/personal.php b/settings/personal.php
index 0da14a8c8c4018f8dd1ae15d27b1d80dda125c06..47b2dc1a46a7a1cc763cddbe8b412f1185715c0d 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -33,7 +33,9 @@ $userLang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N:
$languageCodes=OC_L10N::findAvailableLanguages();
//check if encryption was enabled in the past
-$enableDecryptAll = OC_Util::encryptedFiles();
+$filesStillEncrypted = OC_Util::encryptedFiles();
+$backupKeysExists = OC_Util::backupKeysExists();
+$enableDecryptAll = $filesStillEncrypted || $backupKeysExists;
// array of common languages
$commonlangcodes = array(
@@ -92,6 +94,8 @@ $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('backupKeysExists' , $backupKeysExists);
+$tmpl->assign('filesStillEncrypted' , $filesStillEncrypted);
$tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true));
$tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser()));
diff --git a/settings/routes.php b/settings/routes.php
index a8bb0d981e8a0ede6c5ff61ce331265d5ea8799e..0e0f293b9be32534f812de6ee4dfbdba79b7c300 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -54,6 +54,10 @@ $this->create('settings_ajax_setlanguage', '/settings/ajax/setlanguage.php')
->actionInclude('settings/ajax/setlanguage.php');
$this->create('settings_ajax_decryptall', '/settings/ajax/decryptall.php')
->actionInclude('settings/ajax/decryptall.php');
+$this->create('settings_ajax_restorekeys', '/settings/ajax/restorekeys.php')
+ ->actionInclude('settings/ajax/restorekeys.php');
+$this->create('settings_ajax_deletekeys', '/settings/ajax/deletekeys.php')
+ ->actionInclude('settings/ajax/deletekeys.php');
// apps
$this->create('settings_ajax_apps_ocs', '/settings/ajax/apps/ocs.php')
->actionInclude('settings/ajax/apps/ocs.php');
@@ -80,3 +84,5 @@ $this->create('settings_admin_mail_test', '/settings/admin/mailtest')
->action('OC\Settings\Admin\Controller', 'sendTestMail');
$this->create('settings_ajax_setsecurity', '/settings/ajax/setsecurity.php')
->actionInclude('settings/ajax/setsecurity.php');
+$this->create('settings_ajax_excludegroups', '/settings/ajax/excludegroups.php')
+ ->actionInclude('settings/ajax/excludegroups.php');
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index d8a800ca20230bf9003d7034776585c1bbf83058..a86fe9c0ac7feeb9e39e4a507f86bdf371867dd9 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -83,6 +83,21 @@ if (!$_['isWebDavWorking']) {
<?php
}
+// Are doc blocks accessible?
+if (!$_['isAnnotationsWorking']) {
+ ?>
+<div class="section">
+ <h2><?php p($l->t('Setup Warning'));?></h2>
+
+ <span class="securitywarning">
+ <?php p($l->t('PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.')); ?>
+ <?php p($l->t('This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.')); ?>
+ </span>
+
+</div>
+<?php
+}
+
// if module fileinfo available?
if (!$_['has_fileinfo']) {
?>
@@ -217,15 +232,29 @@ if (!$_['internetconnectionworking']) {
<input type="checkbox" name="shareapi_allow_links" id="allowLinks"
value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> />
<label for="allowLinks"><?php p($l->t('Allow links'));?></label><br/>
- <em><?php p($l->t('Allow users to share items to the public with links')); ?></em>
- </td>
- </tr>
- <tr>
- <td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('class="hidden"');?>>
+ <div <?php ($_['allowLinks'] === 'yes') ? print_unescaped('class="indent"') : print_unescaped('class="hidden indent"');?> id="publicLinkSettings">
+ <input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword"
+ value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> />
+ <label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/>
<input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload"
value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> />
<label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
- <em><?php p($l->t('Allow users to enable others to upload into their publicly shared folders')); ?></em>
+
+ <input type="checkbox" name="shareapi_default_expire_date" id="shareapiDefaultExpireDate"
+ value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') print_unescaped('checked="checked"'); ?> />
+ <label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date'));?></label><br/>
+ <div id="setDefaultExpireDate" <?php ($_['shareDefaultExpireDateSet'] === 'no') ? print_unescaped('class="hidden indent"') : print_unescaped('class="indent"');?>>
+ <?php p($l->t( 'Expire after ' )); ?>
+ <input type="text" name='shareapi_expire_after_n_days' id="shareapiExpireAfterNDays" placeholder="<?php p('7')?>"
+ value='<?php p($_['shareExpireAfterNDays']) ?>' />
+ <?php p($l->t( 'days' )); ?>
+ <input type="checkbox" name="shareapi_enforce_expire_date" id="shareapiEnforceExpireDate"
+ value="1" <?php if ($_['shareEnforceExpireDate'] == 'yes') print_unescaped('checked="checked"'); ?> />
+ <label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
+ </div>
+
+ </div>
+ <em><?php p($l->t('Allow users to share items to the public with links')); ?></em>
</td>
</tr>
<tr>
@@ -254,23 +283,24 @@ if (!$_['internetconnectionworking']) {
<em><?php p($l->t('Allow users to send mail notification for shared files')); ?></em>
</td>
</tr>
-
<tr>
- <td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('class="hidden"');?>>
- <input type="checkbox" name="shareapi_default_expire_date" id="shareapi_default_expire_date"
- value="1" <?php if ($_['shareDefaultExpireDateSet'] == 'yes') print_unescaped('checked="checked"'); ?> />
- <label for="shareapi_default_expire_date"><?php p($l->t('Set default expiration date'));?></label><br/>
- <?php p($l->t( 'Expire after ' )); ?>
- <input type="text" name='shareapi_expire_after_n_days' id="shareapi_expire_after_n_days" placeholder="<?php p('7')?>"
- value='<?php p($_['shareExpireAfterNDays']) ?>' />
- <?php p($l->t( 'days' )); ?>
- <input type="checkbox" name="shareapi_enforce_expire_date" id="shareapi_enforce_expire_date"
- value="1" <?php if ($_['shareEnforceExpireDate'] == 'yes') print_unescaped('checked="checked"'); ?> />
- <label for="shareapi_enforce_expire_date"><?php p($l->t('Enforce expiration date'));?></label><br/>
- <em><?php p($l->t('Expire shares by default after N days')); ?></em>
+ <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>>
+ <input type="checkbox" name="shareapi_exclude_groups" id="shareapiExcludeGroups"
+ value="1" <?php if ($_['shareExcludeGroups']) print_unescaped('checked="checked"'); ?> />
+ <label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing'));?></label><br/>
+ <div id="selectExcludedGroups" class="<?php ($_['shareExcludeGroups']) ? p('indent') : p('hidden indent'); ?>">
+ <select
+ class="groupsselect"
+ id="excludedGroups" data-placeholder="groups"
+ title="<?php p($l->t('Groups'))?>" multiple="multiple">
+ <?php foreach($_["groups"] as $group): ?>
+ <option value="<?php p($group['gid'])?>" <?php if($group['excluded']) { p('selected="selected"'); }?>><?php p($group['gid']);?></option>
+ <?php endforeach;?>
+ </select>
+ </div>
+ <em><?php p($l->t('These groups will still be able to receive shares, but not to initiate them.')); ?></em>
</td>
</tr>
-
</table>
</div>
@@ -308,9 +338,9 @@ if (!$_['internetconnectionworking']) {
</div>
<div id="mail_settings" class="section">
- <h2><?php p($l->t('Email Server'));?> <span id="mail_settings_msg" class="msg"></span></h2>
+ <h2><?php p($l->t('Email Server'));?></h2>
- <p><?php p($l->t('This is used for sending out notifications.')); ?></p>
+ <p><?php p($l->t('This is used for sending out notifications.')); ?> <span id="mail_settings_msg" class="msg"></span></p>
<p>
<label for="mail_smtpmode"><?php p($l->t( 'Send mode' )); ?></label>
@@ -342,10 +372,10 @@ if (!$_['internetconnectionworking']) {
<p>
<label for="mail_from_address"><?php p($l->t( 'From address' )); ?></label>
- <input type="text" name='mail_from_address' id="mail_from_address" placeholder="<?php p('mail')?>"
+ <input type="text" name='mail_from_address' id="mail_from_address" placeholder="<?php p($l->t('mail'))?>"
value='<?php p($_['mail_from_address']) ?>' />
@
- <input type="text" name='mail_domain' id="mail_domain" placeholder="<?php p('example.com')?>"
+ <input type="text" name='mail_domain' id="mail_domain" placeholder="example.com"
value='<?php p($_['mail_domain']) ?>' />
</p>
@@ -368,7 +398,7 @@ if (!$_['internetconnectionworking']) {
<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
<label for="mail_smtphost"><?php p($l->t( 'Server address' )); ?></label>
- <input type="text" name='mail_smtphost' id="mail_smtphost" placeholder="<?php p('smtp.example.com')?>"
+ <input type="text" name='mail_smtphost' id="mail_smtphost" placeholder="smtp.example.com"
value='<?php p($_['mail_smtphost']) ?>' />
:
<input type="text" name='mail_smtpport' id="mail_smtpport" placeholder="<?php p($l->t('Port'))?>"
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index cc1fce88c9f25ba67d0ac2902f7905aa03fde90e..1d1500743ad7206971d5ecafea307a500218ed84 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -133,21 +133,20 @@ if($_['passwordChangeSupported']) {
<?php endif; ?>
</form>
-<div class="section">
- <h2><?php p($l->t('WebDAV'));?></h2>
- <code><?php print_unescaped(OC_Helper::linkToRemote('webdav')); ?></code><br />
- <em><?php print_unescaped($l->t('Use this address to <a href="%s" target="_blank">access your Files via WebDAV</a>', array(link_to_docs('user-webdav'))));?></em>
-</div>
-
<?php foreach($_['forms'] as $form) {
print_unescaped($form);
};?>
<?php if($_['enableDecryptAll']): ?>
-<div class="section" id="decryptAll">
+<div class="section">
+
<h2>
<?php p( $l->t( 'Encryption' ) ); ?>
</h2>
+
+ <?php if($_['filesStillEncrypted']): ?>
+
+ <div id="decryptAll">
<?php p($l->t( "The encryption app is no longer enabled, please decrypt all your files" )); ?>
<p>
<input
@@ -164,8 +163,34 @@ if($_['passwordChangeSupported']) {
<span class="msg"></span>
</p>
<br />
+ </div>
+
+ <?php endif; ?>
+
+
+
+ <div id="restoreBackupKeys" <?php $_['backupKeysExists'] ? '' : print_unescaped("class='hidden'") ?>>
+
+ <?php p($l->t( "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." )); ?>
+ <p>
+ <button
+ type="button"
+ name="submitRestoreKeys"><?php p($l->t( "Restore Encryption Keys" )); ?>
+ </button>
+ <button
+ type="button"
+ name="submitDeleteKeys"><?php p($l->t( "Delete Encryption Keys" )); ?>
+ </button>
+ <span class="msg"></span>
+
+ </p>
+ <br />
+
+ </div>
+
+
</div>
-<?php endif; ?>
+ <?php endif; ?>
<div class="section">
<h2><?php p($l->t('Version'));?></h2>
diff --git a/tests/karma.config.js b/tests/karma.config.js
index 338e3f868e98b744de299b94ddabd1731caa694b..846e8f7be915993d1e19d53abbc86e62bdeb9672 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -43,7 +43,19 @@ module.exports = function(config) {
return apps;
*/
// other apps tests don't run yet... needs further research / clean up
- return ['files'];
+ return [
+ 'files',
+ 'files_trashbin',
+ {
+ name: 'files_sharing',
+ srcFiles: [
+ // only test these files, others are not ready and mess
+ // up with the global namespace/classes/state
+ 'apps/files_sharing/js/app.js',
+ 'apps/files_sharing/js/sharedfilelist.js'
+ ],
+ testFiles: ['apps/files_sharing/tests/js/*.js']
+ }];
}
// respect NOCOVERAGE env variable
@@ -110,15 +122,30 @@ module.exports = function(config) {
files.push(corePath + 'tests/specs/*.js');
}
- for ( var i = 0; i < appsToTest.length; i++ ) {
- // add app JS
- var srcFile = 'apps/' + appsToTest[i] + '/js/*.js';
- files.push(srcFile);
+ function addApp(app) {
+ // if only a string was specified, expand to structure
+ if (typeof(app) === 'string') {
+ app = {
+ srcFiles: 'apps/' + app + '/js/*.js',
+ testFiles: 'apps/' + app + '/tests/js/*.js'
+ };
+ }
+
+ // add source files/patterns
+ files = files.concat(app.srcFiles || []);
+ // add test files/patterns
+ files = files.concat(app.testFiles || []);
if (enableCoverage) {
- preprocessors[srcFile] = 'coverage';
+ // add coverage entry for each file/pattern
+ for (var i = 0; i < app.srcFiles.length; i++) {
+ preprocessors[app.srcFiles[i]] = 'coverage';
+ }
}
- // add test specs
- files.push('apps/' + appsToTest[i] + '/tests/js/*.js');
+ }
+
+ // add source files for apps to test
+ for ( var i = 0; i < appsToTest.length; i++ ) {
+ addApp(appsToTest[i]);
}
// serve images to avoid warnings
diff --git a/tests/lib/app.php b/tests/lib/app.php
index 49f40f089bb8e1b5c65d53451b5cbdc0d16aa49f..e2b578fe6b9185d2223d5a075bf7c4415085e65b 100644
--- a/tests/lib/app.php
+++ b/tests/lib/app.php
@@ -1,6 +1,7 @@
<?php
/**
- * Copyright (c) 2012 Bernhard Posselt <nukeawhale@gmail.com>
+ * Copyright (c) 2012 Bernhard Posselt <dev@bernhard-posselt.com>
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
@@ -8,75 +9,218 @@
class Test_App extends PHPUnit_Framework_TestCase {
-
- public function testIsAppVersionCompatibleSingleOCNumber(){
- $oc = array(4);
- $app = '4.0';
-
- $this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
- }
-
-
- public function testIsAppVersionCompatibleMultipleOCNumber(){
- $oc = array(4, 3, 1);
- $app = '4.3';
-
- $this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
- }
-
-
- public function testIsAppVersionCompatibleSingleNumber(){
- $oc = array(4);
- $app = '4';
-
- $this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
- }
-
-
- public function testIsAppVersionCompatibleSingleAppNumber(){
- $oc = array(4, 3);
- $app = '4';
-
- $this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
- }
-
-
- public function testIsAppVersionCompatibleComplex(){
- $oc = array(5, 0, 0);
- $app = '4.5.1';
-
- $this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
- }
-
-
- public function testIsAppVersionCompatibleShouldFail(){
- $oc = array(4, 3, 1);
- $app = '4.3.2';
-
- $this->assertFalse(OC_App::isAppVersionCompatible($oc, $app));
+ function appVersionsProvider() {
+ return array(
+ // exact match
+ array(
+ '6.0.0.0',
+ array(
+ 'requiremin' => '6.0',
+ 'requiremax' => '6.0',
+ ),
+ true
+ ),
+ // in-between match
+ array(
+ '6.0.0.0',
+ array(
+ 'requiremin' => '5.0',
+ 'requiremax' => '7.0',
+ ),
+ true
+ ),
+ // app too old
+ array(
+ '6.0.0.0',
+ array(
+ 'requiremin' => '5.0',
+ 'requiremax' => '5.0',
+ ),
+ false
+ ),
+ // app too new
+ array(
+ '5.0.0.0',
+ array(
+ 'requiremin' => '6.0',
+ 'requiremax' => '6.0',
+ ),
+ false
+ ),
+ // only min specified
+ array(
+ '6.0.0.0',
+ array(
+ 'requiremin' => '6.0',
+ ),
+ true
+ ),
+ // only min specified fail
+ array(
+ '5.0.0.0',
+ array(
+ 'requiremin' => '6.0',
+ ),
+ false
+ ),
+ // only min specified legacy
+ array(
+ '6.0.0.0',
+ array(
+ 'require' => '6.0',
+ ),
+ true
+ ),
+ // only min specified legacy fail
+ array(
+ '4.0.0.0',
+ array(
+ 'require' => '6.0',
+ ),
+ false
+ ),
+ // only max specified
+ array(
+ '5.0.0.0',
+ array(
+ 'requiremax' => '6.0',
+ ),
+ true
+ ),
+ // only max specified fail
+ array(
+ '7.0.0.0',
+ array(
+ 'requiremax' => '6.0',
+ ),
+ false
+ ),
+ // variations of versions
+ // single OC number
+ array(
+ '4',
+ array(
+ 'require' => '4.0',
+ ),
+ true
+ ),
+ // multiple OC number
+ array(
+ '4.3.1',
+ array(
+ 'require' => '4.3',
+ ),
+ true
+ ),
+ // single app number
+ array(
+ '4',
+ array(
+ 'require' => '4',
+ ),
+ true
+ ),
+ // single app number fail
+ array(
+ '4.3',
+ array(
+ 'require' => '5',
+ ),
+ false
+ ),
+ // complex
+ array(
+ '5.0.0',
+ array(
+ 'require' => '4.5.1',
+ ),
+ true
+ ),
+ // complex fail
+ array(
+ '4.3.1',
+ array(
+ 'require' => '4.3.2',
+ ),
+ false
+ ),
+ // two numbers
+ array(
+ '4.3.1',
+ array(
+ 'require' => '4.4',
+ ),
+ false
+ ),
+ // one number fail
+ array(
+ '4.3.1',
+ array(
+ 'require' => '5',
+ ),
+ false
+ ),
+ // pre-alpha app
+ array(
+ '5.0.3',
+ array(
+ 'require' => '4.93',
+ ),
+ true
+ ),
+ // pre-alpha OC
+ array(
+ '6.90.0.2',
+ array(
+ 'require' => '6.90',
+ ),
+ true
+ ),
+ // pre-alpha OC max
+ array(
+ '6.90.0.2',
+ array(
+ 'requiremax' => '7',
+ ),
+ true
+ ),
+ // expect same major number match
+ array(
+ '5.0.3',
+ array(
+ 'require' => '5',
+ ),
+ true
+ ),
+ // expect same major number match
+ array(
+ '5.0.3',
+ array(
+ 'requiremax' => '5',
+ ),
+ true
+ ),
+ );
}
- public function testIsAppVersionCompatibleShouldFailTwoVersionNumbers(){
- $oc = array(4, 3, 1);
- $app = '4.4';
-
- $this->assertFalse(OC_App::isAppVersionCompatible($oc, $app));
- }
-
-
- public function testIsAppVersionCompatibleShouldWorkForPreAlpha(){
- $oc = array(5, 0, 3);
- $app = '4.93';
-
- $this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
+ /**
+ * @dataProvider appVersionsProvider
+ */
+ public function testIsAppCompatible($ocVersion, $appInfo, $expectedResult) {
+ $this->assertEquals($expectedResult, OC_App::isAppCompatible($ocVersion, $appInfo));
}
-
- public function testIsAppVersionCompatibleShouldFailOneVersionNumbers(){
- $oc = array(4, 3, 1);
- $app = '5';
-
- $this->assertFalse(OC_App::isAppVersionCompatible($oc, $app));
+ /**
+ * Test that the isAppCompatible method also supports passing an array
+ * as $ocVersion
+ */
+ public function testIsAppCompatibleWithArray() {
+ $ocVersion = array(6);
+ $appInfo = array(
+ 'requiremin' => '6',
+ 'requiremax' => '6',
+ );
+ $this->assertTrue(OC_App::isAppCompatible($ocVersion, $appInfo));
}
/**
diff --git a/tests/lib/appframework/AppTest.php b/tests/lib/appframework/AppTest.php
index 3628e4ceab2023303fc72196539fb87baea74d64..92fa483834114d6d873c18cdfab8470ad2535c6f 100644
--- a/tests/lib/appframework/AppTest.php
+++ b/tests/lib/appframework/AppTest.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/tests/lib/appframework/controller/ApiControllerTest.php b/tests/lib/appframework/controller/ApiControllerTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..b772f540ce85c6f74a6b5c52a96ae2c83f28441a
--- /dev/null
+++ b/tests/lib/appframework/controller/ApiControllerTest.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 OCP\AppFramework;
+
+use OC\AppFramework\Http\Request;
+use OCP\AppFramework\Http\TemplateResponse;
+
+
+class ChildApiController extends ApiController {};
+
+
+class ApiControllerTest extends \PHPUnit_Framework_TestCase {
+
+
+ public function testCors() {
+ $request = new Request(
+ array('server' => array('HTTP_ORIGIN' => 'test'))
+ );
+ $this->controller = new ChildApiController('app', $request, 'verbs',
+ 'headers', 100);
+
+ $response = $this->controller->preflightedCors();
+
+ $headers = $response->getHeaders();
+
+ $this->assertEquals('test', $headers['Access-Control-Allow-Origin']);
+ $this->assertEquals('verbs', $headers['Access-Control-Allow-Methods']);
+ $this->assertEquals('headers', $headers['Access-Control-Allow-Headers']);
+ $this->assertEquals('false', $headers['Access-Control-Allow-Credentials']);
+ $this->assertEquals(100, $headers['Access-Control-Max-Age']);
+ }
+
+}
diff --git a/tests/lib/appframework/controller/ControllerTest.php b/tests/lib/appframework/controller/ControllerTest.php
index f17d5f24aa523c0e4ee0a5309d9541f66e0d562d..3c1716a91d8ea6264e20dd28bdd75caf3128fd74 100644
--- a/tests/lib/appframework/controller/ControllerTest.php
+++ b/tests/lib/appframework/controller/ControllerTest.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -22,14 +22,35 @@
*/
-namespace Test\AppFramework\Controller;
+namespace OCP\AppFramework;
use OC\AppFramework\Http\Request;
-use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Http\IResponseSerializer;
-class ChildController extends Controller {};
+class ToUpperCaseSerializer implements IResponseSerializer {
+ public function serialize($response) {
+ return array(strtoupper($response));
+ }
+}
+
+class ChildController extends Controller {
+ public function custom($in) {
+ $this->registerResponder('json', function ($response) {
+ return new JSONResponse(array(strlen($response)));
+ });
+
+ return $in;
+ }
+
+ public function serializer($in) {
+ $this->registerSerializer(new ToUpperCaseSerializer());
+
+ return $in;
+ }
+};
class ControllerTest extends \PHPUnit_Framework_TestCase {
@@ -129,4 +150,36 @@ class ControllerTest extends \PHPUnit_Framework_TestCase {
$this->assertEquals('daheim', $this->controller->env('PATH'));
}
+
+ /**
+ * @expectedException \DomainException
+ */
+ public function testFormatResonseInvalidFormat() {
+ $this->controller->buildResponse(null, 'test');
+ }
+
+
+ public function testFormat() {
+ $response = $this->controller->buildResponse(array('hi'), 'json');
+
+ $this->assertEquals(array('hi'), $response->getData());
+ }
+
+
+ public function testCustomFormatter() {
+ $response = $this->controller->custom('hi');
+ $response = $this->controller->buildResponse($response, 'json');
+
+ $this->assertEquals(array(2), $response->getData());
+ }
+
+
+ public function testCustomSerializer() {
+ $response = $this->controller->serializer('hi');
+ $response = $this->controller->buildResponse($response, 'json');
+
+ $this->assertEquals(array('HI'), $response->getData());
+ }
+
+
}
diff --git a/tests/lib/appframework/db/EntityTest.php b/tests/lib/appframework/db/EntityTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..9de44b9b3ba83c334fdd015124e18e0737115c4f
--- /dev/null
+++ b/tests/lib/appframework/db/EntityTest.php
@@ -0,0 +1,223 @@
+<?php
+
+/**
+* ownCloud - App Framework
+*
+* @author Bernhard Posselt
+* @copyright 2012 Bernhard Posselt dev@bernhard-posselt.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\Db;
+
+
+/**
+ * @method integer getId()
+ * @method void setId(integer $id)
+ * @method integer getTestId()
+ * @method void setTestId(integer $id)
+ * @method string getName()
+ * @method void setName(string $name)
+ * @method string getEmail()
+ * @method void setEmail(string $email)
+ * @method string getPreName()
+ * @method void setPreName(string $preName)
+ */
+class TestEntity extends Entity {
+ public $name;
+ public $email;
+ public $testId;
+ public $preName;
+
+ public function __construct($name=null){
+ $this->addType('testId', 'integer');
+ $this->name = $name;
+ }
+};
+
+
+class EntityTest extends \PHPUnit_Framework_TestCase {
+
+ private $entity;
+
+ protected function setUp(){
+ $this->entity = new TestEntity();
+ }
+
+
+ public function testResetUpdatedFields(){
+ $entity = new TestEntity();
+ $entity->setId(3);
+ $entity->resetUpdatedFields();
+
+ $this->assertEquals(array(), $entity->getUpdatedFields());
+ }
+
+
+ public function testFromRow(){
+ $row = array(
+ 'pre_name' => 'john',
+ 'email' => 'john@something.com'
+ );
+ $this->entity = TestEntity::fromRow($row);
+
+ $this->assertEquals($row['pre_name'], $this->entity->getPreName());
+ $this->assertEquals($row['email'], $this->entity->getEmail());
+ }
+
+
+ public function testGetSetId(){
+ $id = 3;
+ $this->entity->setId(3);
+
+ $this->assertEquals($id, $this->entity->getId());
+ }
+
+
+ public function testColumnToPropertyNoReplacement(){
+ $column = 'my';
+ $this->assertEquals('my',
+ $this->entity->columnToProperty($column));
+ }
+
+
+ public function testColumnToProperty(){
+ $column = 'my_attribute';
+ $this->assertEquals('myAttribute',
+ $this->entity->columnToProperty($column));
+ }
+
+
+ public function testPropertyToColumnNoReplacement(){
+ $property = 'my';
+ $this->assertEquals('my',
+ $this->entity->propertyToColumn($property));
+ }
+
+
+ public function testSetterMarksFieldUpdated(){
+ $this->entity->setId(3);
+
+ $this->assertContains('id', $this->entity->getUpdatedFields());
+ }
+
+
+ public function testCallShouldOnlyWorkForGetterSetter(){
+ $this->setExpectedException('\BadFunctionCallException');
+
+ $this->entity->something();
+ }
+
+
+ public function testGetterShouldFailIfAttributeNotDefined(){
+ $this->setExpectedException('\BadFunctionCallException');
+
+ $this->entity->getTest();
+ }
+
+
+ public function testSetterShouldFailIfAttributeNotDefined(){
+ $this->setExpectedException('\BadFunctionCallException');
+
+ $this->entity->setTest();
+ }
+
+
+ public function testFromRowShouldNotAssignEmptyArray(){
+ $row = array();
+ $entity2 = new TestEntity();
+
+ $this->entity = TestEntity::fromRow($row);
+ $this->assertEquals($entity2, $this->entity);
+ }
+
+
+ public function testIdGetsConvertedToInt(){
+ $row = array('id' => '4');
+
+ $this->entity = TestEntity::fromRow($row);
+ $this->assertSame(4, $this->entity->getId());
+ }
+
+
+ public function testSetType(){
+ $row = array('testId' => '4');
+
+ $this->entity = TestEntity::fromRow($row);
+ $this->assertSame(4, $this->entity->getTestId());
+ }
+
+
+ public function testFromParams(){
+ $params = array(
+ 'testId' => 4,
+ 'email' => 'john@doe'
+ );
+
+ $entity = TestEntity::fromParams($params);
+
+ $this->assertEquals($params['testId'], $entity->getTestId());
+ $this->assertEquals($params['email'], $entity->getEmail());
+ $this->assertTrue($entity instanceof TestEntity);
+ }
+
+ public function testSlugify(){
+ $entity = new TestEntity();
+ $entity->setName('Slugify this!');
+ $this->assertEquals('slugify-this', $entity->slugify('name'));
+ $entity->setName('°!"§$%&/()=?`´ß\}][{³²#\'+~*-_.:,;<>|äöüÄÖÜSlugify this!');
+ $this->assertEquals('slugify-this', $entity->slugify('name'));
+ }
+
+
+ public function testSetterCasts() {
+ $entity = new TestEntity();
+ $entity->setId('3');
+ $this->assertSame(3, $entity->getId());
+ }
+
+
+ public function testSetterDoesNotCastOnNull() {
+ $entity = new TestEntity();
+ $entity->setId(null);
+ $this->assertSame(null, $entity->getId());
+ }
+
+
+ public function testGetFieldTypes() {
+ $entity = new TestEntity();
+ $this->assertEquals(array(
+ 'id' => 'integer',
+ 'testId' => 'integer'
+ ), $entity->getFieldTypes());
+ }
+
+
+ public function testGetItInt() {
+ $entity = new TestEntity();
+ $entity->setId(3);
+ $this->assertEquals('integer', gettype($entity->getId()));
+ }
+
+
+ public function testFieldsNotMarkedUpdatedIfNothingChanges() {
+ $entity = new TestEntity('hey');
+ $entity->setName('hey');
+ $this->assertEquals(0, count($entity->getUpdatedFields()));
+ }
+
+
+}
\ No newline at end of file
diff --git a/tests/lib/appframework/db/MapperTest.php b/tests/lib/appframework/db/MapperTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..4ddc4ef04224d411ac57ecf6a602438bc3335202
--- /dev/null
+++ b/tests/lib/appframework/db/MapperTest.php
@@ -0,0 +1,279 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.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\Db;
+
+use \OCP\IDb;
+
+
+require_once __DIR__ . '/MapperTestUtility.php';
+
+/**
+ * @method integer getId()
+ * @method void setId(integer $id)
+ * @method string getEmail()
+ * @method void setEmail(string $email)
+ * @method string getPreName()
+ * @method void setPreName(string $preName)
+ */
+class Example extends Entity {
+ public $preName;
+ public $email;
+};
+
+
+class ExampleMapper extends Mapper {
+ public function __construct(IDb $db){ parent::__construct($db, 'table'); }
+ public function find($table, $id){ return $this->findOneQuery($table, $id); }
+ public function findOneEntity($table, $id){ return $this->findEntity($table, $id); }
+ public function findAllEntities($table){ return $this->findEntities($table); }
+ public function mapRow($row){ return $this->mapRowToEntity($row); }
+}
+
+
+class MapperTest extends MapperTestUtility {
+
+ private $mapper;
+
+ public function setUp(){
+ parent::setUp();
+ $this->mapper = new ExampleMapper($this->db);
+ }
+
+
+ public function testMapperShouldSetTableName(){
+ $this->assertEquals('*PREFIX*table', $this->mapper->getTableName());
+ }
+
+
+ public function testFindQuery(){
+ $sql = 'hi';
+ $params = array('jo');
+ $rows = array(
+ array('hi')
+ );
+ $this->setMapperResult($sql, $params, $rows);
+ $this->mapper->find($sql, $params);
+ }
+
+ public function testFindEntity(){
+ $sql = 'hi';
+ $params = array('jo');
+ $rows = array(
+ array('pre_name' => 'hi')
+ );
+ $this->setMapperResult($sql, $params, $rows);
+ $this->mapper->findOneEntity($sql, $params);
+ }
+
+ public function testFindNotFound(){
+ $sql = 'hi';
+ $params = array('jo');
+ $rows = array();
+ $this->setMapperResult($sql, $params, $rows);
+ $this->setExpectedException(
+ '\OCP\AppFramework\Db\DoesNotExistException');
+ $this->mapper->find($sql, $params);
+ }
+
+ public function testFindEntityNotFound(){
+ $sql = 'hi';
+ $params = array('jo');
+ $rows = array();
+ $this->setMapperResult($sql, $params, $rows);
+ $this->setExpectedException(
+ '\OCP\AppFramework\Db\DoesNotExistException');
+ $this->mapper->findOneEntity($sql, $params);
+ }
+
+ public function testFindMultiple(){
+ $sql = 'hi';
+ $params = array('jo');
+ $rows = array(
+ array('jo'), array('ho')
+ );
+ $this->setMapperResult($sql, $params, $rows);
+ $this->setExpectedException(
+ '\OCP\AppFramework\Db\MultipleObjectsReturnedException');
+ $this->mapper->find($sql, $params);
+ }
+
+ public function testFindEntityMultiple(){
+ $sql = 'hi';
+ $params = array('jo');
+ $rows = array(
+ array('jo'), array('ho')
+ );
+ $this->setMapperResult($sql, $params, $rows);
+ $this->setExpectedException(
+ '\OCP\AppFramework\Db\MultipleObjectsReturnedException');
+ $this->mapper->findOneEntity($sql, $params);
+ }
+
+
+ public function testDelete(){
+ $sql = 'DELETE FROM `*PREFIX*table` WHERE `id` = ?';
+ $params = array(2);
+
+ $this->setMapperResult($sql, $params);
+ $entity = new Example();
+ $entity->setId($params[0]);
+
+ $this->mapper->delete($entity);
+ }
+
+
+ public function testCreate(){
+ $this->db->expects($this->once())
+ ->method('getInsertId')
+ ->with($this->equalTo('*PREFIX*table'))
+ ->will($this->returnValue(3));
+ $this->mapper = new ExampleMapper($this->db);
+
+ $sql = 'INSERT INTO `*PREFIX*table`(`pre_name`,`email`) ' .
+ 'VALUES(?,?)';
+ $params = array('john', 'my@email');
+ $entity = new Example();
+ $entity->setPreName($params[0]);
+ $entity->setEmail($params[1]);
+
+ $this->setMapperResult($sql, $params);
+
+ $this->mapper->insert($entity);
+ }
+
+
+ public function testCreateShouldReturnItemWithCorrectInsertId(){
+ $this->db->expects($this->once())
+ ->method('getInsertId')
+ ->with($this->equalTo('*PREFIX*table'))
+ ->will($this->returnValue(3));
+ $this->mapper = new ExampleMapper($this->db);
+
+ $sql = 'INSERT INTO `*PREFIX*table`(`pre_name`,`email`) ' .
+ 'VALUES(?,?)';
+ $params = array('john', 'my@email');
+ $entity = new Example();
+ $entity->setPreName($params[0]);
+ $entity->setEmail($params[1]);
+
+ $this->setMapperResult($sql, $params);
+
+ $result = $this->mapper->insert($entity);
+
+ $this->assertEquals(3, $result->getId());
+ }
+
+
+ public function testUpdate(){
+ $sql = 'UPDATE `*PREFIX*table` ' .
+ 'SET ' .
+ '`pre_name` = ?,'.
+ '`email` = ? ' .
+ 'WHERE `id` = ?';
+
+ $params = array('john', 'my@email', 1);
+ $entity = new Example();
+ $entity->setPreName($params[0]);
+ $entity->setEmail($params[1]);
+ $entity->setId($params[2]);
+
+ $this->setMapperResult($sql, $params);
+
+ $this->mapper->update($entity);
+ }
+
+
+ public function testUpdateNoId(){
+ $params = array('john', 'my@email');
+ $entity = new Example();
+ $entity->setPreName($params[0]);
+ $entity->setEmail($params[1]);
+
+ $this->setExpectedException('InvalidArgumentException');
+
+ $this->mapper->update($entity);
+ }
+
+
+ public function testUpdateNothingChangedNoQuery(){
+ $params = array('john', 'my@email');
+ $entity = new Example();
+ $entity->setId(3);
+ $entity->setEmail($params[1]);
+ $entity->resetUpdatedFields();
+
+ $this->db->expects($this->never())
+ ->method('prepareQuery');
+
+ $this->mapper->update($entity);
+ }
+
+
+ public function testMapRowToEntity(){
+ $entity1 = $this->mapper->mapRow(array('pre_name' => 'test1', 'email' => 'test2'));
+ $entity2 = new Example();
+ $entity2->setPreName('test1');
+ $entity2->setEmail('test2');
+ $entity2->resetUpdatedFields();
+ $this->assertEquals($entity2, $entity1);
+ }
+
+ public function testFindEntities(){
+ $sql = 'hi';
+ $rows = array(
+ array('pre_name' => 'hi')
+ );
+ $entity = new Example();
+ $entity->setPreName('hi');
+ $entity->resetUpdatedFields();
+ $this->setMapperResult($sql, array(), $rows);
+ $result = $this->mapper->findAllEntities($sql);
+ $this->assertEquals(array($entity), $result);
+ }
+
+ public function testFindEntitiesNotFound(){
+ $sql = 'hi';
+ $rows = array();
+ $this->setMapperResult($sql, array(), $rows);
+ $result = $this->mapper->findAllEntities($sql);
+ $this->assertEquals(array(), $result);
+ }
+
+ public function testFindEntitiesMultiple(){
+ $sql = 'hi';
+ $rows = array(
+ array('pre_name' => 'jo'), array('email' => 'ho')
+ );
+ $entity1 = new Example();
+ $entity1->setPreName('jo');
+ $entity1->resetUpdatedFields();
+ $entity2 = new Example();
+ $entity2->setEmail('ho');
+ $entity2->resetUpdatedFields();
+ $this->setMapperResult($sql, array(), $rows);
+ $result = $this->mapper->findAllEntities($sql);
+ $this->assertEquals(array($entity1, $entity2), $result);
+ }
+}
\ No newline at end of file
diff --git a/tests/lib/appframework/db/MapperTestUtility.php b/tests/lib/appframework/db/MapperTestUtility.php
new file mode 100644
index 0000000000000000000000000000000000000000..fc0e5c2c445e6213aa758d69fc2a6cd064120cee
--- /dev/null
+++ b/tests/lib/appframework/db/MapperTestUtility.php
@@ -0,0 +1,179 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.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\Db;
+
+
+/**
+ * Simple utility class for testing mappers
+ */
+abstract class MapperTestUtility extends \PHPUnit_Framework_TestCase {
+
+
+ protected $db;
+ private $query;
+ private $pdoResult;
+ private $queryAt;
+ private $prepareAt;
+ private $fetchAt;
+ private $iterators;
+
+
+ /**
+ * Run this function before the actual test to either set or initialize the
+ * db. After this the db can be accessed by using $this->db
+ */
+ protected function setUp(){
+ $this->db = $this->getMockBuilder(
+ '\OCP\IDb')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->query = $this->getMock('Query', array('execute', 'bindValue'));
+ $this->pdoResult = $this->getMock('Result', array('fetch'));
+ $this->queryAt = 0;
+ $this->prepareAt = 0;
+ $this->iterators = array();
+ $this->fetchAt = 0;
+ }
+
+
+ /**
+ * Create mocks and set expected results for database queries
+ * @param string $sql the sql query that you expect to receive
+ * @param array $arguments the expected arguments for the prepare query
+ * method
+ * @param array $returnRows the rows that should be returned for the result
+ * of the database query. If not provided, it wont be assumed that fetch
+ * will be called on the result
+ */
+ protected function setMapperResult($sql, $arguments=array(), $returnRows=array(),
+ $limit=null, $offset=null){
+
+ $this->iterators[] = new ArgumentIterator($returnRows);
+
+ $iterators = $this->iterators;
+ $fetchAt = $this->fetchAt;
+
+ $this->pdoResult->expects($this->any())
+ ->method('fetch')
+ ->will($this->returnCallback(
+ function() use ($iterators, $fetchAt){
+ $iterator = $iterators[$fetchAt];
+ $result = $iterator->next();
+
+ if($result === false) {
+ $fetchAt++;
+ }
+
+ return $result;
+ }
+ ));
+
+ $index = 1;
+ foreach($arguments as $argument) {
+ switch (gettype($argument)) {
+ case 'integer':
+ $pdoConstant = \PDO::PARAM_INT;
+ break;
+
+ case 'NULL':
+ $pdoConstant = \PDO::PARAM_NULL;
+ break;
+
+ case 'boolean':
+ $pdoConstant = \PDO::PARAM_BOOL;
+ break;
+
+ default:
+ $pdoConstant = \PDO::PARAM_STR;
+ break;
+ }
+ $this->query->expects($this->at($this->queryAt))
+ ->method('bindValue')
+ ->with($this->equalTo($index),
+ $this->equalTo($argument),
+ $this->equalTo($pdoConstant));
+ $index++;
+ $this->queryAt++;
+ }
+
+ $this->query->expects($this->at($this->queryAt))
+ ->method('execute')
+ ->with()
+ ->will($this->returnValue($this->pdoResult));
+ $this->queryAt++;
+
+ if($limit === null && $offset === null) {
+ $this->db->expects($this->at($this->prepareAt))
+ ->method('prepareQuery')
+ ->with($this->equalTo($sql))
+ ->will(($this->returnValue($this->query)));
+ } elseif($limit !== null && $offset === null) {
+ $this->db->expects($this->at($this->prepareAt))
+ ->method('prepareQuery')
+ ->with($this->equalTo($sql), $this->equalTo($limit))
+ ->will(($this->returnValue($this->query)));
+ } elseif($limit === null && $offset !== null) {
+ $this->db->expects($this->at($this->prepareAt))
+ ->method('prepareQuery')
+ ->with($this->equalTo($sql),
+ $this->equalTo(null),
+ $this->equalTo($offset))
+ ->will(($this->returnValue($this->query)));
+ } else {
+ $this->db->expects($this->at($this->prepareAt))
+ ->method('prepareQuery')
+ ->with($this->equalTo($sql),
+ $this->equalTo($limit),
+ $this->equalTo($offset))
+ ->will(($this->returnValue($this->query)));
+ }
+ $this->prepareAt++;
+ $this->fetchAt++;
+
+ }
+
+
+}
+
+
+class ArgumentIterator {
+
+ private $arguments;
+
+ public function __construct($arguments){
+ $this->arguments = $arguments;
+ }
+
+ public function next(){
+ $result = array_shift($this->arguments);
+ if($result === null){
+ return false;
+ } else {
+ return $result;
+ }
+ }
+}
+
diff --git a/tests/lib/appframework/dependencyinjection/DIContainerTest.php b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
index d1bc900fb28bfa82a55cc97d810f8a0f20c1806d..acc5c2e66d82900d6b61d62b3668f13d50534d92 100644
--- a/tests/lib/appframework/dependencyinjection/DIContainerTest.php
+++ b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
@@ -5,8 +5,8 @@
*
* @author Bernhard Posselt
* @author Morris Jobke
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
- * @copyright 2013 Morris Jobke morris.jobke@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.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
diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php
index 9841dcaa1f761300154e1653e76d013eebb1dcf6..8117eec2075920a9069ef112a788d81047d65f7b 100644
--- a/tests/lib/appframework/http/DispatcherTest.php
+++ b/tests/lib/appframework/http/DispatcherTest.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -25,8 +25,28 @@
namespace OC\AppFramework\Http;
use OC\AppFramework\Middleware\MiddlewareDispatcher;
+use OC\AppFramework\Utility\ControllerMethodReflector;
use OCP\AppFramework\Http;
-//require_once(__DIR__ . "/../classloader.php");
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Controller;
+
+
+class TestController extends Controller {
+ public function __construct($appName, $request) {
+ parent::__construct($appName, $request);
+ }
+
+ /**
+ * @param int $int
+ * @param bool $bool
+ */
+ public function exec($int, $bool, $test=4, $test2=1) {
+ $this->registerResponder('text', function($in) {
+ return new JSONResponse(array('text' => $in));
+ });
+ return array($int, $bool, $test, $test2);
+ }
+}
class DispatcherTest extends \PHPUnit_Framework_TestCase {
@@ -39,6 +59,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
private $lastModified;
private $etag;
private $http;
+ private $reflector;
protected function setUp() {
$this->controllerMethod = 'test';
@@ -64,8 +85,17 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
'\OCP\AppFramework\Controller',
array($this->controllerMethod), array($app, $request));
+ $this->request = $this->getMockBuilder(
+ '\OC\AppFramework\Http\Request')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->reflector = new ControllerMethodReflector();
+
$this->dispatcher = new Dispatcher(
- $this->http, $this->middlewareDispatcher);
+ $this->http, $this->middlewareDispatcher, $this->reflector,
+ $this->request
+ );
$this->response = $this->getMockBuilder(
'\OCP\AppFramework\Http\Response')
@@ -81,7 +111,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
* @param string $out
* @param string $httpHeaders
*/
- private function setMiddlewareExpections($out=null,
+ private function setMiddlewareExpectations($out=null,
$httpHeaders=null, $responseHeaders=array(),
$ex=false, $catchEx=true) {
@@ -159,14 +189,12 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
->with($this->equalTo($this->controller),
$this->equalTo($this->controllerMethod),
$this->equalTo($out))
- ->will($this->returnValue($out));
-
-
+ ->will($this->returnValue($out));
}
public function testDispatcherReturnsArrayWith2Entries() {
- $this->setMiddlewareExpections();
+ $this->setMiddlewareExpectations();
$response = $this->dispatcher->dispatch($this->controller,
$this->controllerMethod);
@@ -180,7 +208,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
$out = 'yo';
$httpHeaders = 'Http';
$responseHeaders = array('hell' => 'yeah');
- $this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders);
+ $this->setMiddlewareExpectations($out, $httpHeaders, $responseHeaders);
$response = $this->dispatcher->dispatch($this->controller,
$this->controllerMethod);
@@ -195,7 +223,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
$out = 'yo';
$httpHeaders = 'Http';
$responseHeaders = array('hell' => 'yeah');
- $this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders, true);
+ $this->setMiddlewareExpectations($out, $httpHeaders, $responseHeaders, true);
$response = $this->dispatcher->dispatch($this->controller,
$this->controllerMethod);
@@ -210,7 +238,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
$out = 'yo';
$httpHeaders = 'Http';
$responseHeaders = array('hell' => 'yeah');
- $this->setMiddlewareExpections($out, $httpHeaders, $responseHeaders, true, false);
+ $this->setMiddlewareExpectations($out, $httpHeaders, $responseHeaders, true, false);
$this->setExpectedException('\Exception');
$response = $this->dispatcher->dispatch($this->controller,
@@ -218,4 +246,148 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
}
+
+ private function dispatcherPassthrough() {
+ $this->middlewareDispatcher->expects($this->once())
+ ->method('beforeController');
+ $this->middlewareDispatcher->expects($this->once())
+ ->method('afterController')
+ ->will($this->returnCallback(function($a, $b, $in) {
+ return $in;
+ }));
+ $this->middlewareDispatcher->expects($this->once())
+ ->method('beforeOutput')
+ ->will($this->returnCallback(function($a, $b, $in) {
+ return $in;
+ }));
+ }
+
+
+ public function testControllerParametersInjected() {
+ $this->request = new Request(array(
+ 'post' => array(
+ 'int' => '3',
+ 'bool' => 'false'
+ ),
+ 'method' => 'POST'
+ ));
+ $this->dispatcher = new Dispatcher(
+ $this->http, $this->middlewareDispatcher, $this->reflector,
+ $this->request
+ );
+ $controller = new TestController('app', $this->request);
+
+ // reflector is supposed to be called once
+ $this->dispatcherPassthrough();
+ $response = $this->dispatcher->dispatch($controller, 'exec');
+
+ $this->assertEquals('[3,true,4,1]', $response[2]);
+ }
+
+
+ public function testControllerParametersInjectedDefaultOverwritten() {
+ $this->request = new Request(array(
+ 'post' => array(
+ 'int' => '3',
+ 'bool' => 'false',
+ 'test2' => 7
+ ),
+ 'method' => 'POST'
+ ));
+ $this->dispatcher = new Dispatcher(
+ $this->http, $this->middlewareDispatcher, $this->reflector,
+ $this->request
+ );
+ $controller = new TestController('app', $this->request);
+
+ // reflector is supposed to be called once
+ $this->dispatcherPassthrough();
+ $response = $this->dispatcher->dispatch($controller, 'exec');
+
+ $this->assertEquals('[3,true,4,7]', $response[2]);
+ }
+
+
+
+ public function testResponseTransformedByUrlFormat() {
+ $this->request = new Request(array(
+ 'post' => array(
+ 'int' => '3',
+ 'bool' => 'false'
+ ),
+ 'urlParams' => array(
+ 'format' => 'text'
+ ),
+ 'method' => 'GET'
+ ));
+ $this->dispatcher = new Dispatcher(
+ $this->http, $this->middlewareDispatcher, $this->reflector,
+ $this->request
+ );
+ $controller = new TestController('app', $this->request);
+
+ // reflector is supposed to be called once
+ $this->dispatcherPassthrough();
+ $response = $this->dispatcher->dispatch($controller, 'exec');
+
+ $this->assertEquals('{"text":[3,false,4,1]}', $response[2]);
+ }
+
+
+ public function testResponseTransformedByAcceptHeader() {
+ $this->request = new Request(array(
+ 'post' => array(
+ 'int' => '3',
+ 'bool' => 'false'
+ ),
+ 'server' => array(
+ 'HTTP_ACCEPT' => 'application/text, test',
+ 'HTTP_CONTENT_TYPE' => 'application/x-www-form-urlencoded'
+ ),
+ 'method' => 'PUT'
+ ));
+ $this->dispatcher = new Dispatcher(
+ $this->http, $this->middlewareDispatcher, $this->reflector,
+ $this->request
+ );
+ $controller = new TestController('app', $this->request);
+
+ // reflector is supposed to be called once
+ $this->dispatcherPassthrough();
+ $response = $this->dispatcher->dispatch($controller, 'exec');
+
+ $this->assertEquals('{"text":[3,false,4,1]}', $response[2]);
+ }
+
+
+ public function testResponsePrimarilyTransformedByParameterFormat() {
+ $this->request = new Request(array(
+ 'post' => array(
+ 'int' => '3',
+ 'bool' => 'false'
+ ),
+ 'get' => array(
+ 'format' => 'text'
+ ),
+ 'server' => array(
+ 'HTTP_ACCEPT' => 'application/json, test'
+ ),
+ 'method' => 'POST'
+ ));
+ $this->dispatcher = new Dispatcher(
+ $this->http, $this->middlewareDispatcher, $this->reflector,
+ $this->request
+ );
+ $controller = new TestController('app', $this->request);
+
+ // reflector is supposed to be called once
+ $this->dispatcherPassthrough();
+ $response = $this->dispatcher->dispatch($controller, 'exec');
+
+ $this->assertEquals('{"text":[3,true,4,1]}', $response[2]);
+ }
+
+
+
+
}
diff --git a/tests/lib/appframework/http/DownloadResponseTest.php b/tests/lib/appframework/http/DownloadResponseTest.php
index b305c63ad4d297e010aaf2a57fc08e1935e17894..5be16ce3c497716464e1402896d2b116ca550a1d 100644
--- a/tests/lib/appframework/http/DownloadResponseTest.php
+++ b/tests/lib/appframework/http/DownloadResponseTest.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/tests/lib/appframework/http/HttpTest.php b/tests/lib/appframework/http/HttpTest.php
index 0bdcee24c995a196b22cab20e692a18790e23b02..c62fa43863abd526fb8f50d96d5829fe83fb4b51 100644
--- a/tests/lib/appframework/http/HttpTest.php
+++ b/tests/lib/appframework/http/HttpTest.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/tests/lib/appframework/http/JSONResponseTest.php b/tests/lib/appframework/http/JSONResponseTest.php
index fbaae1b922743f4a0ff94bb333bb8890ffdaa01b..c0c58ebf7612a002e02c0fcd7268bd72e8b1e376 100644
--- a/tests/lib/appframework/http/JSONResponseTest.php
+++ b/tests/lib/appframework/http/JSONResponseTest.php
@@ -5,8 +5,8 @@
*
* @author Bernhard Posselt
* @author Morris Jobke
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
- * @copyright 2013 Morris Jobke morris.jobke@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.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
diff --git a/tests/lib/appframework/http/RedirectResponseTest.php b/tests/lib/appframework/http/RedirectResponseTest.php
index f62b420f4ee69104041802d1ec06671be035003a..dfd0d7ee7dcc9a03e0f7a27b8b196f24144613ab 100644
--- a/tests/lib/appframework/http/RedirectResponseTest.php
+++ b/tests/lib/appframework/http/RedirectResponseTest.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/tests/lib/appframework/http/ResponseTest.php b/tests/lib/appframework/http/ResponseTest.php
index 27350725d79a76921e65acf9a5043fce713eca6d..e83fe9e2d8487d1f9e4dee3c20b2bcfb23467a7e 100644
--- a/tests/lib/appframework/http/ResponseTest.php
+++ b/tests/lib/appframework/http/ResponseTest.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -42,7 +42,7 @@ class ResponseTest extends \PHPUnit_Framework_TestCase {
public function testAddHeader(){
- $this->childResponse->addHeader('hello', 'world');
+ $this->childResponse->addHeader(' hello ', 'world');
$headers = $this->childResponse->getHeaders();
$this->assertEquals('world', $headers['hello']);
}
diff --git a/tests/lib/appframework/http/TemplateResponseTest.php b/tests/lib/appframework/http/TemplateResponseTest.php
index 0b158edff6f9392460dbd14ce15c24137abba2b0..afdcf322b85a81817a0cd69973212dbbd213f4c6 100644
--- a/tests/lib/appframework/http/TemplateResponseTest.php
+++ b/tests/lib/appframework/http/TemplateResponseTest.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -51,6 +51,22 @@ class TemplateResponseTest extends \PHPUnit_Framework_TestCase {
}
+ public function testSetParamsConstructor(){
+ $params = array('hi' => 'yo');
+ $this->tpl = new TemplateResponse($this->api, 'home', $params);
+
+ $this->assertEquals(array('hi' => 'yo'), $this->tpl->getParams());
+ }
+
+
+ public function testSetRenderAsConstructor(){
+ $renderAs = 'myrender';
+ $this->tpl = new TemplateResponse($this->api, 'home', array(), $renderAs);
+
+ $this->assertEquals($renderAs, $this->tpl->getRenderAs());
+ }
+
+
public function testSetParams(){
$params = array('hi' => 'yo');
$this->tpl->setParams($params);
@@ -63,36 +79,6 @@ class TemplateResponseTest extends \PHPUnit_Framework_TestCase {
$this->assertEquals('home', $this->tpl->getTemplateName());
}
-
-// public function testRender(){
-// $ocTpl = $this->getMock('Template', array('fetchPage'));
-// $ocTpl->expects($this->once())
-// ->method('fetchPage');
-//
-// $tpl = new TemplateResponse('core', 'error');
-//
-// $tpl->render();
-// }
-//
-//
-// public function testRenderAssignsParams(){
-// $params = array('john' => 'doe');
-//
-// $tpl = new TemplateResponse('app', 'home');
-// $tpl->setParams($params);
-//
-// $tpl->render();
-// }
-//
-//
-// public function testRenderDifferentApp(){
-//
-// $tpl = new TemplateResponse('app', 'home', 'app2');
-//
-// $tpl->render();
-// }
-
-
public function testGetRenderAs(){
$render = 'myrender';
$this->tpl->renderAs($render);
diff --git a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
index 935f97d2a6f251630d6d813b0298bd35189b54e3..b1e221aab99d8a6e6bfd55332c7ed145616612a3 100644
--- a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
+++ b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -124,15 +124,9 @@ class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
}
- private function getAPIMock(){
- return $this->getMock('OC\AppFramework\DependencyInjection\DIContainer',
- array('getAppName'), array('app'));
- }
-
-
private function getControllerMock(){
return $this->getMock('OCP\AppFramework\Controller', array('method'),
- array($this->getAPIMock(), new Request(array('method' => 'GET'))));
+ array('app', new Request(array('method' => 'GET'))));
}
diff --git a/tests/lib/appframework/middleware/MiddlewareTest.php b/tests/lib/appframework/middleware/MiddlewareTest.php
index 7a93c0d4ddac9b309ff43858f60743a91824b560..9d952f615734afbc0cb586bbc1fac22ed06c0ef4 100644
--- a/tests/lib/appframework/middleware/MiddlewareTest.php
+++ b/tests/lib/appframework/middleware/MiddlewareTest.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -44,8 +44,10 @@ class MiddlewareTest extends \PHPUnit_Framework_TestCase {
protected function setUp(){
$this->middleware = new ChildMiddleware();
- $this->api = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer',
- array(), array('test'));
+ $this->api = $this->getMockBuilder(
+ 'OC\AppFramework\DependencyInjection\DIContainer')
+ ->disableOriginalConstructor()
+ ->getMock();
$this->controller = $this->getMock('OCP\AppFramework\Controller',
array(), array($this->api, new Request()));
diff --git a/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php b/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..79cd3b278af54610e1c6327c31e2a93167298954
--- /dev/null
+++ b/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * ownCloud - App Framework
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @copyright Bernhard Posselt 2014
+ */
+
+
+namespace OC\AppFramework\Middleware\Security;
+
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Utility\ControllerMethodReflector;
+
+use OCP\AppFramework\Http\Response;
+
+
+class CORSMiddlewareTest extends \PHPUnit_Framework_TestCase {
+
+ private $reflector;
+
+ protected function setUp() {
+ $this->reflector = new ControllerMethodReflector();
+ }
+
+ /**
+ * @CORS
+ */
+ public function testSetCORSAPIHeader() {
+ $request = new Request(
+ array('server' => array('HTTP_ORIGIN' => 'test'))
+ );
+ $this->reflector->reflect($this, __FUNCTION__);
+ $middleware = new CORSMiddleware($request, $this->reflector);
+
+ $response = $middleware->afterController($this, __FUNCTION__, new Response());
+ $headers = $response->getHeaders();
+ $this->assertEquals('test', $headers['Access-Control-Allow-Origin']);
+ }
+
+
+ public function testNoAnnotationNoCORSHEADER() {
+ $request = new Request(
+ array('server' => array('HTTP_ORIGIN' => 'test'))
+ );
+ $middleware = new CORSMiddleware($request, $this->reflector);
+
+ $response = $middleware->afterController($this, __FUNCTION__, new Response());
+ $headers = $response->getHeaders();
+ $this->assertFalse(array_key_exists('Access-Control-Allow-Origin', $headers));
+ }
+
+
+ /**
+ * @CORS
+ */
+ public function testNoOriginHeaderNoCORSHEADER() {
+ $request = new Request();
+ $this->reflector->reflect($this, __FUNCTION__);
+ $middleware = new CORSMiddleware($request, $this->reflector);
+
+ $response = $middleware->afterController($this, __FUNCTION__, new Response());
+ $headers = $response->getHeaders();
+ $this->assertFalse(array_key_exists('Access-Control-Allow-Origin', $headers));
+ }
+
+
+ /**
+ * @CORS
+ * @expectedException \OC\AppFramework\Middleware\Security\SecurityException
+ */
+ public function testCorsIgnoredIfWithCredentialsHeaderPresent() {
+ $request = new Request(
+ array('server' => array('HTTP_ORIGIN' => 'test'))
+ );
+ $this->reflector->reflect($this, __FUNCTION__);
+ $middleware = new CORSMiddleware($request, $this->reflector);
+
+ $response = new Response();
+ $response->addHeader('AcCess-control-Allow-Credentials ', 'TRUE');
+ $response = $middleware->afterController($this, __FUNCTION__, $response);
+ }
+
+}
diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
index 19e8a68c388db12249b06b6a5164986177cebf8d..47556ca95428028e3491d34db68cbf8967b6c738 100644
--- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
+++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -26,6 +26,7 @@ namespace OC\AppFramework\Middleware\Security;
use OC\AppFramework\Http;
use OC\AppFramework\Http\Request;
+use OC\AppFramework\Utility\ControllerMethodReflector;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\Http\JSONResponse;
@@ -37,39 +38,49 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
private $secException;
private $secAjaxException;
private $request;
+ private $reader;
+ private $logger;
+ private $navigationManager;
+ private $urlGenerator;
public function setUp() {
- $api = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer', array(), array('test'));
- $this->controller = $this->getMock('OCP\AppFramework\Controller',
- array(), array($api, new Request()));
-
- $this->request = new Request();
- $this->middleware = new SecurityMiddleware($api, $this->request);
+ $this->controller = $this->getMockBuilder('OCP\AppFramework\Controller')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->reader = new ControllerMethodReflector();
+ $this->logger = $this->getMockBuilder(
+ 'OCP\ILogger')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->navigationManager = $this->getMockBuilder(
+ 'OCP\INavigationManager')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->urlGenerator = $this->getMockBuilder(
+ 'OCP\IURLGenerator')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->request = $this->getMockBuilder(
+ 'OCP\IRequest')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->middleware = $this->getMiddleware(true, true);
$this->secException = new SecurityException('hey', false);
$this->secAjaxException = new SecurityException('hey', true);
}
- private function getAPI(){
- return $this->getMock('OC\AppFramework\DependencyInjection\DIContainer',
- array('isLoggedIn', 'passesCSRFCheck', 'isAdminUser',
- 'isSubAdminUser', 'getUserId'),
- array('app'));
- }
-
-
- /**
- * @param string $method
- */
- private function checkNavEntry($method){
- $api = $this->getAPI();
-
- $serverMock = $this->getMock('\OC\Server', array());
- $api->expects($this->any())->method('getServer')
- ->will($this->returnValue($serverMock));
-
- $sec = new SecurityMiddleware($api, $this->request);
- $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method);
+ private function getMiddleware($isLoggedIn, $isAdminUser){
+ return new SecurityMiddleware(
+ $this->request,
+ $this->reader,
+ $this->navigationManager,
+ $this->urlGenerator,
+ $this->logger,
+ 'test',
+ $isLoggedIn,
+ $isAdminUser
+ );
}
@@ -78,7 +89,12 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
* @NoCSRFRequired
*/
public function testSetNavigationEntry(){
- $this->checkNavEntry('testSetNavigationEntry');
+ $this->navigationManager->expects($this->once())
+ ->method('setActiveEntry')
+ ->with($this->equalTo('test'));
+
+ $this->reader->reflect(__CLASS__, __FUNCTION__);
+ $this->middleware->beforeController(__CLASS__, __FUNCTION__);
}
@@ -87,31 +103,33 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
* @param string $test
*/
private function ajaxExceptionStatus($method, $test, $status) {
- $api = $this->getAPI();
- $api->expects($this->any())
- ->method($test)
- ->will($this->returnValue(false));
+ $isLoggedIn = false;
+ $isAdminUser = false;
// isAdminUser requires isLoggedIn call to return true
if ($test === 'isAdminUser') {
- $api->expects($this->any())
- ->method('isLoggedIn')
- ->will($this->returnValue(true));
+ $isLoggedIn = true;
}
- $sec = new SecurityMiddleware($api, $this->request);
+ $sec = $this->getMiddleware($isLoggedIn, $isAdminUser);
try {
- $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest',
- $method);
+ $this->reader->reflect(__CLASS__, $method);
+ $sec->beforeController(__CLASS__, $method);
} catch (SecurityException $ex){
$this->assertEquals($status, $ex->getCode());
}
+
+ // add assertion if everything should work fine otherwise phpunit will
+ // complain
+ if ($status === 0) {
+ $this->assertTrue(true);
+ }
}
public function testAjaxStatusLoggedInCheck() {
$this->ajaxExceptionStatus(
- 'testAjaxStatusLoggedInCheck',
+ __FUNCTION__,
'isLoggedIn',
Http::STATUS_UNAUTHORIZED
);
@@ -119,11 +137,10 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
/**
* @NoCSRFRequired
- * @NoAdminRequired
*/
public function testAjaxNotAdminCheck() {
$this->ajaxExceptionStatus(
- 'testAjaxNotAdminCheck',
+ __FUNCTION__,
'isAdminUser',
Http::STATUS_FORBIDDEN
);
@@ -134,7 +151,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
*/
public function testAjaxStatusCSRFCheck() {
$this->ajaxExceptionStatus(
- 'testAjaxStatusCSRFCheck',
+ __FUNCTION__,
'passesCSRFCheck',
Http::STATUS_PRECONDITION_FAILED
);
@@ -146,22 +163,22 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
*/
public function testAjaxStatusAllGood() {
$this->ajaxExceptionStatus(
- 'testAjaxStatusAllGood',
+ __FUNCTION__,
'isLoggedIn',
0
);
$this->ajaxExceptionStatus(
- 'testAjaxStatusAllGood',
+ __FUNCTION__,
'isAdminUser',
0
);
$this->ajaxExceptionStatus(
- 'testAjaxStatusAllGood',
+ __FUNCTION__,
'isSubAdminUser',
0
);
$this->ajaxExceptionStatus(
- 'testAjaxStatusAllGood',
+ __FUNCTION__,
'passesCSRFCheck',
0
);
@@ -173,20 +190,14 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
* @NoCSRFRequired
*/
public function testNoChecks(){
- $api = $this->getAPI();
- $api->expects($this->never())
+ $this->request->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');
+ ->will($this->returnValue(false));
+
+ $sec = $this->getMiddleware(false, false);
+
+ $this->reader->reflect(__CLASS__, __FUNCTION__);
+ $sec->beforeController(__CLASS__, __FUNCTION__);
}
@@ -195,27 +206,25 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
* @param string $expects
*/
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));
+ $isLoggedIn = true;
+ $isAdminUser = !$shouldFail;
+ } else {
+ $isLoggedIn = !$shouldFail;
+ $isAdminUser = false;
}
- $sec = new SecurityMiddleware($api, $this->request);
+ $sec = $this->getMiddleware($isLoggedIn, $isAdminUser);
if($shouldFail){
$this->setExpectedException('\OC\AppFramework\Middleware\Security\SecurityException');
} else {
- $this->setExpectedException(null);
+ $this->assertTrue(true);
}
- $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method);
+ $this->reader->reflect(__CLASS__, $method);
+ $sec->beforeController(__CLASS__, $method);
}
@@ -224,14 +233,12 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
* @expectedException \OC\AppFramework\Middleware\Security\SecurityException
*/
public function testCsrfCheck(){
- $api = $this->getAPI();
- $request = $this->getMock('OC\AppFramework\Http\Request', array('passesCSRFCheck'));
- $request->expects($this->once())
+ $this->request->expects($this->once())
->method('passesCSRFCheck')
->will($this->returnValue(false));
- $sec = new SecurityMiddleware($api, $request);
- $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testCsrfCheck');
+ $this->reader->reflect(__CLASS__, __FUNCTION__);
+ $this->middleware->beforeController(__CLASS__, __FUNCTION__);
}
@@ -240,14 +247,12 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
* @NoCSRFRequired
*/
public function testNoCsrfCheck(){
- $api = $this->getAPI();
- $request = $this->getMock('OC\AppFramework\Http\Request', array('passesCSRFCheck'));
- $request->expects($this->never())
+ $this->request->expects($this->never())
->method('passesCSRFCheck')
->will($this->returnValue(false));
- $sec = new SecurityMiddleware($api, $request);
- $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testNoCsrfCheck');
+ $this->reader->reflect(__CLASS__, __FUNCTION__);
+ $this->middleware->beforeController(__CLASS__, __FUNCTION__);
}
@@ -255,14 +260,12 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
* @PublicPage
*/
public function testFailCsrfCheck(){
- $api = $this->getAPI();
- $request = $this->getMock('OC\AppFramework\Http\Request', array('passesCSRFCheck'));
- $request->expects($this->once())
+ $this->request->expects($this->once())
->method('passesCSRFCheck')
->will($this->returnValue(true));
- $sec = new SecurityMiddleware($api, $request);
- $sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testFailCsrfCheck');
+ $this->reader->reflect(__CLASS__, __FUNCTION__);
+ $this->middleware->beforeController(__CLASS__, __FUNCTION__);
}
@@ -271,7 +274,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
* @NoAdminRequired
*/
public function testLoggedInCheck(){
- $this->securityCheck('testLoggedInCheck', 'isLoggedIn');
+ $this->securityCheck(__FUNCTION__, 'isLoggedIn');
}
@@ -280,7 +283,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
* @NoAdminRequired
*/
public function testFailLoggedInCheck(){
- $this->securityCheck('testFailLoggedInCheck', 'isLoggedIn', true);
+ $this->securityCheck(__FUNCTION__, 'isLoggedIn', true);
}
@@ -288,7 +291,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
* @NoCSRFRequired
*/
public function testIsAdminCheck(){
- $this->securityCheck('testIsAdminCheck', 'isAdminUser');
+ $this->securityCheck(__FUNCTION__, 'isAdminUser');
}
@@ -296,7 +299,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
* @NoCSRFRequired
*/
public function testFailIsAdminCheck(){
- $this->securityCheck('testFailIsAdminCheck', 'isAdminUser', true);
+ $this->securityCheck(__FUNCTION__, 'isAdminUser', true);
}
@@ -308,17 +311,12 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
public function testAfterExceptionReturnsRedirect(){
- $api = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer', array(), array('test'));
- $serverMock = $this->getMock('\OC\Server', array('getNavigationManager'));
- $api->expects($this->once())->method('getServer')
- ->will($this->returnValue($serverMock));
-
- $this->controller = $this->getMock('OCP\AppFramework\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);
+ array('server' =>
+ array('HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8')
+ )
+ );
+ $this->middleware = $this->getMiddleware(true, true);
$response = $this->middleware->afterException($this->controller, 'test',
$this->secException);
diff --git a/tests/lib/appframework/utility/ControllerMethodReflectorTest.php b/tests/lib/appframework/utility/ControllerMethodReflectorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..8939a203edbc289a1d1a8fb80e9b8c5a9ce21ae9
--- /dev/null
+++ b/tests/lib/appframework/utility/ControllerMethodReflectorTest.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.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 ControllerMethodReflectorTest extends \PHPUnit_Framework_TestCase {
+
+
+ /**
+ * @Annotation
+ */
+ public function testReadAnnotation(){
+ $reader = new ControllerMethodReflector();
+ $reader->reflect(
+ '\OC\AppFramework\Utility\ControllerMethodReflectorTest',
+ 'testReadAnnotation'
+ );
+
+ $this->assertTrue($reader->hasAnnotation('Annotation'));
+ }
+
+
+ /**
+ * @Annotation
+ * @param test
+ */
+ public function testReadAnnotationNoLowercase(){
+ $reader = new ControllerMethodReflector();
+ $reader->reflect(
+ '\OC\AppFramework\Utility\ControllerMethodReflectorTest',
+ 'testReadAnnotationNoLowercase'
+ );
+
+ $this->assertTrue($reader->hasAnnotation('Annotation'));
+ $this->assertFalse($reader->hasAnnotation('param'));
+ }
+
+
+ /**
+ * @Annotation
+ * @param int $test
+ */
+ public function testReadTypeIntAnnotations(){
+ $reader = new ControllerMethodReflector();
+ $reader->reflect(
+ '\OC\AppFramework\Utility\ControllerMethodReflectorTest',
+ 'testReadTypeIntAnnotations'
+ );
+
+ $this->assertEquals('int', $reader->getType('test'));
+ }
+
+
+ /**
+ * @Annotation
+ * @param double $test something special
+ */
+ public function testReadTypeDoubleAnnotations(){
+ $reader = new ControllerMethodReflector();
+ $reader->reflect(
+ '\OC\AppFramework\Utility\ControllerMethodReflectorTest',
+ 'testReadTypeDoubleAnnotations'
+ );
+
+ $this->assertEquals('double', $reader->getType('test'));
+ }
+
+
+ public function arguments($arg, $arg2='hi') {}
+ public function testReflectParameters() {
+ $reader = new ControllerMethodReflector();
+ $reader->reflect(
+ '\OC\AppFramework\Utility\ControllerMethodReflectorTest',
+ 'arguments'
+ );
+
+ $this->assertEquals(array('arg' => null, 'arg2' => 'hi'), $reader->getParameters());
+ }
+
+
+ public function arguments2($arg) {}
+ public function testReflectParameters2() {
+ $reader = new ControllerMethodReflector();
+ $reader->reflect(
+ '\OC\AppFramework\Utility\ControllerMethodReflectorTest',
+ 'arguments2'
+ );
+
+ $this->assertEquals(array('arg' => null), $reader->getParameters());
+ }
+
+
+}
diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php
index cfa2d6fd9aab0b7247798a79a24ccfe639719a79..c07e32a404e3a40211eccc5bb82b9922fe41c435 100644
--- a/tests/lib/dbschema.php
+++ b/tests/lib/dbschema.php
@@ -24,10 +24,8 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
$content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content );
file_put_contents( $this->schema_file2, $content );
- $prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
-
- $this->table1 = $prefix.$r.'cntcts_addrsbks';
- $this->table2 = $prefix.$r.'cntcts_cards';
+ $this->table1 = $r.'cntcts_addrsbks';
+ $this->table2 = $r.'cntcts_cards';
}
public function tearDown() {
@@ -71,54 +69,11 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
$this->assertTableNotExist($this->table2);
}
- /**
- * @param string $table
- */
- public function tableExist($table) {
-
- switch (OC_Config::getValue( 'dbtype', 'sqlite' )) {
- case 'sqlite':
- case 'sqlite3':
- $sql = "SELECT name FROM sqlite_master "
- . "WHERE type = 'table' AND name = ? "
- . "UNION ALL SELECT name FROM sqlite_temp_master "
- . "WHERE type = 'table' AND name = ?";
- $result = \OC_DB::executeAudited($sql, array($table, $table));
- break;
- case 'mysql':
- $sql = 'SHOW TABLES LIKE ?';
- $result = \OC_DB::executeAudited($sql, array($table));
- break;
- case 'pgsql':
- $sql = 'SELECT tablename AS table_name, schemaname AS schema_name '
- . 'FROM pg_tables WHERE schemaname NOT LIKE \'pg_%\' '
- . 'AND schemaname != \'information_schema\' '
- . 'AND tablename = ?';
- $result = \OC_DB::executeAudited($sql, array($table));
- break;
- case 'oci':
- $sql = 'SELECT TABLE_NAME FROM USER_TABLES WHERE TABLE_NAME = ?';
- $result = \OC_DB::executeAudited($sql, array($table));
- break;
- case 'mssql':
- $sql = 'SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = ?';
- $result = \OC_DB::executeAudited($sql, array($table));
- break;
- }
-
- $name = $result->fetchOne();
- if ($name === $table) {
- return true;
- } else {
- return false;
- }
- }
-
/**
* @param string $table
*/
public function assertTableExist($table) {
- $this->assertTrue($this->tableExist($table), 'Table ' . $table . ' does not exist');
+ $this->